improved log messages for Anaire and Hass clouds

kike-canaries · Dec 1, 2021 · 4b1af54 · 4b1af54
1 parent e37997d
commit 4b1af54
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/src/cloud_anaire.cpp b/src/cloud_anaire.cpp
@@ -10,7 +10,7 @@ MQTTClient client(MQTT_BUFFER_SIZE);
 
 void anairePublish() {
     static uint_fast64_t mqttTimeStamp = 0;
-    if (millis() - mqttTimeStamp > cfg.stime * 1000) {
+    if (millis() - mqttTimeStamp > cfg.stime * 1000 * 2) {
         mqttTimeStamp = millis();
 
         float humi = sensors.getHumidity();
@@ -37,8 +37,11 @@ void anairePublish() {
 
         size_t n = serializeJson(doc, buffer);
 
-        if (client.publish(ANAIRE_TOPIC, buffer, n)) return;
-        Serial.printf("[E][MQTT] publish sensor data error: %d\n",client.lastError());
+        if (client.publish(ANAIRE_TOPIC, buffer, n)) {
+            if (cfg.devmode) Serial.printf("-->[MQTT] Anaire sensor payload published. (size: %d)\n", n);
+        } else {
+            Serial.printf("[E][MQTT] Anaire publish sensor data error: %d\n",client.lastError());
+        }
     }
 }
 
@@ -48,7 +51,7 @@ void anaireConnect() {
     if (!(cfg.isWifiEnable() && WiFi.isConnected())) return;
 
     if (millis() - mqttDelayedStamp > MQTT_DELAYED_TIME * 1000) {
-        Serial.printf("-->[MQTT] connecting to: %s..", ANAIRE_HOST);
+        Serial.printf("-->[MQTT] connecting to %s..", ANAIRE_HOST);
         int mqtt_try = 0;
         while (mqtt_try++ < MQTT_RETRY_CONNECTION && !client.connect(cfg.getStationName().c_str())) {
             Serial.print(".");

diff --git a/src/cloud_hass.cpp b/src/cloud_hass.cpp
@@ -52,8 +52,11 @@ void hassPubSensorPayload() {
 
     size_t n = serializeJson(doc, buffer);
 
-    if (clientHass.publish(getStateTopic().c_str(), buffer, n)) return;
-    Serial.printf("[E][MQTT] publish sensor state error: %d\n",clientHass.lastError());
+    if (clientHass.publish(getStateTopic().c_str(), buffer, n)) {
+        if(cfg.devmode) Serial.printf ("-->[MQTT] Hass sensor payload published. (size: %d)\n", n);
+    } else {
+        Serial.printf("[E][MQTT] Hass publish sensor state error: %d\n",clientHass.lastError());
+    }
 }
 
 bool publishDiscoveryPayload(String name, String dclass, String unit) {
@@ -81,11 +84,6 @@ bool publishDiscoveryPayload(String name, String dclass, String unit) {
     return false;
 }
 
-void hassPubAllSensors() {
-    hassPubSensorPayload();
-    if(cfg.devmode) Serial.println ("-->[MQTT] Hass entities payload published.");
-}
-
 bool hassRegisterSensors() {
     hassConfigured = publishDiscoveryPayload("temperature", "temperature", "°C");
     hassConfigured = publishDiscoveryPayload("humidity", "humidity", "%");
@@ -119,7 +117,7 @@ void hassPublish() {
     if (millis() - mqttTimeStamp > cfg.stime * 1000 * 2) {
         mqttTimeStamp = millis(); 
         if (!hassConfigured) hassRegisterSensors();
-        hassPubAllSensors();
+        hassPubSensorPayload();
         if (!hassSubscribed) hassStatusSubscription();
     }
 }
@@ -133,8 +131,7 @@ static uint_fast64_t mqttHassDelayedStamp = 0;
 void hassConnect() {
     if (!(cfg.isWifiEnable() && WiFi.isConnected())) return;
     if (millis() - mqttHassDelayedStamp > MQTT_DELAYED_TIME * 1000) {
-        if (cfg.devmode) Serial.printf("-->[MQTT] Hass auth: %s@%s\n",cfg.hassusr.c_str(),cfg.hasspsw.c_str());
-        Serial.printf("-->[MQTT] connecting to: %s:%i..", cfg.hassip.c_str(),cfg.hasspt);
+        Serial.printf("-->[MQTT] connecting to %s.", cfg.hassip.c_str());
         int mqtt_try = 0;
         while (mqtt_try++ < MQTT_RETRY_CONNECTION && !hassAuth()) {
             Serial.print(".");
@@ -145,6 +142,7 @@ void hassConnect() {
             hassSubscribed = false;
             hassConfigured = false;
             Serial.println("\tconnection failed!");
+            if (cfg.devmode) Serial.printf("-->[MQTT] %s %s\n",cfg.hassusr.c_str(),cfg.hasspsw.c_str());
             return;
         }
         Serial.println("\tconnected!");

diff --git a/src/cloud_influxdb.cpp b/src/cloud_influxdb.cpp
@@ -80,7 +80,7 @@ void influxDbInit() {
         influx.setConnectionParamsV1(url.c_str(), cfg.ifx.db.c_str());
         if (cfg.devmode) Serial.printf("-->[IFDB] config: %s@%s:%i\n", cfg.ifx.db.c_str(), cfg.ifx.ip.c_str(), cfg.ifx.pt);
         influxDbAddTags();
-        Serial.printf("-->[IFDB] connecting to: %s..", cfg.ifx.ip.c_str());
+        Serial.printf("-->[IFDB] connecting to %s..", cfg.ifx.ip.c_str());
         int influx_retry = 0;
         while (influx_retry++ < IFX_RETRY_CONNECTION && !influx.validateConnection()) {
             Serial.print(".");