Mercurial > mbsePi-apps / file diff

--- a/thermferm/devices.c	Thu Apr 18 17:17:22 2024 +0200
+++ b/thermferm/devices.c	Fri Apr 19 11:31:46 2024 +0200
@@ -377,7 +377,7 @@
 /*
  * Return json data for one device.
  */
-char *device_json(devices_list *device, bool full)
+char *device_json(devices_list *device)
 {
     char	*payload;
     char	vbuf[64];
@@ -396,28 +396,22 @@
     payload = xstrcat(payload, (char *)",\"value\":");
     snprintf(vbuf, 63, "%d", device->value);
     payload = xstrcat(payload, vbuf);
-    if (full) {
-    	payload = xstrcat(payload, (char *)",\"offset\":");
-    	snprintf(vbuf, 63, "%d", device->offset);
-    	payload = xstrcat(payload, vbuf);
-    }
+    payload = xstrcat(payload, (char *)",\"offset\":");
+    snprintf(vbuf, 63, "%d", device->offset);
+    payload = xstrcat(payload, vbuf);
     payload = xstrcat(payload, (char *)",\"present\":\"");
     payload = xstrcat(payload, (char *)DEVPRESENT[device->present]);
     payload = xstrcat(payload, (char *)"\"");
-    if (full) {
-    	payload = xstrcat(payload, (char *)",\"gpiopin\":");
-    	snprintf(vbuf, 63, "%d", device->gpiopin);
-    	payload = xstrcat(payload, vbuf);
-    }
+    payload = xstrcat(payload, (char *)",\"gpiopin\":");
+    snprintf(vbuf, 63, "%d", device->gpiopin);
+    payload = xstrcat(payload, vbuf);
     payload = xstrcat(payload, (char *)",\"inuse\":");
     snprintf(vbuf, 63, "%d", device->inuse);
     payload = xstrcat(payload, vbuf);
     payload = xstrcat(payload, (char *)",\"description\":\"");
     payload = xstrcat(payload, device->description);
-    if (full) {
-    	payload = xstrcat(payload, (char *)"\",\"comment\":\"");
-    	payload = xstrcat(payload, device->comment);
-    }
+    payload = xstrcat(payload, (char *)"\",\"comment\":\"");
+    payload = xstrcat(payload, device->comment);
     payload = xstrcat(payload, (char *)"\",\"timestamp\":");
     snprintf(vbuf, 63, "%ld", (long)device->timestamp);
     payload = xstrcat(payload, vbuf);
@@ -438,7 +432,7 @@
     for (device = Config.devices; device; device = device->next) {
 	if (comma)
 	    payload = xstrcat(payload, (char *)",");
-	payloadu = device_json(device, false);
+	payloadu = device_json(device);
 	payload = xstrcat(payload, payloadu);
 	comma = true;
 	free(payloadu);