Mercurial > bms / file diff

--- a/bmsd/mysql.c	Mon Mar 25 20:47:25 2019 +0100
+++ b/bmsd/mysql.c	Wed Mar 27 12:50:57 2019 +0100
@@ -207,6 +207,8 @@
 		fermenter->stage         = xstrcpy(row[43]);
 		fermenter->yeast_lo      = atof(row[45]);
 		fermenter->yeast_hi      = atof(row[46]);
+		fermenter->webcam_url    = xstrcpy(row[47]);
+		fermenter->webcam_light  = atoi(row[48]);
 
 		if (fermenters == NULL) {
 		    fermenters = fermenter;
@@ -291,6 +293,8 @@
 	    free(tmpf->profile_state);
 	if (tmpf->profile_steps)
 	    free(tmpf->profile_steps);
+	if (tmpf->webcam_url)
+	    free(tmpf->webcam_url);
 	free(tmpf);
     }
     for (tmpn = nodes; tmpn; tmpn = oldtmpn) {
@@ -421,7 +425,7 @@
 	"mode='%s', alarm='%d', setpoint_high='%.3f', setpoint_low='%.3f', " \
 	"profile_uuid='%s', profile_name='%s', profile_state='%s', profile_percent='%d', " \
 	"profile_inittemp_high='%.3f', profile_inittemp_low='%.3f', profile_steps='%s', stage='%s', " \
-	"yeast_lo='%.1f', yeast_hi='%.1f'",
+	"yeast_lo='%.1f', yeast_hi='%.1f', webcam_url='%s', webcam_light='%d'",
 	fermenter->uuid, fermenter->alias, fermenter->node, fermenter->online ? "Y":"N",
 	fermenter->beercode ? fermenter->beercode : "", fermenter->beername ? fermenter->beername : "",
 	fermenter->beeruuid ? fermenter->beeruuid : "",
@@ -438,7 +442,8 @@
 	fermenter->profile_uuid ? fermenter->profile_uuid : "", fermenter->profile_name ? fermenter->profile_name : "",
         fermenter->profile_state ? fermenter->profile_state : "", 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->profile_steps ? fermenter->profile_steps : "", fermenter->stage, fermenter->yeast_lo, fermenter->yeast_hi,
+	fermenter->webcam_url ? fermenter->webcam_url : "", fermenter->webcam_light);
 
 //    printf("%s\n", query);
 
@@ -470,7 +475,7 @@
 	"mode='%s', alarm='%d', setpoint_high='%.3f', setpoint_low='%.3f', " \
 	"profile_uuid='%s', profile_name='%s', profile_state='%s', profile_percent='%d', " \
 	"profile_inittemp_high='%.3f', profile_inittemp_low='%.3f', profile_steps='%s', stage='%s', " \
-        "yeast_lo='%.1f', yeast_hi='%.1f' WHERE uuid='%s'",
+        "yeast_lo='%.1f', yeast_hi='%.1f', webcam_url='%s', webcam_light='%d' WHERE uuid='%s'",
 	fermenter->online ? "Y":"N", 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,
@@ -486,7 +491,8 @@
 	fermenter->profile_uuid ? fermenter->profile_uuid : "", fermenter->profile_name ? fermenter->profile_name : "",
 	fermenter->profile_state ? fermenter->profile_state : "", 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->uuid);
+	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);
 
 //    printf("%s\n", query);