feat(protocol-next): initial support for additional heatpump protocol…

… E/E

AquaMQTT/.clang-format

@@ -135,3 +135,4 @@ PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
+SeparateDefinitionBlocks: Always

AquaMQTT/.gitignore

@@ -1,3 +1,4 @@
 .pio
 include/config/CustomConfiguration.h
+include/config/CustomConfigurationProd.h
 .vscode

AquaMQTT/include/Version.h

@@ -1,4 +1,4 @@
 namespace aquamqtt
 {
-constexpr char VERSION[] = "v1.4.2";
+constexpr char VERSION[] = "v1.5.0";
 }

AquaMQTT/include/buffer/FrameBuffer.h

@@ -24,6 +24,8 @@ class FrameBuffer
     uint64_t getHandledCount() const;
 
 private:
+    aquamqtt::message::ProtocolVersion mLockedProtocol;
+
     int handleFrame();
 
     bool isSync();

AquaMQTT/include/config/Configuration.h

@@ -18,6 +18,7 @@ namespace aquamqtt
 {
 namespace config
 {
+
 /**
  * Defines the network name of your esp32 device in your network
  */
@@ -74,7 +75,7 @@ constexpr bool MQTT_PUBLISH_SERIAL_STATISTICS = true;
  * enable this, if you are customizing the NTP timezone or server or even trying to
  * use the RTC module from the AquaMQTT board.
  */
-constexpr bool MQTT_PUBLISH_HEATPUMP_TIME_AND_DATE = false;
+constexpr bool MQTT_PUBLISH_HEATPUMP_TIME_AND_DATE = true;
 
 /**
  * Change the time interval where all known attributes are re-published to the MQTT broker.

AquaMQTT/include/message/IEnergyMessage.h

@@ -0,0 +1,50 @@
+#ifndef AQUAMQTT_IENERGYMESSAGE_H
+#define AQUAMQTT_IENERGYMESSAGE_H
+
+#include "MessageConstants.h"
+
+namespace aquamqtt::message
+{
+
+enum class ENERGY_ATTR_U16
+{
+    POWER_HEATPUMP,
+    POWER_HEATELEMENT,
+    POWER_TOTAL,
+    WATER_TOTAL
+};
+
+enum class ENERGY_ATTR_U32
+{
+    TOTAL_HEATPUMP_HOURS,
+    TOTAL_HEATING_ELEMENT_HOURS,
+    TOTAL_HOURS,
+};
+
+enum class ENERGY_ATTR_U64
+{
+    TOTAL_ENERGY,
+};
+
+class IEnergyMessage
+{
+public:
+    virtual ~IEnergyMessage() = default;
+
+    virtual uint8_t getLength() = 0;
+
+    virtual uint64_t getAttr(ENERGY_ATTR_U64 attr) = 0;
+    virtual uint32_t getAttr(ENERGY_ATTR_U32 attr) = 0;
+    virtual uint16_t getAttr(ENERGY_ATTR_U16 attr) = 0;
+
+    virtual bool hasAttr(ENERGY_ATTR_U64 attr) const = 0;
+    virtual bool hasAttr(ENERGY_ATTR_U32 attr) const = 0;
+    virtual bool hasAttr(ENERGY_ATTR_U16 attr) const = 0;
+
+    virtual bool hasChanged(ENERGY_ATTR_U64 attr) const = 0;
+    virtual bool hasChanged(ENERGY_ATTR_U32 attr) const = 0;
+    virtual bool hasChanged(ENERGY_ATTR_U16 attr) const = 0;
+};
+}  // namespace aquamqtt::message
+
+#endif  // AQUAMQTT_IENERGYMESSAGE_H

AquaMQTT/include/message/IErrorMessage.h

@@ -0,0 +1,55 @@
+#ifndef AQUAMQTT_IERRORMESSAGE_H
+#define AQUAMQTT_IERRORMESSAGE_H
+
+#include "MessageConstants.h"
+
+namespace aquamqtt::message
+{
+
+enum class ERROR_ATTR_U8
+{
+    ERROR_REQUEST_ID,
+    ERROR_ERROR_CODE,
+    ERROR_TIME_MINUTES,
+    ERROR_TIME_HOURS,
+    ERROR_DATE_DAY,
+    ERROR_DATE_MONTH,
+    ERROR_DATE_YEAR
+};
+
+enum class ERROR_ATTR_FLOAT
+{
+    ERROR_WATER_TEMPERATURE,
+    ERROR_AIR_TEMPERATURE,
+    ERROR_EVAPORATOR_UPPER_TEMPERATURE,
+    ERROR_EVAPORATOR_LOWER_TEMPERATURE,
+    ERROR_COMPRESSOR_OUTLET_TEMPERATURE,
+    ERROR_FAN_SPEED_PWM,
+};
+
+enum class ERROR_ATTR_U16
+{
+    ERROR_TOTAL_HEATPUMP_HOURS,
+    ERROR_TOTAL_HEATING_ELEMENT_HOURS,
+};
+
+class IErrorMessage
+{
+public:
+    virtual ~IErrorMessage() = default;
+
+    virtual uint8_t getLength() = 0;
+
+    virtual bool isEmpty() = 0;
+
+    virtual uint8_t  getAttr(ERROR_ATTR_U8 attr)    = 0;
+    virtual uint16_t getAttr(ERROR_ATTR_U16 attr)   = 0;
+    virtual float    getAttr(ERROR_ATTR_FLOAT attr) = 0;
+
+    virtual bool hasAttr(ERROR_ATTR_U8 attr) const    = 0;
+    virtual bool hasAttr(ERROR_ATTR_U16 attr) const   = 0;
+    virtual bool hasAttr(ERROR_ATTR_FLOAT attr) const = 0;
+};
+}  // namespace aquamqtt::message
+
+#endif  // AQUAMQTT_IERRORMESSAGE_H