fix(protocol): do not try to parse yet unknown error message

tspopp · Nov 11, 2024 · bd84167 · bd84167
1 parent 6c43451
commit bd84167
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/AquaMQTT/include/message/MessageConstants.h b/AquaMQTT/include/message/MessageConstants.h
@@ -34,7 +34,7 @@ constexpr uint8_t ENERGY_MESSAGE_LENGTH_LEGACY      = 31;
 
 constexpr uint8_t ERROR_MESSAGE_IDENTIFIER  = 74;
 // TODO: analyze serial protocol for error messages
-constexpr uint8_t ERROR_MESSAGE_LENGTH_NEXT = 255;
+constexpr uint8_t ERROR_MESSAGE_LENGTH_NEXT = 0;
 constexpr uint8_t ERROR_MESSAGE_LENGTH_LEGACY      = 35;
 
 // this will work as long as they will always differ in length

diff --git a/AquaMQTT/src/buffer/FrameBuffer.cpp b/AquaMQTT/src/buffer/FrameBuffer.cpp
@@ -195,17 +195,20 @@ bool FrameBuffer::isSync()
             return ((mBuffer[0] == HMI_MESSAGE_IDENTIFIER && mBuffer[1] == HMI_MESSAGE_LENGTH_NEXT)
                     || (mBuffer[0] == MAIN_MESSAGE_IDENTIFIER && mBuffer[1] == MAIN_MESSAGE_LENGTH_NEXT)
                     || (mBuffer[0] == ENERGY_MESSAGE_IDENTIFIER && mBuffer[1] == ENERGY_MESSAGE_LENGTH_NEXT)
-                    || (mBuffer[0] == ERROR_MESSAGE_IDENTIFIER && mBuffer[1] == ERROR_MESSAGE_LENGTH_NEXT));
+                    // TODO: reenable as soon as we know the length of the NEXT error message
+                    /*|| (mBuffer[0] == ERROR_MESSAGE_IDENTIFIER && mBuffer[1] == ERROR_MESSAGE_LENGTH_NEXT)*/);
         default:
         case PROTOCOL_UNKNOWN:
             return ((mBuffer[0] == HMI_MESSAGE_IDENTIFIER && mBuffer[1] == HMI_MESSAGE_LENGTH_NEXT)
                     || (mBuffer[0] == MAIN_MESSAGE_IDENTIFIER && mBuffer[1] == MAIN_MESSAGE_LENGTH_NEXT)
                     || (mBuffer[0] == ENERGY_MESSAGE_IDENTIFIER && mBuffer[1] == ENERGY_MESSAGE_LENGTH_NEXT)
                     || (mBuffer[0] == ERROR_MESSAGE_IDENTIFIER && mBuffer[1] == ERROR_MESSAGE_LENGTH_NEXT)
                     || (mBuffer[0] == HMI_MESSAGE_IDENTIFIER && mBuffer[1] == HMI_MESSAGE_LENGTH_LEGACY)
-                    || (mBuffer[0] == MAIN_MESSAGE_IDENTIFIER && mBuffer[1] == MAIN_MESSAGE_LENGTH_LEGACY)
+                    || (mBuffer[0] == MAIN_MESSAGE_IDENTIFIER && mBuffer[1] == HMI_MESSAGE_LENGTH_LEGACY)
                     || (mBuffer[0] == ENERGY_MESSAGE_IDENTIFIER && mBuffer[1] == ENERGY_MESSAGE_LENGTH_LEGACY)
-                    || (mBuffer[0] == ERROR_MESSAGE_IDENTIFIER && mBuffer[1] == ERROR_MESSAGE_LENGTH_LEGACY));
+                    // TODO: reenable as soon as we know the length of the NEXT error message
+                    //|| (mBuffer[0] == ERROR_MESSAGE_IDENTIFIER && mBuffer[1] == ENERGY_MESSAGE_LENGTH_LEGACY)
+                    );
     }
 }
 uint64_t FrameBuffer::getDroppedCount() const