Changed MQTT client timeout setting for ESP8266 (#1077)

lib/AmsMqttHandler/src/AmsMqttHandler.cpp

@@ -102,10 +102,17 @@ bool AmsMqttHandler::connect() {
 		}
 		actualClient = mqttClient;
 	}
-	int clientTimeout = mqttConfig.timeout / 1000;
+
-	if(clientTimeout > 3) clientTimeout = 3; // 3000ms is default, see WiFiClient.cpp WIFI_CLIENT_DEF_CONN_TIMEOUT_MS
+	// This section helps with power saving on ESP32 devices by reducing timeouts
-	actualClient->setTimeout(clientTimeout);
+	// The timeout is multiplied by 10 because WiFiClient is retrying 10 times internally
-	// Why can't we set number of retries for write here? WiFiClient defaults to 10 (10*3s == 30s)
+	// Power drain for this timeout is too great when using the default 3s timeout
+	// On ESP8266 the timeout is used differently and the following code causes MQTT instability
+	#if defined(ESP32)
+		int clientTimeout = mqttConfig.timeout / 1000;
+		if(clientTimeout > 3) clientTimeout = 3; // 3000ms is default, see WiFiClient.cpp WIFI_CLIENT_DEF_CONN_TIMEOUT_MS
+		actualClient->setTimeout(clientTimeout);
+		// Why can't we set number of retries for write here? WiFiClient defaults to 10 (10*3s == 30s)
+	#endif
 
 	mqttConfigChanged = false;
 	mqtt.setTimeout(mqttConfig.timeout);

lib/MeterCommunicators/include/PassiveMeterCommunicator.h

@@ -36,6 +36,9 @@ public:
     bool isConfigChanged();
     void ackConfigChanged();
     void getCurrentConfig(MeterConfig& meterConfig);
+    void setTimezone(Timezone* tz) {
+        this->tz = tz;
+    };
 
     HardwareSerial* getHwSerial();
     void rxerr(int err);

lib/MeterCommunicators/src/IEC6205675.cpp

@@ -27,13 +27,13 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
         
         // Kaifa special case...
         if(useMeterType == AmsTypeKaifa && data->base.type == CosemTypeDLongUnsigned) {
-            this->packageTimestamp = this->packageTimestamp > 0 ? tz->toUTC(this->packageTimestamp) : 0;
+            this->packageTimestamp = this->packageTimestamp > 0 && tz != NULL ? tz->toUTC(this->packageTimestamp) : 0;
             listType = 1;
             meterType = AmsTypeKaifa;
             activeImportPower = ntohl(data->dlu.data);
             lastUpdateMillis = millis64();
         } else if(data->base.type == CosemTypeOctetString) {
-            this->packageTimestamp = this->packageTimestamp > 0 ? tz->toUTC(this->packageTimestamp) : 0;
+            this->packageTimestamp = this->packageTimestamp > 0 && tz != NULL ? tz->toUTC(this->packageTimestamp) : 0;
 
             memcpy(str, data->oct.data, data->oct.length);
             str[data->oct.length] = 0x00;
@@ -123,7 +123,7 @@ IEC6205675::IEC6205675(const char* d, Timezone* tz, uint8_t useMeterType, MeterC
                             if(data->oct.length == 0x0C) {
                                 AmsOctetTimestamp* amst = (AmsOctetTimestamp*) data;
                                 time_t ts = decodeCosemDateTime(amst->dt);
-                                meterTimestamp = tz->toUTC(ts);
+                                meterTimestamp = tz != NULL ? tz->toUTC(ts) : ts;
                             }
                         }
                     }
@@ -1121,7 +1121,7 @@ time_t IEC6205675::adjustForKnownIssues(CosemDateTime dt, Timezone* tz, uint8_t
             // 21.09.24, the clock is now correct for Aidon
             // 23.10.25, the clock is now correct for Kamstrup
             ts -= 3600;
-        } else {
+        } else if(tz != NULL) {
             // Adjust from localtime to UTC
             ts = tz->toUTC(ts);
         }

lib/SvelteUi/app/translations.json

@@ -16,7 +16,8 @@
         "day" : "day",
         "days" : "days",
         "month" : "month",
-        "unknown" : "Unknown"
+        "unknown" : "Unknown",
+        "now" : "Now"
     },
     "btn" : {
         "reboot" : "Reboot",

src/AmsToMqttBridge.cpp

@@ -809,6 +809,9 @@ void handleNtp() {
 			ds.setTimezone(tz);
 			ea.setTimezone(tz);
 			ps->setTimezone(tz);
+			if(passiveMc != NULL) {
+				passiveMc->setTimezone(tz);
+			}
 		}
 	
 		config.ackNtpChange();