Mercurial > bms / changeset

--- a/bmsd/co2meters.c	Sat Sep 12 12:22:01 2020 +0200
+++ b/bmsd/co2meters.c	Sat Sep 12 16:29:26 2020 +0200
@@ -99,8 +99,6 @@
     char		query[512], *end;
     MYSQL               *con2 = NULL;
 
-    syslog(LOG_NOTICE, "co2meter_ws_receive(%s)", payload);
-
     /*
      * Process the JSON formatted payload.
      */

--- a/bmsd/fermenters.c	Sat Sep 12 12:22:01 2020 +0200
+++ b/bmsd/fermenters.c	Sat Sep 12 16:29:26 2020 +0200
@@ -187,8 +187,6 @@
     float		setpoint_low = 0, setpoint_high = 0, yeast_lo = 0, yeast_hi = 0, inittemp_lo = 0, inittemp_hi = 0;
     int			heater_state = -1, cooler_state = -1, fan_state = -1, light_state = -1, profile_fridgemode = -1;
 
-    syslog(LOG_NOTICE, "fermenter_ws_receive(%s)", payload);
-
     /*
      * Process the JSON formatted payload.
      */
@@ -446,8 +444,6 @@
     sys_fermenter_list	*fermenter, *tmpp;
     bool		new_fermenter = true;
 
-    //syslog(LOG_NOTICE, "fermenter_set: %s/%s %s %s", edge_node, alias, birth ? "BIRTH":"DATA", payload);
-
     /*
      * Search fermenter record in the memory array and use it if found.
      */
@@ -465,7 +461,6 @@
 	printf("ERROR got DDATA and fermenter %s/%s doesn't exist\n", edge_node, alias);
 	return;
     }
-//printf("new_fermenter %s\n", new_fermenter ? "true":"false");
 
     /*
      * Allocate new fermenter if not yet known.

--- a/bmsd/ispindels.c	Sat Sep 12 12:22:01 2020 +0200
+++ b/bmsd/ispindels.c	Sat Sep 12 16:29:26 2020 +0200
@@ -92,8 +92,6 @@
     char                query[512], *end;
     MYSQL               *con2 = NULL;
 
-//    syslog(LOG_NOTICE, "ispindel_ws_receive(%s)", payload);
-
     /*
      * Process the JSON formatted payload.
      */

--- a/bmsd/mysql.c	Sat Sep 12 12:22:01 2020 +0200
+++ b/bmsd/mysql.c	Sat Sep 12 16:29:26 2020 +0200
@@ -591,9 +591,9 @@
 	fermenter->uuid, fermenter->alias, fermenter->node, fermenter->online ? 1:0,
 	fermenter->beercode ? fermenter->beercode : "", fermenter->beername ? fermenter->beername : "",
 	fermenter->beeruuid ? fermenter->beeruuid : "",
-	fermenter->air_address ? fermenter->air_address : "", fermenter->air_state ? fermenter->air_state : "", fermenter->air_temperature,
-	fermenter->beer_address ? fermenter->beer_address : "", fermenter->beer_state ? fermenter->beer_state : "", fermenter->beer_temperature,
-     	fermenter->chiller_address ? fermenter->chiller_address : "", fermenter->chiller_state ? fermenter->chiller_state : "", fermenter->chiller_temperature,
+	fermenter->air_address ? fermenter->air_address : "", fermenter->air_state ? fermenter->air_state : "MISSING", fermenter->air_temperature,
+	fermenter->beer_address ? fermenter->beer_address : "", fermenter->beer_state ? fermenter->beer_state : "MISSING", fermenter->beer_temperature,
+     	fermenter->chiller_address ? fermenter->chiller_address : "", fermenter->chiller_state ? fermenter->chiller_state : "MISSING", fermenter->chiller_temperature,
 	fermenter->heater_address ? fermenter->heater_address : "", fermenter->heater_state, fermenter->heater_usage,
 	fermenter->cooler_address ? fermenter->cooler_address : "", fermenter->cooler_state, fermenter->cooler_usage,
 	fermenter->fan_address ? fermenter->fan_address : "", fermenter->fan_state, fermenter->fan_usage,
@@ -602,7 +602,7 @@
 	fermenter->psu_address ? fermenter->psu_address : "", fermenter->psu_state,
 	fermenter->mode, fermenter->alarm, fermenter->setpoint_high, fermenter->setpoint_low,
 	fermenter->profile_uuid ? fermenter->profile_uuid : "", fermenter->profile_name ? fermenter->profile_name : "",
-        fermenter->profile_state ? fermenter->profile_state : "", fermenter->profile_percent, 
+        fermenter->profile_state ? fermenter->profile_state : "OFF", fermenter->profile_percent,
 	fermenter->profile_inittemp_high, fermenter->profile_inittemp_low,
 	fermenter->profile_steps ? fermenter->profile_steps : "", fermenter->stage, fermenter->yeast_lo, fermenter->yeast_hi,
 	fermenter->webcam_url ? fermenter->webcam_url : "", fermenter->webcam_light);
@@ -646,7 +646,7 @@
 	fermenter->psu_address ? fermenter->psu_address : "", fermenter->psu_state,
 	fermenter->mode, fermenter->alarm, fermenter->setpoint_high, fermenter->setpoint_low,
 	fermenter->profile_uuid ? fermenter->profile_uuid : "", fermenter->profile_name ? fermenter->profile_name : "",
-	fermenter->profile_state ? fermenter->profile_state : "", fermenter->profile_percent,
+	fermenter->profile_state ? fermenter->profile_state : "OFF", fermenter->profile_percent,
 	fermenter->profile_inittemp_high, fermenter->profile_inittemp_low,
 	fermenter->profile_steps ? fermenter->profile_steps : "", fermenter->stage, fermenter->yeast_lo, fermenter->yeast_hi,
 	fermenter->webcam_url ? fermenter->webcam_url : "", fermenter->webcam_light, fermenter->uuid);

--- a/config.status	Sat Sep 12 12:22:01 2020 +0200
+++ b/config.status	Sat Sep 12 16:29:26 2020 +0200
@@ -621,7 +621,7 @@
 S["CC"]="gcc"
 S["CYEARS"]="2016-2020"
 S["COPYRIGHT"]="Copyright (C) 2016-2020 Michiel Broek, All Rights Reserved"
-S["VERSION"]="0.3.35"
+S["VERSION"]="0.3.36"
 S["PACKAGE"]="bms"
 S["SUBDIRS"]="bmsd doc script tools www"
 S["target_alias"]=""
@@ -710,7 +710,7 @@
 D["PACKAGE_STRING"]=" \"\""
 D["PACKAGE_BUGREPORT"]=" \"\""
 D["PACKAGE_URL"]=" \"\""
-D["VERSION"]=" \"0.3.35\""
+D["VERSION"]=" \"0.3.36\""
 D["COPYRIGHT"]=" \"Copyright (C) 2016-2020 Michiel Broek, All Rights Reserved\""
 D["STDC_HEADERS"]=" 1"
 D["HAVE_SYS_TYPES_H"]=" 1"

--- a/configure	Sat Sep 12 12:22:01 2020 +0200
+++ b/configure	Sat Sep 12 16:29:26 2020 +0200
@@ -2043,7 +2043,7 @@
 
 
 PACKAGE="bms"
-VERSION="0.3.35"
+VERSION="0.3.36"
 COPYRIGHT="Copyright (C) 2016-2020 Michiel Broek, All Rights Reserved"
 CYEARS="2016-2020"
 

--- a/configure.ac	Sat Sep 12 12:22:01 2020 +0200
+++ b/configure.ac	Sat Sep 12 16:29:26 2020 +0200
@@ -8,7 +8,7 @@
 dnl General settings
 dnl After changeing the version number, run autoconf!
 PACKAGE="bms"
-VERSION="0.3.35"
+VERSION="0.3.36"
 COPYRIGHT="Copyright (C) 2016-2020 Michiel Broek, All Rights Reserved"
 CYEARS="2016-2020"
 AC_SUBST(PACKAGE)