add wireless hydrometer name to MQTT

src/LogFormatter.cpp

@@ -215,17 +215,20 @@ size_t nonNullJson(char* buffer,size_t size)
 		root[KeyPlato] = externalData.plato();
 	}
 
-	// iSpindel data
+	// Hydrometer data
 	float vol=externalData.deviceVoltage();
-	if(IsVoltageValid(vol)){
-		 root[KeyVoltage] = vol;
-		float at=externalData.auxTemp();
-		if(IS_FLOAT_TEMP_VALID(at)) root[KeyAuxTemp] = at;
-		float tilt=externalData.tiltValue();
-		root[KeyTilt]=tilt;
-		int16_t rssi=externalData.rssi();
-		root[KeyIspindelRssi]=rssi;
-	}
+	if(IsVoltageValid(vol)) root[KeyVoltage] = vol;
+	float at=externalData.auxTemp();
+	if(IS_FLOAT_TEMP_VALID(at)) root[KeyAuxTemp] = at;
+
+	float tilt=externalData.tiltValue();
+	if(tilt >0)	root[KeyTilt]=tilt;
+
+	int16_t rssi=externalData.rssi();
+	if(IsRssiValid(rssi)) root[KeyWirelessHydrometerRssi]=rssi;
+	const char *hname=externalData.getDeviceName();
+	if(hname) root[KeyWirelessHydrometerName] = hname;
+
 	#if ARDUINOJSON_VERSION_MAJOR == 6
 	return	serializeJson(root,buffer,size);
 	#else

src/LogFormatter.h

@@ -16,10 +16,12 @@
 #define KeyState "state"
 #define KeyFridgeHumidity "fridgeHumidity"
 #define KeyRoomHumidity "roomHumidity"
-#define KeyIspindelRssi "ispindelRssi"
+#define KeyWirelessHydrometerRssi "hydrometerRssi"
+#define KeyWirelessHydrometerName "hydrometerName"
 
 size_t nonNullJson(char *buffer,size_t size);
 size_t dataSprintf(char *buffer,const char *format,const char* invalidStr);
 
+#define IsRssiValid(r) ((r)> -200)
 
 #endif

src/MqttRemoteControl.cpp

@@ -101,6 +101,18 @@ uint16_t MqttRemoteControl::_publish(const char* key,char value){
     }
     return packetid;
 }
+uint16_t MqttRemoteControl::_publish(const char* key,const char* value){
+    DBG_PRINTF("Publish %s\n",key);
+
+    // somwhow need to be optimized
+    char topic[256];
+    int baselength=strlen(_reportBasePath);
+    strncpy(topic,_reportBasePath,baselength);
+    topic[baselength]='/';
+    strcpy(topic + baselength +1, key);
+
+    return _client.publish(topic,DefaultLogginQoS,true,value);
+}
 
 void MqttRemoteControl::_reportData(void){
     _lastReportTime = millis();
@@ -154,15 +166,20 @@ void MqttRemoteControl::_reportData(void){
 
     	// iSpindel data
 	    float vol=externalData.deviceVoltage();
-	    if(IsVoltageValid(vol)){
-		    lastID=_publish(KeyVoltage, vol,2);
-		    float at=externalData.auxTemp();
-		    if(IS_FLOAT_TEMP_VALID(at)) lastID=_publish(KeyAuxTemp, at,1);
-		    float tilt=externalData.tiltValue();
-		    lastID=_publish(KeyTilt,tilt,2);
-            int16_t rssi=externalData.rssi();
-    		lastID=_publish(KeyIspindelRssi,(float)rssi,0);
-	    }
+	    if(IsVoltageValid(vol)) lastID=_publish(KeyVoltage, vol,2);
+
+        float at=externalData.auxTemp();
+		if(IS_FLOAT_TEMP_VALID(at)) lastID=_publish(KeyAuxTemp, at,1);
+
+        float tilt=externalData.tiltValue();
+		if(tilt>0) lastID=_publish(KeyTilt,tilt,2);
+
+        int16_t rssi=externalData.rssi();
+    	if(IsRssiValid(rssi)) lastID=_publish(KeyWirelessHydrometerRssi,(float)rssi,0);
+
+    	const char *hname=externalData.getDeviceName();
+	    if(hname) lastID=_publish(KeyWirelessHydrometerName, hname);
+
     }
     _lastPacketId = lastID;
     _publishing=true;

src/MqttRemoteControl.h

@@ -89,6 +89,7 @@ class MqttRemoteControl{
     void _reportData();
     uint16_t _publish(const char* key,float value,int precision);
     uint16_t _publish(const char* key,char value);
+    uint16_t _publish(const char* key,const char* value);
     uint16_t _lastPacketId;
     bool     _publishing;
 public: