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

adapted to static ident fields

Browse Source
This commit is contained in:
john30
2015-10-25 19:48:01 +01:00
parent fe6c79296d
commit 2ca0ed6495
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+2 -5
View File
@@ -625,7 +625,6 @@ result_t BusHandler::handleSymbol()
return RESULT_OK; return RESULT_OK;
} }
result_t BusHandler::setState(BusState state, result_t result, bool firstRepetition) result_t BusHandler::setState(BusState state, result_t result, bool firstRepetition)
{ {
if (m_currentRequest != NULL) { if (m_currentRequest != NULL) {
@@ -811,10 +810,8 @@ result_t BusHandler::startScan(bool full)
break; break;
} }
} }
if (scanMessage == NULL) { if (scanMessage == NULL)
DataFieldSet* identFields = DataFieldSet::createIdentFields(); scanMessage = m_scanMessage;
scanMessage = m_scanMessage = new Message(false, false, 0x07, 0x04, identFields);
}
if (scanMessage == NULL) if (scanMessage == NULL)
return RESULT_ERR_NOTFOUND; return RESULT_ERR_NOTFOUND;
src/ebusd/bushandler.h
+1
View File
@@ -281,6 +281,7 @@ public:
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_scanMessage(NULL), m_grabUnknownMessages(false) { m_scanMessage(NULL), m_grabUnknownMessages(false) {
memset(m_seenAddresses, 0, sizeof(m_seenAddresses)); memset(m_seenAddresses, 0, sizeof(m_seenAddresses));
m_scanMessage = new Message(false, false, 0x07, 0x04, DataFieldSet::getIdentFields(), true);
} }
/** /**