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

moved list of loaded files from BusHandler to MessageMap, include ebusd in "info" command and fixed missing master 1 and reveal address conflict with ebusd

Browse Source
This commit is contained in:
john30
2016-04-30 16:52:28 +02:00
parent 042f6655d1
commit 4089923bd9
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+23 -12
View File
@@ -177,7 +177,6 @@ bool ActiveBusRequest::notify(result_t result, SymbolString& slave)
void BusHandler::clear() void BusHandler::clear()
{ {
m_loadedFiles.clear();
memset(m_seenAddresses, 0, sizeof(m_seenAddresses)); memset(m_seenAddresses, 0, sizeof(m_seenAddresses));
m_masterCount = 1; m_masterCount = 1;
m_scanResults.clear(); m_scanResults.clear();
@@ -923,22 +922,33 @@ void BusHandler::formatScanResult(ostringstream& output)
void BusHandler::formatSeenInfo(ostringstream& output) void BusHandler::formatSeenInfo(ostringstream& output)
{ {
for (unsigned char slave = 1; slave != 0; slave++) { // 0 is known to be a master unsigned char address = 0;
if (isValidAddress(slave, false) && (m_seenAddresses[slave]&SEEN)!=0) { for (int index=0; index<256; index++, address++) {
output << endl << "address " << setfill('0') << setw(2) << hex << static_cast<unsigned>(slave); if (isValidAddress(address, false)
&& ((m_seenAddresses[address]&SEEN)!=0 || address==m_ownMasterAddress || address==m_ownSlaveAddress)) {
output << endl << "address " << setfill('0') << setw(2) << hex << static_cast<unsigned>(address);
unsigned char master; unsigned char master;
if (isMaster(slave)) { if (isMaster(address)) {
output << ": master"; output << ": master";
master = slave; master = address;
} else { } else {
output << ": slave"; output << ": slave";
master = getMasterAddress(slave); master = getMasterAddress(address);
} }
if (master != SYN) if (master != SYN)
output << " #" << setw(0) << dec << static_cast<unsigned>(getMasterNumber(master)); output << " #" << setw(0) << dec << static_cast<unsigned>(getMasterNumber(master));
if ((m_seenAddresses[slave]&SCAN_DONE)!=0) { if (address==m_ownMasterAddress || (m_answer && address==m_ownSlaveAddress)) {
output << ", ebusd";
if (m_answer) {
output << " (answering)";
}
if ((m_seenAddresses[address]&SEEN)!=0) {
output << ", conflict";
}
}
if ((m_seenAddresses[address]&SCAN_DONE)!=0) {
output << ", scanned"; output << ", scanned";
Message* message = m_messages->getScanMessage(slave); Message* message = m_messages->getScanMessage(address);
if (message!=NULL && message->getLastUpdateTime()>0) { if (message!=NULL && message->getLastUpdateTime()>0) {
// add detailed scan info: Manufacturer ID SW HW // add detailed scan info: Manufacturer ID SW HW
output << " \""; output << " \"";
@@ -949,8 +959,9 @@ void BusHandler::formatSeenInfo(ostringstream& output)
output << "\""; output << "\"";
} }
} }
if ((m_seenAddresses[slave]&LOAD_DONE)!=0) string loadedFiles = m_messages->getLoadedFiles(address);
output << ", loaded \"" << m_loadedFiles[slave] << "\""; if (!loadedFiles.empty())
output << ", loaded " << loadedFiles;
} }
} }
} }
@@ -1035,6 +1046,6 @@ void BusHandler::setScanConfigLoaded(unsigned char address, string file) {
m_seenAddresses[address] |= LOAD_INIT; m_seenAddresses[address] |= LOAD_INIT;
if (!file.empty()) { if (!file.empty()) {
m_seenAddresses[address] |= LOAD_DONE; m_seenAddresses[address] |= LOAD_DONE;
m_loadedFiles[address] = file; m_messages->addLoadedFile(address, file);
} }
} }
src/ebusd/bushandler.h
-3
View File
@@ -569,9 +569,6 @@ private:
/** the participating bus addresses seen so far (0 if not seen yet, or combination of @a SEEN bits). */ /** the participating bus addresses seen so far (0 if not seen yet, or combination of @a SEEN bits). */
unsigned char m_seenAddresses[256]; unsigned char m_seenAddresses[256];
/** the loaded configuration files by slave address. */
map<unsigned char, string> m_loadedFiles;
/** the scan results by slave address. */ /** the scan results by slave address. */
map<unsigned char, string> m_scanResults; map<unsigned char, string> m_scanResults;