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

automatically start grabbing all messages, add circuit+message name to grab result if known

Browse Source
This commit is contained in:
john30
2016-04-24 11:13:25 +02:00
parent d1e4a838b9
commit be4bbaaf67
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+7 -2
View File
@@ -785,10 +785,15 @@ void BusHandler::receiveCompleted()
if (m_grabUnknownMessages==gr_all || (message==NULL && m_grabUnknownMessages==gr_unknown)) { if (m_grabUnknownMessages==gr_all || (message==NULL && m_grabUnknownMessages==gr_unknown)) {
string data; string data;
string key = data = m_command.getDataStr(); string key = data = m_command.getDataStr();
if (key.length() > 2*(1+1+2+1+4)) if (key.length() > 2*(1+1+2+1+4)) {
key = key.substr(0, 2*(1+1+2+1+4)); // QQZZPBSBNN + up to 4 DD bytes key = key.substr(0, 2*(1+1+2+1+4)); // QQZZPBSBNN + up to 4 DD bytes
if (dstAddress != BROADCAST && !master) }
if (dstAddress != BROADCAST && !master) {
data += " / " + m_response.getDataStr(); data += " / " + m_response.getDataStr();
}
if (message) {
data += " = "+message->getCircuit()+" "+message->getName();
}
m_grabbedUnknownMessages[key] = data; m_grabbedUnknownMessages[key] = data;
} }
if (message == NULL) { if (message == NULL) {
src/ebusd/bushandler.h
+1 -1
View File
@@ -326,7 +326,7 @@ public:
m_symPerSec(0), m_maxSymPerSec(0), m_symPerSec(0), m_maxSymPerSec(0),
m_state(bs_noSignal), m_repeat(false), m_state(bs_noSignal), m_repeat(false),
m_command(false), m_commandCrcValid(false), m_response(false), m_responseCrcValid(false), m_command(false), m_commandCrcValid(false), m_response(false), m_responseCrcValid(false),
m_grabUnknownMessages(gr_none) { m_grabUnknownMessages(gr_all) {
memset(m_seenAddresses, 0, sizeof(m_seenAddresses)); memset(m_seenAddresses, 0, sizeof(m_seenAddresses));
} }