Mercurial > mbsePi-apps / file diff

--- a/www/js/fermenter.js	Sat Apr 20 11:48:20 2024 +0200
+++ b/www/js/fermenter.js	Mon Apr 22 11:33:04 2024 +0200
@@ -96,8 +96,15 @@
    { name: 'os' },
    { name: 'os_version' },
    { name: 'FW' },
-   { name: 'room_temp', map: 'THB>temperature', type: 'float' },
-   { name: 'room_hum', map: 'THB>humidity', type: 'float' }
+   { name: 'server_port', type: 'int' },
+   { name: 'websocket_port', type: 'int' },
+   { name: 'thb_temp_uuid', map: 'THB>temperature>uuid' },
+   { name: 'temp_uuid', map: 'THB>temperature>uuid' },
+   { name: 'temp_state', map: 'THB>temperature>state' },
+   { name: 'temp_value', map: 'THB>temperature>value', type: 'int' },
+   { name: 'hum_uuid', map: 'THB>humidity>uuid' },
+   { name: 'hum_state', map: 'THB>humidity>state' },
+   { name: 'hum_value', map: 'THB>humidity>value', type: 'int' }
   ],
   id: 'name',
   url: 'getglobal.php'
@@ -162,7 +169,7 @@
  });
 
  function updateScreen() {
-   $('#room_thb').html(global.room_temp + '°C  ' + global.room_hum + '% humidity');
+   $('#room_thb').html((global.temp_value / 1000.0) + '°C  ' + (global.hum_value / 1000.0) + '% humidity');
    $('#info_system').html(record.unit);
    $('#info_beer').html(record.beercode + ' - ' + record.beername);
    $('#info_mode').jqxDropDownList('selectItem', record.mode);
@@ -284,7 +291,7 @@
     $('#gaugeContainer_air').jqxGauge({ caption: { value: 'Air: ' + record.air_temperature.toFixed(3) }});
     $('#gaugeContainer_air').jqxGauge({ value: record.air_temperature });
    }
-   if (record.air_state == 'OK') {
+   if (record.air_state == 'YES') {
     $('#gaugeContainer_air').jqxGauge({ disabled: false });
    } else {
     $('#gaugeContainer_air').jqxGauge({ disabled: true });
@@ -293,7 +300,7 @@
     $('#gaugeContainer_beer').jqxGauge({ caption: { value: 'Beer: ' + record.beer_temperature.toFixed(3) }});
     $('#gaugeContainer_beer').jqxGauge({ value: record.beer_temperature });
    }
-   if (record.beer_state == 'OK') {
+   if (record.beer_state == 'YES') {
     $('#gaugeContainer_beer').jqxGauge({ disabled: false });
    } else {
     $('#gaugeContainer_beer').jqxGauge({ disabled: true });
@@ -301,7 +308,7 @@
    if (record.chiller_temperature !== undefined) {
     $('#gaugeContainer_chiller').jqxGauge({ value: record.chiller_temperature });
    }
-   if (record.chiller_state == 'OK') {
+   if (record.chiller_state == 'YES') {
     $('#gaugeContainer_chiller').jqxGauge({ disabled: false });
    } else {
     $('#gaugeContainer_chiller').jqxGauge({ disabled: true });