Mercurial > bms / changeset

--- a/bmsd/ispindels.c	Tue May 19 13:50:14 2020 +0200
+++ b/bmsd/ispindels.c	Tue May 19 15:09:31 2020 +0200
@@ -140,7 +140,6 @@
                                 syslog(LOG_NOTICE, "MySQL: `%s' error %u (%s))", query, mysql_errno(con2), mysql_error(con2));
                             } else {
                                 /* Database updated, now update internal memory */
-                                syslog(LOG_NOTICE, "MySQL: `%s' Ok", query);
                                 if (tmpp->beercode)
                                     free(tmpp->beercode);
                                 tmpp->beercode = xstrcpy(beercode);
@@ -167,7 +166,6 @@
                                 syslog(LOG_NOTICE, "MySQL: `%s' error %u (%s))", query, mysql_errno(con2), mysql_error(con2));
                             } else {
                                 /* Database updated, now update internal memory */
-                                syslog(LOG_NOTICE, "MySQL: `%s' Ok", query);
                                 if (tmpp->mode)
                                     free(tmpp->mode);
                                 tmpp->mode = xstrcpy(mode);

--- a/bmsd/websocket.c	Tue May 19 13:50:14 2020 +0200
+++ b/bmsd/websocket.c	Tue May 19 15:09:31 2020 +0200
@@ -120,7 +120,7 @@
 
 		memcpy(buf, in, len);
 		buf[len] = '\0';
-		syslog(LOG_NOTICE, "ws: reveived %ld bytes %s", len, buf);
+		// syslog(LOG_NOTICE, "ws: reveived %ld bytes %s", len, buf);
 		if (strncmp(buf, (char *)"{\"device\":\"fermenters\",", 23) == 0) {
 		    fermenter_ws_receive(buf);
 		} else if (strncmp(buf, (char *)"{\"device\":\"co2meters\",", 22) == 0) {

--- a/www/js/mon_ispindel.js	Tue May 19 13:50:14 2020 +0200
+++ b/www/js/mon_ispindel.js	Tue May 19 15:09:31 2020 +0200
@@ -118,17 +118,21 @@
   $('#info_beer').html(record.beercode + ' - ' + record.beername);
   $('#info_mode').jqxDropDownList('selectItem', record.mode);
 
+  if (record.mode != 'OFF') {
+   $('#select_beer').jqxDropDownList({ disabled: true });
+   $('#select_beer').jqxDropDownList('clearSelection');
+   $('#select_beer').hide();
+  } else {
+   $('#select_beer').show();
+   $('#select_beer').jqxDropDownList({ disabled: false });
+  }
+
   if (record.online) {
    $('#info_online').html('On-line');
    if (record.mode != 'OFF') {
     $('#ispindel_powerled').html('<div class="LEDblue_on"></div>Power');
-    $('#select_beer').jqxDropDownList({ disabled: true });
-    $('#select_beer').jqxDropDownList('clearSelection');
-    $('#select_beer').hide();
    } else {
     $('#ispindel_powerled').html('<div class="LEDblue_off"></div>Power');
-    $('#select_beer').show();
-    $('#select_beer').jqxDropDownList({ disabled: false });
    }
    if (record.online && (record.alarm != '0')) {
     $('#ispindel_alarmled').html('<div class="LEDred_on"></div>Alarm');
@@ -136,10 +140,8 @@
     $('#ispindel_alarmled').html('<div class="LEDred_off"></div>Alarm');
    }
 
-   $('#gaugeContainer_temperature').jqxGauge({ caption: { value: record.temperature.toFixed(3) + '°C' }});
-   $('#gaugeContainer_temperature').jqxGauge({ value: record.temperature });
    $('#gaugeContainer_temperature').jqxGauge({ disabled: false });
-  $('#gaugeContainer_gravity').jqxLinearGauge({ disabled: false });
+   $('#gaugeContainer_gravity').jqxLinearGauge({ disabled: false })
 
    var sg = plato_to_sg(record.gravity);
    $('#info_battery').val(record.battery);
@@ -151,6 +153,7 @@
     var og = plato_to_sg(record.og_gravity);
     var svg = calc_svg(og, sg);
     var max = Math.ceil(og * 100, 0) * 10;
+    var gravity = sg * 1000;
 
     console.log ('set max ' + max);
     $('#gaugeContainer_gravity').jqxLinearGauge({ max: max });
@@ -178,14 +181,13 @@
     batt = 100;
    $('#vg_batt').html(batt + '%');
 
-   var gravity = sg * 1000;
+   $('#gaugeContainer_temperature').jqxGauge({ caption: { value: record.temperature.toFixed(3) + '°C' }});
+   $('#gaugeContainer_temperature').jqxGauge({ value: record.temperature });
    $('#gaugeContainer_gravity').jqxLinearGauge({ value: gravity });
 
   } else { // offline
    $('#info_online').html('Off-line');
    $('#ispindel_powerled').html('<div class="LEDblue_off"></div>Power');
-   $('#select_beer').show();
-   $('#select_beer').jqxDropDownList({ disabled: false });
    $('#ispindel_alarmled').html('<div class="LEDred_on"></div>Alarm');
    $('#gaugeContainer_temperature').jqxGauge({ disabled: true });
    $('#gaugeContainer_gravity').jqxLinearGauge({ disabled: true });
@@ -237,7 +239,6 @@
  $('#info_mode').on('select', function(event) {
   if (event.args && event.args.item.value != record.mode) {
    record.mode = event.args.item.value;
-   console.log('set mode ' + record.mode);
    websocket.send('{"device":"ispindels","node":"' + record.node + '","unit":"' + record.alias + '","mode":"' + record.mode + '"}');
   }
  });