wip(odyssee): implemented latest findings

tspopp · Feb 11, 2025 · 4080e1a · 4080e1a
1 parent 9692e05
commit 4080e1a
Show file tree

Hide file tree

Showing 17 changed files with 448 additions and 369 deletions.
diff --git a/AquaMQTT/include/message/IMainMessage.h b/AquaMQTT/include/message/IMainMessage.h
@@ -14,6 +14,8 @@ enum class MAIN_ATTR_FLOAT
     EVAPORATOR_LOWER_TEMPERATURE,
     COMPRESSOR_OUTLET_TEMPERATURE,
     FAN_SPEED_PWM,
+    WATER_UPPER_TEMPERATURE,
+    WATER_LOWER_TEMPERATURE,
 };
 
 enum class MAIN_ATTR_BOOL

diff --git a/AquaMQTT/include/message/legacy/HMIMessage.h b/AquaMQTT/include/message/legacy/HMIMessage.h
@@ -11,7 +11,7 @@ namespace aquamqtt::message::legacy
 class HMIMessage : public IHMIMessage
 {
 public:
-    explicit HMIMessage(uint8_t* data, uint8_t* previous = nullptr);
+    explicit HMIMessage(uint8_t* data, const uint8_t* previous = nullptr);
 
     ~HMIMessage() override = default;
 
@@ -43,7 +43,7 @@ class HMIMessage : public IHMIMessage
     bool hasChanged(HMI_ATTR_STR attr) const override;
 
 private:
-    void compareWith(uint8_t* data);
+    void compareWith(const uint8_t* data);
 
     bool                     mCreatedWithoutPrevious;
     std::set<HMI_ATTR_U8>    mHasChangedU8;

diff --git a/AquaMQTT/include/message/legacy/MainStatusMessage.h b/AquaMQTT/include/message/legacy/MainStatusMessage.h
@@ -12,7 +12,7 @@ namespace aquamqtt::message::legacy
 class MainStatusMessage : public IMainMessage
 {
 public:
-    explicit MainStatusMessage(uint8_t* data, uint8_t* previous = nullptr);
+    explicit MainStatusMessage(uint8_t* data, const uint8_t* previous = nullptr);
 
     ~MainStatusMessage() override = default;
 
@@ -39,7 +39,7 @@ class MainStatusMessage : public IMainMessage
     bool hasChanged(MAIN_ATTR_U16 attr) const override;
 
 private:
-    void compareWith(uint8_t* data);
+    void compareWith(const uint8_t* data);
 
     bool     mCreatedWithoutPrevious;
     uint8_t* mData;

diff --git a/AquaMQTT/include/message/next/HMIMessage.h b/AquaMQTT/include/message/next/HMIMessage.h
@@ -11,7 +11,7 @@ namespace aquamqtt::message::next
 class HMIMessage : public IHMIMessage
 {
 public:
-    explicit HMIMessage(uint8_t* data, uint8_t* previous = nullptr);
+    explicit HMIMessage(uint8_t* data, const uint8_t* previous = nullptr);
 
     ~HMIMessage() override = default;
 
@@ -43,7 +43,7 @@ class HMIMessage : public IHMIMessage
     bool hasChanged(HMI_ATTR_STR attr) const override;
 
 private:
-    void compareWith(uint8_t* data);
+    void compareWith(const uint8_t* data);
 
     bool                     mCreatedWithoutPrevious;
     std::set<HMI_ATTR_U8>    mHasChangedU8;

diff --git a/AquaMQTT/include/message/next/MainStatusMessage.h b/AquaMQTT/include/message/next/MainStatusMessage.h
@@ -12,7 +12,7 @@ namespace aquamqtt::message::next
 class MainStatusMessage : public IMainMessage
 {
 public:
-    explicit MainStatusMessage(uint8_t* data, uint8_t* previous = nullptr);
+    explicit MainStatusMessage(uint8_t* data, const uint8_t* previous = nullptr);
 
     ~MainStatusMessage() override = default;
 
@@ -39,7 +39,7 @@ class MainStatusMessage : public IMainMessage
     bool hasChanged(MAIN_ATTR_U16 attr) const override;
 
 private:
-    void compareWith(uint8_t* data);
+    void compareWith(const uint8_t* data);
 
     bool     mCreatedWithoutPrevious;
     uint8_t* mData;

diff --git a/AquaMQTT/include/message/odyssee/HMIMessage.h b/AquaMQTT/include/message/odyssee/HMIMessage.h
@@ -11,7 +11,7 @@ namespace aquamqtt::message::odyssee
 class HMIMessage : public IHMIMessage
 {
 public:
-    explicit HMIMessage(uint8_t* data, uint8_t* previous = nullptr);
+    explicit HMIMessage(uint8_t* data, const uint8_t* previous = nullptr);
 
     ~HMIMessage() override = default;
 
@@ -43,7 +43,7 @@ class HMIMessage : public IHMIMessage
     bool hasChanged(HMI_ATTR_STR attr) const override;
 
 private:
-    void compareWith(uint8_t* data);
+    void compareWith(const uint8_t* data);
 
     bool                     mCreatedWithoutPrevious;
     std::set<HMI_ATTR_U8>    mHasChangedU8;

diff --git a/AquaMQTT/include/message/odyssee/MainStatusMessage.h b/AquaMQTT/include/message/odyssee/MainStatusMessage.h
@@ -12,7 +12,7 @@ namespace aquamqtt::message::odyssee
 class MainStatusMessage : public IMainMessage
 {
 public:
-    explicit MainStatusMessage(uint8_t* data, uint8_t* previous = nullptr);
+    explicit MainStatusMessage(uint8_t* data, const uint8_t* previous = nullptr);
 
     ~MainStatusMessage() override = default;
 
@@ -39,7 +39,7 @@ class MainStatusMessage : public IMainMessage
     bool hasChanged(MAIN_ATTR_U16 attr) const override;
 
 private:
-    void compareWith(uint8_t* data);
+    void compareWith(const uint8_t* data);
 
     bool     mCreatedWithoutPrevious;
     uint8_t* mData;

diff --git a/AquaMQTT/include/mqtt/MQTTDefinitions.h b/AquaMQTT/include/mqtt/MQTTDefinitions.h
@@ -22,9 +22,9 @@ constexpr char ENUM_UNKNOWN[] = { "UNKNOWN" };
 constexpr char ENUM_AQUAMQTT_MODE_LISTENER[] = { "LISTENER" };
 constexpr char ENUM_AQUAMQTT_MODE_MITM[]     = { "MITM" };
 
-constexpr char ENUM_AQUAMQTT_PROTOCOL_LEGACY[] = { "LEGACY" };
+constexpr char ENUM_AQUAMQTT_PROTOCOL_LEGACY[]  = { "LEGACY" };
 constexpr char ENUM_AQUAMQTT_PROTOCOL_NEXT[]    = { "NEXT" };
-constexpr char ENUM_AQUAMQTT_PROTOCOL_ODYSSEE[]    = { "ODYSSEE" };
+constexpr char ENUM_AQUAMQTT_PROTOCOL_ODYSSEE[] = { "ODYSSEE" };
 
 constexpr char ENUM_BRAND_ATLANTIC[] = { "Atlantic" };
 constexpr char ENUM_BRAND_THERMOR[]  = { "Thermor" };
@@ -79,6 +79,8 @@ constexpr char ENUM_AQUAMQTT_OVERRIDE_MODE_PV_FULL[] = { "PV BOOST" };
 // Subtopics
 constexpr char MAIN_ERROR_CODE[]                = { "errorCode" };
 constexpr char MAIN_HOT_WATER_TEMP[]            = { "waterTemp" };
+constexpr char MAIN_HOT_WATER_TEMP_LOWER[]      = { "waterTempLower" };
+constexpr char MAIN_HOT_WATER_TEMP_UPPER[]      = { "waterTempUpper" };
 constexpr char MAIN_SUPPLY_AIR_TEMP[]           = { "supplyAirTemp" };
 constexpr char MAIN_EVAPORATOR_AIR_TEMP_UPPER[] = { "evaporatorAirTemp" };
 constexpr char MAIN_EVAPORATOR_AIR_TEMP_LOWER[] = { "evaporatorAirTempLower" };

diff --git a/AquaMQTT/include/task/MQTTTask.h b/AquaMQTT/include/task/MQTTTask.h
@@ -69,6 +69,10 @@ class MQTTTask
     float              mHotWaterTempFiltered;
     SimpleKalmanFilter mCompressorTempFilter;
     float              mCompressorTempFiltered;
+    SimpleKalmanFilter mHotWaterTempUpperFilter;
+    float              mHotWaterTempUpperFiltered;
+    SimpleKalmanFilter mHotWaterTempLowerFilter;
+    float              mHotWaterTempLowerFiltered;
 
     // helper to avoid code duplication
     void publishFloat(const char* subtopic, const char* topic, float value, bool retained = false);