MQTT : publish on change implemented

Lenti84 · Mar 28, 2023 · 261adcf · 261adcf
1 parent c2fa46d
commit 261adcf
Show file tree

Hide file tree

Showing 9 changed files with 2,375 additions and 2,094 deletions.
diff --git a/software_esp32/include/VdmConfig.h b/software_esp32/include/VdmConfig.h
@@ -88,6 +88,7 @@ typedef struct  {
   uint8_t publishAllTemps : 1;
   uint8_t publishPathAsRoot : 1 ;
   uint8_t publishUpTime : 1;
+  uint8_t publishOnChange : 1;
 } VDM_PROTOCOL_CONFIG_FLAGS;
 
 typedef struct {
@@ -100,6 +101,7 @@ typedef struct {
   char userPwd[65];
   VDM_PROTOCOL_CONFIG_FLAGS protocolFlags;
   uint16_t keepAliveTime;
+  uint32_t minBrokerDelay;
 } VDM_PROTOCOL_CONFIG;
 
 typedef struct {
@@ -196,6 +198,7 @@ typedef struct
 #define nvsProtBrokerPwd            "brokerPwd"
 #define nvsProtBrokerPublishFlags   "brokerPF"
 #define nvsProtBrokerKeepAliveTime  "brokerKAT"
+#define nvsProtBrokerMinBrokerDelay "brokerMD"
 
 #define nvsValvesCfg                "valvesCfg"
 #define nvsValvesControlCfg         "valvesCtrlCfg"

diff --git a/software_esp32/include/globals.h b/software_esp32/include/globals.h
@@ -42,6 +42,8 @@
 
 #include <Arduino.h>
 
+#define CHECK_BIT(var,pos) ((var>>pos) & 1)
+
 // #define CONFIG_ASYNC_TCP_USE_WDT 0
 
 #define ACTUATOR_COUNT      12

diff --git a/software_esp32/include/mqtt.h b/software_esp32/include/mqtt.h
@@ -40,6 +40,8 @@
 
 #pragma once
 
+#include "globals.h"
+
 #define MAINTOPIC_LEN 50
 
 // MQTT settings
@@ -48,6 +50,37 @@
 #define DEFAULT_VALVESTOPIC  "valves/"
 #define DEFAULT_TEMPSTOPIC   "temps/"
 
+
+#define publishNothing  0
+#define publishCommon   1
+#define publishValves   2
+#define publishTemps    4
+
+typedef struct {
+  uint8_t  position;
+  uint8_t target;
+  uint8_t state;
+  uint16_t meanCurrent;
+  int temp1;
+  int temp2;
+  uint32_t ts;
+  bool publishNow;
+  bool publishTimeOut;
+} LASTVALVEVALUES; 
+
+typedef struct {
+  int16_t temperature;          // temperature of assigned sensor
+  char id[25];
+  uint32_t ts;
+  bool publishNow;
+} LASTTEMPVALUES; 
+
+typedef struct {
+  uint8_t heatControl;          
+  uint8_t parkingPosition;
+  uint8_t systemState;
+} LASTCOMMONVALUES; 
+
 class CMqtt
 {
   public:
@@ -60,7 +93,11 @@ class CMqtt
     bool mqttReceived;
   private:
     void reconnect();
+    void publish_all (uint8_t publishFlags);
+    void publish_common (); 
     void publish_valves ();
+    void publish_temps ();
+    uint8_t checkForPublish(); 
     bool firstPublish;
     char mqtt_mainTopic[MAINTOPIC_LEN];
     char mqtt_commonTopic[MAINTOPIC_LEN];
@@ -69,6 +106,10 @@ class CMqtt
     char mqtt_callbackTopic[MAINTOPIC_LEN];
     char stationName[MAINTOPIC_LEN];
     uint32_t tsPublish;
+    bool forcePublish;
+    LASTCOMMONVALUES lastCommonValues;
+    LASTVALVEVALUES lastValveValues[ACTUATOR_COUNT];
+    LASTTEMPVALUES lastTempValues[TEMP_SENSORS_COUNT];
 };
 
 extern CMqtt Mqtt;
diff --git a/software_esp32/src/VdmConfig.cpp b/software_esp32/src/VdmConfig.cpp
@@ -99,13 +99,16 @@ void CVdmConfig::clearConfig()
   configFlash.protConfig.brokerPort = 0;
   configFlash.protConfig.brokerInterval = 1000;
   configFlash.protConfig.publishInterval = 10;
+  configFlash.protConfig.minBrokerDelay = 5;
   memset (configFlash.protConfig.userName,0,sizeof(configFlash.protConfig.userName));
   memset (configFlash.protConfig.userPwd,0,sizeof(configFlash.protConfig.userPwd));
   configFlash.protConfig.protocolFlags.publishTarget = false;
   configFlash.protConfig.protocolFlags.publishAllTemps = false;
   configFlash.protConfig.protocolFlags.publishPathAsRoot = false;
   configFlash.protConfig.protocolFlags.publishUpTime = false;
+  configFlash.protConfig.protocolFlags.publishOnChange = false;
   configFlash.protConfig.keepAliveTime = 60;
+
 
   for (uint8_t i=0; i<ACTUATOR_COUNT; i++) {
     configFlash.valvesConfig.valveConfig[i].active = false;
@@ -202,6 +205,7 @@ void CVdmConfig::readConfig()
     uint8_t a=prefs.getUChar(nvsProtBrokerPublishFlags,7);
     configFlash.protConfig.protocolFlags =  *(VDM_PROTOCOL_CONFIG_FLAGS *)&a;
     configFlash.protConfig.keepAliveTime = prefs.getUShort(nvsProtBrokerKeepAliveTime,60);
+    configFlash.protConfig.minBrokerDelay = prefs.getUShort(nvsProtBrokerMinBrokerDelay,5);
     prefs.end();
   }
 
@@ -277,6 +281,7 @@ void CVdmConfig::writeConfig(bool reboot)
     uint8_t a = *(uint8_t *)&configFlash.protConfig.protocolFlags;
     prefs.putUChar(nvsProtBrokerPublishFlags,a);
     prefs.putUShort(nvsProtBrokerKeepAliveTime,configFlash.protConfig.keepAliveTime);
+    prefs.putUShort(nvsProtBrokerMinBrokerDelay,configFlash.protConfig.minBrokerDelay);
   }
   prefs.end();
 
@@ -360,7 +365,9 @@ void CVdmConfig::postProtCfg (JsonObject doc)
   if (!doc["pubAllTemps"].isNull()) configFlash.protConfig.protocolFlags.publishAllTemps = doc["pubAllTemps"];
   if (!doc["pubPathAsRoot"].isNull()) configFlash.protConfig.protocolFlags.publishPathAsRoot = doc["pubPathAsRoot"];
   if (!doc["pubUpTime"].isNull()) configFlash.protConfig.protocolFlags.publishUpTime = doc["pubUpTime"];
+  if (!doc["pubOnChange"].isNull()) configFlash.protConfig.protocolFlags.publishOnChange = doc["pubOnChange"];
   if (!doc["keepAliveTime"].isNull()) configFlash.protConfig.keepAliveTime = doc["keepAliveTime"];
+  if (!doc["pubMinDelay"].isNull()) configFlash.protConfig.minBrokerDelay = doc["pubMinDelay"];
 }
 
 void CVdmConfig::postValvesCfg (JsonObject doc)