Mercurial > mbsePi-apps / file diff

--- a/www/js/fermenter.js	Fri May 03 15:12:25 2024 +0200
+++ b/www/js/fermenter.js	Fri May 03 16:53:00 2024 +0200
@@ -452,8 +452,6 @@
   var msg = evt.data;
   var obj = JSON.parse(msg);
 
- // console.log('ws got ' + msg);
-
   if (obj.ping) {
    websocket.send('{"pong":' + obj.ping + '}');
   }
@@ -508,28 +506,38 @@
    if (obj.metric.door) {
     record.door_address = obj.metric.door.address;
     record.door_state = obj.metric.door.state;
+   } else {
+    record.door_address = '';
    }
-   if (obj.metric.light)
-     record.light_state = obj.metric.light.state;
-   if (obj.metric.psu)
-     record.psu_state = obj.metric.psu.state;
+   if (obj.metric.light) {
+    record.light_address = obj.metric.light.address;
+    record.light_state = obj.metric.light.state;
+   } else {
+    record.light_address = '';
+   }
+   if (obj.metric.psu) {
+    record.psu_address = obj.metric.psu.address;
+    record.psu_state = obj.metric.psu.state;
+   } else {
+    record.psu_address = '';
+   }
    record.mode = obj.metric.mode;
    record.stage = obj.metric.stage;
    record.alarm = obj.metric.alarm;
    record.setpoint_low = obj.metric.setpoint.low;
    record.setpoint_high = obj.metric.setpoint.high;
    if (obj.metric.profile) {
-     record.profile_uuid = obj.metric.profile.uuid;
-     record.profile_name = obj.metric.profile.name;
-     record.profile_state = obj.metric.profile.state;
-     record.profile_percent = obj.metric.profile.percent;
-     record.profile_inittemp_high = obj.metric.profile.inittemp.high;
-     record.profile_inittemp_low = obj.metric.profile.inittemp.low;
+    record.profile_uuid = obj.metric.profile.uuid;
+    record.profile_name = obj.metric.profile.name;
+    record.profile_state = obj.metric.profile.state;
+    record.profile_percent = obj.metric.profile.percent;
+    record.profile_inittemp_high = obj.metric.profile.inittemp.high;
+    record.profile_inittemp_low = obj.metric.profile.inittemp.low;
    } else {
-     record.profile_uuid = '';
-     record.profile_name = '';
-     record.profile_state = '';
-     record.profile_percent = 0;
+    record.profile_uuid = '';
+    record.profile_name = '';
+    record.profile_state = '';
+    record.profile_percent = 0;
    }
    updateScreen();
   }