Added command to turn lights on in monitor fermenter when a camera is started. Added the missing tolerance field when selecting a new yeast in a product or recipe.

Sun, 31 Mar 2019 20:14:34 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Sun, 31 Mar 2019 20:14:34 +0200
changeset 337
faedcfa0610f
parent 336
3323b02c1bbe
child 338
a51b858aacca

Added command to turn lights on in monitor fermenter when a camera is started. Added the missing tolerance field when selecting a new yeast in a product or recipe.

www/getyeastsources.php file | annotate | diff | comparison | revisions
www/js/global.js file | annotate | diff | comparison | revisions
www/js/mon_fermenter.js file | annotate | diff | comparison | revisions
--- a/www/getyeastsources.php	Sat Mar 30 20:11:33 2019 +0100
+++ b/www/getyeastsources.php	Sun Mar 31 20:14:34 2019 +0200
@@ -22,7 +22,8 @@
 		'attenuation' => $row['attenuation'],
 		'cells' => $row['cells'],
 		'inventory' => $row['inventory'],
-		'cost' => $row['cost']
+		'cost' => $row['cost'],
+		'tolerance' => $row['tolerance']
 	);
 }
 header("Content-type: application/json");
--- a/www/js/global.js	Sat Mar 30 20:11:33 2019 +0100
+++ b/www/js/global.js	Sun Mar 31 20:14:34 2019 +0200
@@ -611,7 +611,8 @@
 		{ name: 'attenuation', type: 'float' },
 		{ name: 'cells', type: 'float' },
 		{ name: 'inventory', type: 'float' },
-		{ name: 'cost', type: 'float' }
+		{ name: 'cost', type: 'float' },
+		{ name: 'tolerance', type: 'float' }
 	],
 	url: "getyeastsources.php"
 };
--- a/www/js/mon_fermenter.js	Sat Mar 30 20:11:33 2019 +0100
+++ b/www/js/mon_fermenter.js	Sun Mar 31 20:14:34 2019 +0200
@@ -684,6 +684,8 @@
 	});
 	$("#Camera").jqxButton({ template: "primary", width: '150px', theme: theme });
 	$("#Camera").click(function () {
+		record.light_state = 100;
+		newSwitch = true;
 		var url=record.webcam_url;
 		window.open(url);
 	});

mercurial