Mercurial > mbsePi-apps / file diff

--- a/www/js/fermenter.js	Wed Apr 17 13:18:22 2024 +0200
+++ b/www/js/fermenter.js	Wed Apr 17 15:03:01 2024 +0200
@@ -221,15 +221,15 @@
 
    if (record.mode == 'NONE') {
     $('.f_control_switches').show();
+    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 {
     $('.f_control_switches').hide();
    }
-   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');
 
    $('#info_profile').html(record.profile_name);
    if (record.profile_name == '')
@@ -376,39 +376,36 @@
  });
 
  $('#fermenter_toggle1').on('checked', function(event) {
-  if (record.mode == 'NONE' && record.heater_state != 0) {
-   console.log('set heater ' + $("#fermenter_toggle1").jqxSwitchButton('val'));
-   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","heater_state":0}');
+  if (record.mode == 'NONE' && record.heater_state == 0) {
+   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","heater_state":100,"cooler_state":0}');
   }
  });
  $('#fermenter_toggle1').on('unchecked', function(event) {
-  if (record.mode == 'NONE' && record.heater_state == 0) {
-   console.log('set heater ' + $("#fermenter_toggle1").jqxSwitchButton('val'));
-   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","heater_state":100,"cooler_state":0}');
+  if (record.mode == 'NONE' && record.heater_state != 0) {
+   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","heater_state":0,"cooler_state":0}');
   }
  });
  $('#fermenter_toggle2').on('checked', function(event) {
-  if (record.mode == 'NONE' && record.cooler_state != 0) {
-   console.log('set cooler ' + $("#fermenter_toggle2").jqxSwitchButton('val'));
-   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","cooler_state":0}');
+  if (record.mode == 'NONE' && record.cooler_state == 0) {
+   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","cooler_state":100,"heater_state":0}');
   }
  });
  $('#fermenter_toggle2').on('unchecked', function(event) {
-  if (record.mode == 'NONE' & record.cooler_state == 0) {
-   console.log('set cooler ' + $("#fermenter_toggle2").jqxSwitchButton('val'));
-   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","cooler_state":100,"heater_state":0}');
+  if (record.mode == 'NONE' & record.cooler_state != 0) {
+   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","cooler_state":0,"heater_state":0}');
   }
  });
  $('#fermenter_toggle3').on('checked', function(event) {
+  if (record.mode == 'NONE' && record.fan_state == 0) {
+   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","fan_state":100}');
+  }
+ });
+ $('#fermenter_toggle3').on('unchecked', function(event) {
   if (record.mode == 'NONE' && record.fan_state != 0) {
    websocket.send('{"type":"fermenter","unit":"' + record.unit + '","fan_state":0}');
   }
  });
- $('#fermenter_toggle3').on('unchecked', function(event) {
-  if (record.mode == 'NONE' && record.fan_state == 0) {
-   websocket.send('{"type":"fermenter","unit":"' + record.unit + '","fan_state":100}');
-  }
- });
+
  $('#Profile1').click(function() {
   if (record.mode == 'PROFILE') {
    if (record.profile_state == 'OFF') {