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

formatting

Browse Source
This commit is contained in:
John
2023-10-14 16:24:46 +02:00
parent 5e2509b60c
commit 4c453a2354
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+2 -1
View File
@@ -1095,9 +1095,10 @@ result_t MainLoop::executeWrite(const vector<string>& args, const string levels,
if (!message->isWrite()) {
return RESULT_ERR_INVALID_ARG;
}
if (circuit.length() > 0 && circuit != message->getCircuit()) {
if (!circuit.empty() && circuit != message->getCircuit()) {
return RESULT_ERR_INVALID_ARG; // non-matching circuit
}
// send message
SlaveSymbolString slave;
ret = m_protocol->sendAndWait(master, &slave);
src/ebusd/mqtthandler.cpp
+10 -4
View File
@@ -841,18 +841,24 @@ void MqttHandler::run() {
}
if (includeActiveWrite) {
if (message->isWrite()) {
bool skipMultiFieldWrite = (!m_hasDefinitionFieldsPayload || m_publishByField) && !message->isPassive() && message->getFieldCount() > 1;
bool skipMultiFieldWrite = (!m_hasDefinitionFieldsPayload || m_publishByField)
&& !message->isPassive() && message->getFieldCount() > 1;
if (skipMultiFieldWrite) {
continue; // multi-field message is not writable when publishing by field or combining multiple fields in one definition, so skip it
// multi-field message is not writable when publishing by field or combining
// multiple fields in one definition, so skip it
continue;
}
} else {
// check for existance of write message with same name
Message* write = m_messages->find(message->getCircuit(), message->getName(), "", true);
if (write) {
bool skipMultiFieldWrite = (!m_hasDefinitionFieldsPayload || m_publishByField) && write->getFieldCount() > 1;
bool skipMultiFieldWrite = (!m_hasDefinitionFieldsPayload || m_publishByField)
&& write->getFieldCount() > 1;
if (!skipMultiFieldWrite) {
continue; // avoid sending definition of read AND write message with the same key
} // else: multi-field write message is not writable when publishing by field or combining multiple fields in one definition, so skip it
}
// else: multi-field write message is not writable when publishing by field or combining
// multiple fields in one definition, so skip it
}
}
}