Fix Command Processing: Write to KO for diagnoseKO only

Author: cornelius-koepp

CHANGELOG.md

@@ -1,3 +1,8 @@
+## upcoming (v0.6.1 or v0.7.0)
+
+* Fix #52: Die Diagnose-Kommandos haben auch beim Aufruf von Konsole aufs KO geschrieben
+
+
 # 2025-07-18 v0.6.0
 
 * Fix #48: Diagnose-Kommandos im Modul wurden auch angezeigt und verarbeitet, wenn das Gerät nicht konfiguriert ist

src/DfaChannel.cpp

@@ -675,7 +675,7 @@ void DfaChannel::restore()
 
 #pragma region "DFA_CHANNEL_COMMANDS"
 
-bool DfaChannel::processCommandDfa()
+bool DfaChannel::processCommandDfa(bool diagnoseKo)
 {
     logDebugP("status and remaining delay");
     const uint8_t state = _state + 1;
@@ -697,33 +697,35 @@ bool DfaChannel::processCommandDfa()
         const uint16_t timeoutHours = remaining;
 
         logInfoP((timeoutHours < 10) ? "%02d%c%d:%02d:%02d.%03d" : "%02d%c%5d:%02d:%02d", state, mode, timeoutHours, timeoutMinutes, timeoutSeconds, timeoutMillis);
-        openknx.console.writeDiagenoseKo((timeoutHours < 10) ? "%02d%c%d:%02d:%02d.%03d" : "%02d%c%5d:%02d:%02d", state, mode, timeoutHours, timeoutMinutes, timeoutSeconds, timeoutMillis);
+        if (diagnoseKo)
+            openknx.console.writeDiagenoseKo((timeoutHours < 10) ? "%02d%c%d:%02d:%02d.%03d" : "%02d%c%5d:%02d:%02d", state, mode, timeoutHours, timeoutMinutes, timeoutSeconds, timeoutMillis);
     }
     else
     {
         logInfoP("%02d%cNO_TIMEOUT", state, mode);
-        openknx.console.writeDiagenoseKo("%02d%c NO_TIMEOUT", state, mode);
+        if (diagnoseKo)
+            openknx.console.writeDiagenoseKo("%02d%c NO_TIMEOUT", state, mode);
     }
     return true;
 }
 
-bool DfaChannel::processCommandDfaTimeout()
+bool DfaChannel::processCommandDfaTimeout(bool diagnoseKo)
 {
     logInfoP("timeout end now!");
     // TODO define behaviour when disabled
     endTimeout();
     return true;
 }
 
-bool DfaChannel::processCommandDfaStateSet(const uint8_t stateStarting1)
+bool DfaChannel::processCommandDfaStateSet(const uint8_t stateStarting1, bool diagnoseKo)
 {
     const uint8_t state = stateStarting1 - 1;
     // TODO check setState returning valid state
     setState(state);
     return isValidState(state);
 }
 
-bool DfaChannel::processCommandDfaSymbolInsert(const uint8_t inputSymbolNumber)
+bool DfaChannel::processCommandDfaSymbolInsert(const uint8_t inputSymbolNumber, bool diagnoseKo)
 {
     transfer(inputSymbolNumber);
     return true;

src/DfaChannel.h

@@ -112,8 +112,8 @@ class DfaChannel : public OpenKNX::Channel
     void save();
     void restore();
 
-    bool processCommandDfa();
-    bool processCommandDfaTimeout();
-    bool processCommandDfaStateSet(const uint8_t stateStarting1);
-    bool processCommandDfaSymbolInsert(const uint8_t inputSymbolNumber);
+    bool processCommandDfa(bool diagnoseKo);
+    bool processCommandDfaTimeout(bool diagnoseKo);
+    bool processCommandDfaStateSet(const uint8_t stateStarting1, bool diagnoseKo);
+    bool processCommandDfaSymbolInsert(const uint8_t inputSymbolNumber, bool diagnoseKo);
 };

src/DfaModule.cpp

@@ -216,7 +216,7 @@ bool DfaModule::processCommand(const std::string cmd, bool diagnoseKo)
             if (cmdLength == 5)
             {
                 logDebugP("=> DFA-Channel<%u> overview!", (channelIdx + 1));
-                return _channels[channelIdx]->processCommandDfa();
+                return _channels[channelIdx]->processCommandDfa(diagnoseKo);
             }
             else if (!diagnoseKo || ParamDFA_DiagnoseAccess == 1) // writing to DFAs is allowed
             {
@@ -225,21 +225,21 @@ bool DfaModule::processCommand(const std::string cmd, bool diagnoseKo)
                     if (cmd.substr(5, 9) == " timeout!")
                     {
                         logDebugP("=> DFA-Channel<%u> timeout end now!", (channelIdx + 1));
-                        return _channels[channelIdx]->processCommandDfaTimeout();
+                        return _channels[channelIdx]->processCommandDfaTimeout(diagnoseKo);
                     }
                     else if (cmd.substr(5, 7) == " state=" && std::isdigit(cmd[12]) && std::isdigit(cmd[13]))
                     {
                         const uint8_t newState = std::stoi(cmd.substr(12, 2));
 
                         logDebugP("=> DFA-Channel<%u> set state=%u!", (channelIdx + 1), newState);
-                        return _channels[channelIdx]->processCommandDfaStateSet(newState);
+                        return _channels[channelIdx]->processCommandDfaStateSet(newState, diagnoseKo);
                     }
                     else if (cmd.substr(5, 8) == " symbol=" && ('A' <= cmd[13] && cmd[13] <= 'H'))
                     {
                         const uint8_t inputSymbolNumber = cmd[13] - 'A';
 
                         logDebugP("=> DFA-Channel<%u> input Symbol=%c (%u)!", (channelIdx + 1), ('A' + inputSymbolNumber), inputSymbolNumber);
-                        return _channels[channelIdx]->processCommandDfaSymbolInsert(inputSymbolNumber);
+                        return _channels[channelIdx]->processCommandDfaSymbolInsert(inputSymbolNumber, diagnoseKo);
                     }
                 }
             }