Mercurial > bms / changeset

--- a/bmsd/fermenters.c	Sat Jun 27 15:41:53 2020 +0200
+++ b/bmsd/fermenters.c	Wed Jul 15 16:03:23 2020 +0200
@@ -711,7 +711,8 @@
 		free(fermenter->profile_state);
 	    if (fermenter->profile_steps)
 		free(fermenter->profile_steps);
-	    fermenter->profile_uuid = fermenter->profile_name = fermenter->profile_state = fermenter->profile_steps = NULL;
+	    fermenter->profile_uuid = fermenter->profile_name = fermenter->profile_steps = NULL;
+	    fermenter->profile_state = xstrcpy((char *)"OFF");
 	    fermenter->profile_percent = 0;
 	    fermenter->profile_inittemp_high = fermenter->profile_inittemp_low = 0.0;
 	}

--- a/bmsd/mysql.c	Sat Jun 27 15:41:53 2020 +0200
+++ b/bmsd/mysql.c	Wed Jul 15 16:03:23 2020 +0200
@@ -635,9 +635,9 @@
         "yeast_lo='%.1f', yeast_hi='%.1f', webcam_url='%s', webcam_light='%d' WHERE uuid='%s'",
 	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,

--- a/www/getfermentablesources.php	Sat Jun 27 15:41:53 2020 +0200
+++ b/www/getfermentablesources.php	Wed Jul 15 16:03:23 2020 +0200
@@ -7,6 +7,7 @@
 	echo "[]";
 	return;
 }
+mysqli_set_charset($connect, "utf8");
 $result = mysqli_query($connect, $query);
 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 	$fermentables[] = array(

--- a/www/gethopsources.php	Sat Jun 27 15:41:53 2020 +0200
+++ b/www/gethopsources.php	Wed Jul 15 16:03:23 2020 +0200
@@ -7,6 +7,7 @@
 	echo "[]";
 	return;
 }
+mysqli_set_charset($connect, "utf8" );
 $result = mysqli_query($connect, $query);
 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 	$hops[] = array(

--- a/www/getmiscsources.php	Sat Jun 27 15:41:53 2020 +0200
+++ b/www/getmiscsources.php	Wed Jul 15 16:03:23 2020 +0200
@@ -7,6 +7,7 @@
 	echo "[]";
 	return;
 }
+mysqli_set_charset($connect, "utf8");
 $result = mysqli_query($connect, $query);
 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 	$miscs[] = array(

--- a/www/getwatersources.php	Sat Jun 27 15:41:53 2020 +0200
+++ b/www/getwatersources.php	Wed Jul 15 16:03:23 2020 +0200
@@ -7,6 +7,7 @@
 	echo "[]";
 	return;
 }
+mysqli_set_charset($connect, "utf8");
 $result = mysqli_query($connect, $query);
 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 	$waters[] = array(

--- a/www/getyeastsources.php	Sat Jun 27 15:41:53 2020 +0200
+++ b/www/getyeastsources.php	Wed Jul 15 16:03:23 2020 +0200
@@ -7,6 +7,7 @@
 	echo "[]";
 	return;
 }
+mysqli_set_charset($connect, "utf8");
 $result = mysqli_query($connect, $query);
 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
 	$yeasts[] = array(