nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implementation of 'scan' functionality continued.

Browse Source
This commit is contained in:
Roland Jax
2014-11-17 20:27:01 +01:00
parent bfab16ce5d
commit 3f7f60cc68
5 changed files with 65 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusctl/ebusctl.cpp
+22 -175
View File
@@ -26,11 +26,8 @@
#include "decode.h"
#include "tcpsocket.h"
#include <iostream>
#include <sstream>
#include <fstream>
#include <iomanip>
#include <cstdlib>
#include <utility>
#include <unistd.h>
using namespace libebus;
@@ -41,12 +38,9 @@ void define_args()
{
A.setVersion("ebusctl is part of """PACKAGE_STRING"");
A.addText(" local commands:\n"
" 'scan' scans the bus and identifies the participants\n\n"
" 'feed' sends a dump file to a local virtual serial device\n"
" (hint: socat -d -d pty,raw,echo=0 pty,raw,echo=0)\n\n"
" remote commands:\n"
" send 'help' to server\n\n"
A.addText(" 'help' show server commands\n\n"
" 'feed' sends a dump file to a local serial device (pts)\n"
" (hint: socat -d -d pty,raw,echo=0 pty,raw,echo=0)\n\n"
" Options:\n");
A.addOption("device", "d", OptVal("/dev/ttyUSB60"), dt_string, ot_mandatory,
@@ -65,102 +59,6 @@ void define_args()
"port (8888)\n");
}
template<typename T, size_t N>T * end(T (&ra)[N]) { return ra + N; }
const char *sinit[] = {"02", "04", "05", "06", "08", "09", "0A", "0B", "0C",
"0E", "12", "14", "15", "16", "18", "19", "1A", "1B",
"1C", "1D", "1E", "20", "21", "22", "23", "24", "25",
"26", "27", "28", "29", "2A", "2B", "2C", "2D", "2E",
"2F", "32", "34", "35", "36", "38", "39", "3A", "3B",
"3C", "3D", "3E", "40", "41", "42", "43", "44", "45",
"46", "47", "48", "49", "4A", "4B", "4C", "4D", "4E",
"4F", "50", "51", "52", "53", "54", "55", "56", "57",
"58", "59", "5A", "5B", "5C", "5D", "5E", "5F", "60",
"61", "62", "63", "64", "65", "66", "67", "68", "69",
"6A", "6B", "6C", "6D", "6E", "6F", "72", "74", "75",
"76", "78", "79", "7A", "7B", "7C", "7D", "7E", "80",
"81", "82", "83", "84", "85", "86", "87", "88", "89",
"8A", "8B", "8C", "8D", "8E", "8F", "90", "91", "92",
"93", "94", "95", "96", "97", "98", "99", "9A", "9B",
"9C", "9D", "9E", "9F", "A0", "A1", "A2", "A3", "A4",
"A5", "A6", "A7", "A8", "AB", "AC", "AD", "AE", "AF",
"B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8",
"B9", "BA", "BB", "BC", "BD", "BE", "BF", "C0", "C1",
"C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "CA",
"CB", "CC", "CD", "CE", "CF", "D0", "D1", "D2", "D3",
"D4", "D5", "D6", "D7", "D8", "D9", "DA", "DB", "DC",
"DD", "DE", "DF", "E0", "E1", "E2", "E3", "E4", "E5",
"E6", "E7", "E8", "E9", "EA", "EB", "EC", "ED", "EE",
"EF", "F2", "F4", "F5", "F6", "F8", "F9", "FA", "FB",
"FC", "FD"};
static std::vector<std::string> s(sinit, end(sinit));
static std::map<std::string, std::string> manufacturer;
static void addManufacturer()
{
manufacturer.insert(std::make_pair("06", "Karl Dungs GmbH"));
manufacturer.insert(std::make_pair("0f", "FH Braunschweig/Wolfenbüttel"));
manufacturer.insert(std::make_pair("10", "TEM AG für Elektronik Intertem Vertriebs AG"));
manufacturer.insert(std::make_pair("11", "Lamberti Elektronik"));
manufacturer.insert(std::make_pair("14", "CEB Compagnie Européenne de Brûleurs S.A."));
manufacturer.insert(std::make_pair("15", "Landis & Staefa"));
manufacturer.insert(std::make_pair("16", "FERRO Wärmetechnik GmbH & Co.KG"));
manufacturer.insert(std::make_pair("17", "MONDIAL electronic Ges.mbH"));
manufacturer.insert(std::make_pair("18", "Wikon Kommunikationstechnik GmbH"));
manufacturer.insert(std::make_pair("19", "Wolf GmbH"));
manufacturer.insert(std::make_pair("20", "RAWE Electronic GmbH"));
manufacturer.insert(std::make_pair("30", "Satronic AG"));
manufacturer.insert(std::make_pair("40", "ENCON Electronics"));
manufacturer.insert(std::make_pair("50", "G. Kromschröder AG"));
manufacturer.insert(std::make_pair("60", "Eberle Controls GmbH"));
manufacturer.insert(std::make_pair("65", "EBV Elektronikbau"));
manufacturer.insert(std::make_pair("75", "Grässlin GmbH & Co.KG"));
manufacturer.insert(std::make_pair("85", "Motoren und Ventilatoren Landshut GmbH"));
manufacturer.insert(std::make_pair("95", "SIG Berger Lahr GmbH & Co KG"));
manufacturer.insert(std::make_pair("c0", "Toby AG"));
manufacturer.insert(std::make_pair("c5", "Max Weishaupt GmbH"));
manufacturer.insert(std::make_pair("a5", "Theben Zeitschaltautomatik"));
manufacturer.insert(std::make_pair("a7", "Thermowatt s.p.a."));
manufacturer.insert(std::make_pair("b5", "Joh. Vaillant GmbH & Co."));
}
void scanVaillant(TCPSocket* socket, const std::string address)
{
Decode* help = NULL;
std::ostringstream sstr;
for (int i = 24; i < 28; i++) {
// build message
std::string message("hex ms ");
message += address;
message += "b50901";
std::stringstream ss;
ss << i;
message += ss.str();
socket->send(message.c_str(), message.size());
char data[256];
size_t datalen;
datalen = socket->recv(data, sizeof(data)-1);
data[datalen] = '\0';
std::string item(data);
help = new DecodeSTR(item.substr(18,18));
sstr << help->decode();
delete help;
}
std::cout << " s/n: '" << sstr.str().substr(1,28) << "' item: '" << sstr.str().substr(7,10) << "'";
}
int main(int argc, char* argv[])
{
// define arguments and application variables
@@ -191,100 +89,49 @@ int main(int argc, char* argv[])
}
file.close();
} else {
std::cout << "error opening file " << A.getOptVal<const char*>("file") << std::endl;
}
else
std::cout << "error opening file " << A.getOptVal<const char*>("file") << std::endl;
port.close();
if(port.isOpen() == false)
std::cout << "closePort successful." << std::endl;
} else {
} else
std::cout << "error opening device " << A.getOptVal<const char*>("device") << std::endl;
}
} else {
}
else {
TCPClient* client = new TCPClient();
TCPSocket* socket = client->connect(A.getOptVal<const char*>("server"), A.getOptVal<int>("port"));
if (socket != NULL) {
/*
if (strcasecmp(A.getArg(0).c_str(), "scan") == 0) {
addManufacturer();
// build message
std::string message(A.getArg(0));
for (int i = 1; i < A.numArgs(); i++) {
message += " ";
message += A.getArg(i);
}
// send command to all slaves
for (size_t i = 0; i < s.size(); i++) {
// build message
std::string message("hex ");
message += s[i];
message += "070400";
socket->send(message.c_str(), message.size());
socket->send(message.c_str(), message.size());
char data[1024];
size_t datalen;
char data[1024];
size_t datalen;
datalen = socket->recv(data, sizeof(data)-1);
data[datalen] = '\0';
datalen = socket->recv(data, sizeof(data)-1);
data[datalen] = '\0';
// decode answer
if (strncmp(&data[0], "-", 1) != 0) {
std::string item(data);
std::ostringstream ident;
Decode* help = NULL;
help = new DecodeSTR(item.substr(18,10));
ident << help->decode();
delete help;
std::cout << s[i] << ": '" << manufacturer.find(item.substr(16,2))->second
<< "' ident: '" << std::setw(5) << std::setfill(' ') << ident.str()
<< "' sw: '" << item.substr(28,2)
<< "." << item.substr(30,2)
<< "' hw: '" << item.substr(32,2)
<< "." << item.substr(34,2)
<< "'";
if (item.substr(16,2) == "b5")
scanVaillant(socket, s[i]);
std::cout << std::endl;
}
sleep(2);
}
} else {
*/
// build message
std::string message(A.getArg(0));
for (int i = 1; i < A.numArgs(); i++) {
message += " ";
message += A.getArg(i);
}
socket->send(message.c_str(), message.size());
char data[1024];
size_t datalen;
datalen = socket->recv(data, sizeof(data)-1);
data[datalen] = '\0';
std::cout << data;
//~ }
std::cout << data;
delete socket;
} else {
}
else {
std::cout << "error connecting to " << A.getOptVal<const char*>("server")
<< ":" << A.getOptVal<int>("port") << std::endl;
}
delete client;
}
return 0;
}
src/ebusd/baseloop.cpp
+1 -1
View File
@@ -322,7 +322,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
break;
}
// ToDo: check for possible areas and level
// TODO: check for possible areas and level
if (strcasecmp(cmd[1].c_str(), "AREAS") == 0) {
L.getSink(0)->setAreas(calcAreas(cmd[2]));
result << "done";
src/ebusd/ebusd.cpp
-2
View File
@@ -41,8 +41,6 @@ void define_args()
A.setVersion(""PACKAGE_STRING"");
A.addText("test");
A.addOption("address", "a", OptVal("FF"), dt_string, ot_mandatory,
"\tebus device address (FF)");
src/ebusd/ebusloop.cpp
+41 -36
View File
@@ -244,30 +244,36 @@ void EBusLoop::collectCycData(const int numRecv)
void EBusLoop::analyseCycData()
{
L.log(bus, trace, "%s", m_sstr.getDataStr().c_str());
static bool skipfirst = false;
int index = m_commands->storeCycData(m_sstr.getDataStr());
if (skipfirst == true) {
L.log(bus, trace, "%s", m_sstr.getDataStr().c_str());
if (index == -1) {
L.log(bus, debug, " command not found");
}
else if (index == -2) {
L.log(bus, debug, " no commands defined");
}
else if (index == -3) {
L.log(bus, debug, " search skipped - string too short");
}
else {
std::string tmp;
tmp += (*m_commands)[index][1];
tmp += " ";
tmp += (*m_commands)[index][2];
L.log(bus, event, " cycle [%4d] %s", index, tmp.c_str());
}
int index = m_commands->storeCycData(m_sstr.getDataStr());
// collect Slave address
if (index != -3)
collectSlave();
if (index == -1) {
L.log(bus, debug, " command not found");
}
else if (index == -2) {
L.log(bus, debug, " no commands defined");
}
else if (index == -3) {
L.log(bus, debug, " search skipped - string too short");
}
else {
std::string tmp;
tmp += (*m_commands)[index][1];
tmp += " ";
tmp += (*m_commands)[index][2];
L.log(bus, event, " cycle [%4d] %s", index, tmp.c_str());
}
// collect Slave address
if (index != -3)
collectSlave();
}
else
skipfirst = true;
}
void EBusLoop::addPollCommand()
@@ -571,7 +577,7 @@ void EBusLoop::collectSlave()
unsigned char mm = m_sstr[i];
if (i == 0) {
if (mm == 0xff)
if (mm == 0xFF)
mm = 0x04;
else
mm += 0x05;
@@ -594,7 +600,7 @@ void EBusLoop::addScanCommand()
std::stringstream sstr;
if (m_scanFull == true) {
for (; m_scanIndex <= 0xff; m_scanIndex++) {
for (; m_scanIndex <= 0xFF; m_scanIndex++) {
if (isMaster(m_scanIndex) == false && m_scanIndex != SYN
&& m_scanIndex != ESC && m_scanIndex != BROADCAST) {
sstr << std::nouppercase << std::setw(2) << std::setfill('0')
@@ -602,9 +608,6 @@ void EBusLoop::addScanCommand()
break;
}
}
if (m_scanIndex == 0xff)
m_scan = false;
}
else {
sstr << std::nouppercase << std::setw(2) << std::setfill('0')
@@ -614,19 +617,21 @@ void EBusLoop::addScanCommand()
m_scan = false;
}
m_scanIndex++;
if (m_scanIndex > 0xFF)
m_scan = false;
else {
m_scanIndex++;
ebusCommand += sstr.str();
ebusCommand += "070400";
std::transform(ebusCommand.begin(), ebusCommand.end(), ebusCommand.begin(), tolower);
ebusCommand += sstr.str();
ebusCommand += "070400";
std::transform(ebusCommand.begin(), ebusCommand.end(), ebusCommand.begin(), tolower);
L.log(bus, event, " scanning address %s", sstr.str().c_str());
L.log(bus, event, " scanning address %s", sstr.str().c_str());
BusCommand* busCommand = new BusCommand(ebusCommand, true, true);
L.log(bus, trace, " msg: %s", ebusCommand.c_str());
addBusCommand(busCommand);
BusCommand* busCommand = new BusCommand(ebusCommand, true, true);
L.log(bus, trace, " msg: %s", ebusCommand.c_str());
addBusCommand(busCommand);
}
}
src/lib/utils/appl.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ void Appl::printHelp()
for (o_it = m_opts.begin(); o_it < m_opts.end(); o_it++) {
if (strcmp(o_it->name, "__text_only__") == 0)
continue;
std::cerr << o_it->description << std::endl;
else {
const char* c = (strlen(o_it->shortname) == 1) ? o_it->shortname : " ";
std::cerr << ((strcmp(c, " ") == 0) ? " " : "-") << c