Mercurial > mbsePi-apps / changeset

--- a/www/js/fermenter.js	Fri May 03 14:14:01 2024 +0200
+++ b/www/js/fermenter.js	Fri May 03 15:12:25 2024 +0200
@@ -174,155 +174,155 @@
  });
 
  function updateScreen() {
-   $('#room_thb').html(global.temp_value.toFixed(1) + '°C  ' + global.hum_value.toFixed(1) + '% humidity');
-   $('#info_system').html(record.unit);
-   $('#info_beer').html(record.beercode + ' - ' + record.beername);
-   $('#info_mode').jqxDropDownList('selectItem', record.mode);
-   $('#info_stage').jqxDropDownList('selectItem', record.stage);
-   if (record.door_address) {
-    if (record.door_state != '0') {
-     $('#fermenter_doorled').html('<div class="LEDyellow_on"></div>Door');
-    } else {
-     $('#fermenter_doorled').html('<div class="LEDyellow_off"></div>Door');
-    }
+  $('#room_thb').html(global.temp_value.toFixed(1) + '&deg;C&nbsp;&nbsp;' + global.hum_value.toFixed(1) + '% humidity');
+  $('#info_system').html(record.unit);
+  $('#info_beer').html(record.beercode + ' - ' + record.beername);
+  $('#info_mode').jqxDropDownList('selectItem', record.mode);
+  $('#info_stage').jqxDropDownList('selectItem', record.stage);
+  if (record.door_address) {
+   if (record.door_state != '0') {
+    $('#fermenter_doorled').html('<div class="LEDyellow_on"></div>Door');
+   } else {
+    $('#fermenter_doorled').html('<div class="LEDyellow_off"></div>Door');
    }
-   if (record.light_address) {
-    if (record.light_state != '0') {
-     $('#fermenter_lightled').html('<div class="LEDyellow_on"></div>Light');
-    } else {
-     $('#fermenter_lightled').html('<div class="LEDyellow_off"></div>Light');
-    }
+  }
+  if (record.light_address) {
+   if (record.light_state != '0') {
+    $('#fermenter_lightled').html('<div class="LEDyellow_on"></div>Light');
+   } else {
+    $('#fermenter_lightled').html('<div class="LEDyellow_off"></div>Light');
    }
-   if (record.mode != 'OFF') {
-    $('#fermenter_powerled').html('<div class="LEDblue_on"></div>Power');
-   } else {
-    $('#fermenter_powerled').html('<div class="LEDblue_off"></div>Power');
-   }
-   if (record.alarm != '0') {
-    $('#fermenter_alarmled').html('<div class="LEDred_on"></div>Alarm');
-   } else {
-    $('#fermenter_alarmled').html('<div class="LEDred_off"></div>Alarm');
-   }
+  }
+  if (record.mode != 'OFF') {
+   $('#fermenter_powerled').html('<div class="LEDblue_on"></div>Power');
+  } else {
+   $('#fermenter_powerled').html('<div class="LEDblue_off"></div>Power');
+  }
+  if (record.alarm != '0') {
+   $('#fermenter_alarmled').html('<div class="LEDred_on"></div>Alarm');
+  } else {
+   $('#fermenter_alarmled').html('<div class="LEDred_off"></div>Alarm');
+  }
 
-   $('#target_lo').val(record.setpoint_low);
-   $('#target_hi').val(record.setpoint_high);
-   if ((record.mode == 'FRIDGE') || (record.mode == 'BEER')) {
-    $('#target_lo').jqxNumberInput({ readOnly: false, Width: 70, spinButtons: true });
-    $('#target_hi').jqxNumberInput({ readOnly: false, Width: 70, spinButtons: true });
-   } else {
-    $('#target_lo').jqxNumberInput({ readOnly: true, Width: 50, spinButtons: false });
-    $('#target_hi').jqxNumberInput({ readOnly: true, Width: 50, spinButtons: false });
-   }
-
-   if (record.heater_address) {
-    if (record.heater_state != '0') {
-     $('#fermenter_led1').html('<div class="LEDgreen_on"></div>Heat');
-    } else {
-     $('#fermenter_led1').html('<div class="LEDgreen_off"></div>Heat');
-    }
-   } else {
-    $('#fermenter_led1').html('<div class="LEDgreen_hide"></div>Heat');
-   }
-
-   if (record.cooler_address) {
-    if (record.cooler_state != '0') {
-     $('#fermenter_led2').html('<div class="LEDgreen_on"></div>Cool');
-    } else {
-     $('#fermenter_led2').html('<div class="LEDgreen_off"></div>Cool');
-    }
-   } else {
-    $('#fermenter_led2').html('<div class="LEDgreen_hide"></div>Cool');
-   }
+  $('#target_lo').val(record.setpoint_low);
+  $('#target_hi').val(record.setpoint_high);
+  if ((record.mode == 'FRIDGE') || (record.mode == 'BEER')) {
+   $('#target_lo').jqxNumberInput({ readOnly: false, Width: 70, spinButtons: true });
+   $('#target_hi').jqxNumberInput({ readOnly: false, Width: 70, spinButtons: true });
+  } else {
+   $('#target_lo').jqxNumberInput({ readOnly: true, Width: 50, spinButtons: false });
+   $('#target_hi').jqxNumberInput({ readOnly: true, Width: 50, spinButtons: false });
+  }
 
-   if (record.fan_address) {
-    if (record.fan_state != '0') {
-     $('#fermenter_led3').html('<div class="LEDgreen_on"></div>Fan');
-    } else {
-     $('#fermenter_led3').html('<div class="LEDgreen_off"></div>Fan');
-    }
+  if (record.heater_address) {
+   if (record.heater_state != '0') {
+    $('#fermenter_led1').html('<div class="LEDgreen_on"></div>Heat');
    } else {
-    $('#fermenter_led3').html('<div class="LEDgreen_hide"></div>Fan');
+    $('#fermenter_led1').html('<div class="LEDgreen_off"></div>Heat');
    }
+  } else {
+   $('#fermenter_led1').html('<div class="LEDgreen_hide"></div>');
+  }
 
-   if (record.mode == 'NONE') {
-    $('#fermenter_toggle1,#fermenter_toggle2,#fermenter_toggle3').show();
-    $('#fermenter_toggle1').jqxSwitchButton({ disabled: (record.heater_address) ? false:true });
-    $('#fermenter_toggle2').jqxSwitchButton({ disabled: (record.cooler_address) ? false:true });
-    $('#fermenter_toggle3').jqxSwitchButton({ disabled: (record.fan_address) ? false:true });
-    if ((record.heater_state != 0) != $('#fermenter_toggle1').jqxSwitchButton('val'))
-     $('#fermenter_toggle1').val(record.heater_state != 0);
-    if ((record.cooler_state != 0) != $('#fermenter_toggle2').jqxSwitchButton('val'))
-     $('#fermenter_toggle2').val(record.cooler_state != 0);
-    if ((record.fan_state != 0) != $('#fermenter_toggle3').jqxSwitchButton('val'))
-     $('#fermenter_toggle3').val(record.fan_state != 0);
+  if (record.cooler_address) {
+   if (record.cooler_state != '0') {
+    $('#fermenter_led2').html('<div class="LEDgreen_on"></div>Cool');
    } else {
-    $('#fermenter_toggle1,#fermenter_toggle2,#fermenter_toggle3').jqxSwitchButton({ disabled:true });
-    $('#fermenter_toggle1,#fermenter_toggle2,#fermenter_toggle3').hide();
+    $('#fermenter_led2').html('<div class="LEDgreen_off"></div>Cool');
    }
-
-   $('#info_profile').html(record.profile_name);
-   if (record.profile_name == '')
-    $('#info_mode').jqxDropDownList('disableItem', 'PROFILE');
-   else
-    $('#info_mode').jqxDropDownList('enableItem', 'PROFILE');
+  } else {
+   $('#fermenter_led2').html('<div class="LEDgreen_hide"></div>');
+  }
 
-   if (record.mode == 'PROFILE') {
-    if (record.profile_state == 'OFF') {
-     $('#info_mode').jqxDropDownList({ disabled: false });
-     $('#Profile1').jqxButton({ template: 'success', value: 'Starten' });
-     $('#Profile1').show();
-     $('#Profile2').hide();
-     $('#status_profile').html('');
-    } else if (record.profile_state == 'RUN') {
-     $('#info_mode').jqxDropDownList({ disabled: true });
-     $('#Profile1').jqxButton({ template: 'danger', value: 'Afbreken' });
-     $('#Profile2').jqxButton({ template: 'primary', value: 'Pauze' });
-     $('#Profile1').show();
-     $('#Profile2').show();
-     $('#status_profile').html('Profiel actief, ' + record.profile_percent + '% gereed');
-    } else if (record.profile_state == 'PAUSE') {
-     $('#info_mode').jqxDropDownList({ disabled: true });
-     $('#Profile1').jqxButton({ template: 'danger', value: 'Afbreken' });
-     $('#Profile2').jqxButton({ template: 'success', value: 'Doorgaan' });
-     $('#Profile1').show();
-     $('#Profile2').show();
-     $('#status_profile').html('Profiel pauze, ' + record.profile_percent + '% gereed');
-    } else if (record.profile_state == 'DONE') {
-     $('#info_mode').jqxDropDownList({ disabled: true });
-     $('#Profile1').jqxButton({ template: 'primary', value: 'Profiel Ok' });
-     $('#Profile1').show();
-     $('#Profile2').hide();
-     $('#status_profile').html('Profiel is gereed');
-    }
+  if (record.fan_address) {
+   if (record.fan_state != '0') {
+    $('#fermenter_led3').html('<div class="LEDgreen_on"></div>Fan');
    } else {
+    $('#fermenter_led3').html('<div class="LEDgreen_off"></div>Fan');
+   }
+  } else {
+   $('#fermenter_led3').html('<div class="LEDgreen_hide"></div>');
+   $('#fermenter_toggle3').hide();
+  }
+
+  if (record.mode == 'NONE') {
+   $('#fermenter_toggle1,#fermenter_toggle2,#fermenter_toggle3').show();
+   $('#fermenter_toggle1').jqxSwitchButton({ disabled: (record.heater_address) ? false:true });
+   $('#fermenter_toggle2').jqxSwitchButton({ disabled: (record.cooler_address) ? false:true });
+   $('#fermenter_toggle3').jqxSwitchButton({ disabled: (record.fan_address) ? false:true });
+   if ((record.heater_state != 0) != $('#fermenter_toggle1').jqxSwitchButton('val'))
+    $('#fermenter_toggle1').val(record.heater_state != 0);
+   if ((record.cooler_state != 0) != $('#fermenter_toggle2').jqxSwitchButton('val'))
+    $('#fermenter_toggle2').val(record.cooler_state != 0);
+   if ((record.fan_state != 0) != $('#fermenter_toggle3').jqxSwitchButton('val'))
+    $('#fermenter_toggle3').val(record.fan_state != 0);
+  } else {
+   $('#fermenter_toggle1,#fermenter_toggle2,#fermenter_toggle3').hide();
+  }
+
+  $('#info_profile').html(record.profile_name);
+  if (record.profile_name == '')
+   $('#info_mode').jqxDropDownList('disableItem', 'PROFILE');
+  else
+   $('#info_mode').jqxDropDownList('enableItem', 'PROFILE');
+
+  if (record.mode == 'PROFILE') {
+   if (record.profile_state == 'OFF') {
     $('#info_mode').jqxDropDownList({ disabled: false });
-    $('#Profile1').hide();
+    $('#Profile1').jqxButton({ template: 'success', value: 'Starten' });
+    $('#Profile1').show();
     $('#Profile2').hide();
     $('#status_profile').html('');
+   } else if (record.profile_state == 'RUN') {
+    $('#info_mode').jqxDropDownList({ disabled: true });
+    $('#Profile1').jqxButton({ template: 'danger', value: 'Afbreken' });
+    $('#Profile2').jqxButton({ template: 'primary', value: 'Pauze' });
+    $('#Profile1').show();
+    $('#Profile2').show();
+    $('#status_profile').html('Profiel actief, ' + record.profile_percent + '% gereed');
+   } else if (record.profile_state == 'PAUSE') {
+    $('#info_mode').jqxDropDownList({ disabled: true });
+    $('#Profile1').jqxButton({ template: 'danger', value: 'Afbreken' });
+    $('#Profile2').jqxButton({ template: 'success', value: 'Doorgaan' });
+    $('#Profile1').show();
+    $('#Profile2').show();
+    $('#status_profile').html('Profiel pauze, ' + record.profile_percent + '% gereed');
+   } else if (record.profile_state == 'DONE') {
+    $('#info_mode').jqxDropDownList({ disabled: true });
+    $('#Profile1').jqxButton({ template: 'primary', value: 'Profiel Ok' });
+    $('#Profile1').show();
+    $('#Profile2').hide();
+    $('#status_profile').html('Profiel is gereed');
    }
+  } else {
+   $('#info_mode').jqxDropDownList({ disabled: false });
+   $('#Profile1').hide();
+   $('#Profile2').hide();
+   $('#status_profile').html('');
+  }
 
-   var yl = record.yeast_lo;
-   var yh = record.yeast_hi;
-   var range = { ranges: [{ startValue: 0, endValue: yl, style: { fill: '#3399FF', stroke: '#3399FF' }, endWidth: 10, startWidth: 10 },
+  var yl = record.yeast_lo;
+  var yh = record.yeast_hi;
+  var range = { ranges: [{ startValue: 0, endValue: yl, style: { fill: '#3399FF', stroke: '#3399FF' }, endWidth: 10, startWidth: 10 },
                       { startValue: yl, endValue: yh, style: { fill: '#00CC33', stroke: '#00CC33' }, endWidth: 10, startWidth: 10 },
                       { startValue: yh, endValue: 45, style: { fill: '#FC6A6A', stroke: '#FC6A6A' }, endWidth: 10, startWidth: 10 }]};
-   $('#gaugeContainer_air').jqxGauge(range);
-   $('#gaugeContainer_beer').jqxGauge(range);
+  $('#gaugeContainer_air').jqxGauge(range);
+  $('#gaugeContainer_beer').jqxGauge(range);
 
-   if (record.air_temperature !== undefined) {
-    $('#gaugeContainer_air').jqxGauge({ caption: { value: 'Air: ' + record.air_temperature.toFixed(3) }});
-    $('#gaugeContainer_air').jqxGauge({ value: record.air_temperature });
-   }
-   $('#gaugeContainer_air').jqxGauge({ disabled: (record.air_state == 'YES') ? false:true });
-   if (record.beer_temperature !== undefined) {
-    $('#gaugeContainer_beer').jqxGauge({ caption: { value: 'Beer: ' + record.beer_temperature.toFixed(3) }});
-    $('#gaugeContainer_beer').jqxGauge({ value: record.beer_temperature });
-   }
-   $('#gaugeContainer_beer').jqxGauge({ disabled: (record.beer_state == 'YES') ? false:true });
-   if (record.chiller_temperature !== undefined) {
-    $('#gaugeContainer_chiller').jqxGauge({ value: record.chiller_temperature });
-   }
-   $('#gaugeContainer_chiller').jqxGauge({ disabled: (record.chiller_state == 'YES') ? false:true });
+  if (record.air_temperature !== undefined) {
+   $('#gaugeContainer_air').jqxGauge({ caption: { value: 'Air: ' + record.air_temperature.toFixed(3) }});
+   $('#gaugeContainer_air').jqxGauge({ value: record.air_temperature });
+  }
+  $('#gaugeContainer_air').jqxGauge({ disabled: (record.air_state == 'YES') ? false:true });
+  if (record.beer_temperature !== undefined) {
+   $('#gaugeContainer_beer').jqxGauge({ caption: { value: 'Beer: ' + record.beer_temperature.toFixed(3) }});
+   $('#gaugeContainer_beer').jqxGauge({ value: record.beer_temperature });
+  }
+  $('#gaugeContainer_beer').jqxGauge({ disabled: (record.beer_state == 'YES') ? false:true });
+  if (record.chiller_temperature !== undefined) {
+   $('#gaugeContainer_chiller').jqxGauge({ value: record.chiller_temperature });
+  }
+  $('#gaugeContainer_chiller').jqxGauge({ disabled: (record.chiller_state == 'YES') ? false:true });
  } /* Updatescreen */
 
  $('#gaugeContainer_air').jqxGauge(gaugeoptions);
@@ -465,8 +465,8 @@
    global.os = obj.os;
    global.os_version = obj.os_version;
    global.FW = obj.FW;
-   global.room_temp = obj.THB.temperature;
-   global.room_hum = obj.THB.humidity;
+   global.temp_value = obj.THB.temperature.value;
+   global.hum_value = obj.THB.humidity.value;
    updateScreen();
   } else if (obj.type == 'fermenter' && obj.unit == record.unit) {
 	  console.log('ws got unit ' + msg);