Mercurial > mbsePi-apps / file diff

--- a/thermferm/mqtt.c	Tue Jul 17 19:56:58 2018 +0200
+++ b/thermferm/mqtt.c	Wed Jul 18 13:26:37 2018 +0200
@@ -533,24 +533,17 @@
     if (birth) {
 	payload = xstrcat(payload, (char *)"\"uuid\":\"");
 	payload = xstrcat(payload, Config.uuid);
-	payload = xstrcat(payload, (char *)"\"");
-//	comma = true;
-//    }
-
-//    if (birth || flag & MQTT_NODE_CONTROL) {
-//	if (comma)
-//	    payload = xstrcat(payload, (char *)",");
-//    	payload = xstrcat(payload, (char *)"\"nodecontrol\":{\"reboot\":false,\"rebirth\":false,\"nextserver\":false,\"scanrate\":3000}");
-//	comma = true;
-//    }
-
-//    if (birth) {
-//    	if (comma)
-	    payload = xstrcat(payload, (char *)",");
+	payload = xstrcat(payload, (char *)"\",");
 #ifdef HAVE_WIRINGPI_H
 	payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\"Raspberry\",\"hardwaremodel\":\"Unknown\"");
 #else
-    	payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\"Unknown\",\"hardwaremodel\":\"Unknown\"");
+	if (uname(&ubuf) == 0) {
+	    payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\"");
+	    payload = xstrcat(payload, ubuf.machine);
+	    payload = xstrcat(payload, (char *)"\",\"hardwaremodel\":\"Unknown\"");
+	} else {
+    	    payload = xstrcat(payload, (char *)"\"properties\":{\"hardwaremake\":\"Unknown\",\"hardwaremodel\":\"Unknown\"");
+	}
 #endif
 	if (uname(&ubuf) == 0) {
             payload = xstrcat(payload, (char *)",\"os\":\"");