Mercurial > mbsePi-apps / changeset

--- a/brewco/brewco.h	Mon Dec 21 21:21:16 2015 +0100
+++ b/brewco/brewco.h	Mon Dec 21 22:36:30 2015 +0100
@@ -283,21 +283,26 @@
  */
 #define	STEP_NA		0			/* Not in any step yet		*/
 #define	STEP_BREWINIT	1			/* Initialize brew		*/
-#define	STEP_WAITSTART	2			/* Wait for starttime		*/
-#define	STEP_PREMASH	3			/* Pre-mash			*/
-#define	STEP_MASHING	4			/* Mash steps			*/
-#define	STEP_IODINE	5			/* Iodine test			*/
-#define	STEP_MASHREMOVE	6			/* Remove mash			*/
-#define	STEP_PREBOIL	7			/* Heating before boil		*/
-#define	STEP_BOILING	8			/* Boil				*/
-#define	STEP_BOILDONE	9			/* Boil done, hopstand		*/
-#define	STEP_COOLING	10			/* Cooling			*/
-#define	STEP_WHIRLPOOL	11			/* Whirlpool			*/
-#define	STEP_CLEANUP	12			/* Cleanup			*/
-#define	STEP_BREWDONE	13			/* Final step			*/
-#define	STEP_HOPSTAND1	14			/* Hopstand 88..100		*/
-#define	STEP_HOPSTAND2	15			/* Hopstand 71..77		*/
-#define	STEP_HOPSTAND3	16			/* Hopstand 60..66		*/
+#define	STEP_WATERCHECK	2			/* Water added?			*/
+#define	STEP_PUMPPRIME	3			/* Pump Prime			*/
+#define	STEP_WAITSTART	4			/* Wait for starttime		*/
+#define	STEP_PREMASH	5			/* Pre-mash			*/
+#define	STEP_MASHING	6			/* Mash steps			*/
+#define	STEP_IODINE	7			/* Iodine test			*/
+#define	STEP_MASHREMOVE	8			/* Remove mash			*/
+#define	STEP_PREBOIL	9			/* Heating before boil		*/
+#define	STEP_BOILING	10			/* Boil				*/
+#define	STEP_BOILDONE	11			/* Boil done, hopstand		*/
+#define STEP_WHIRLPOOL1	12			/* Whirlpool hot		*/
+#define STEP_HOPSTAND1	13			/* Hopstand 88..100		*/
+#define	STEP_COOLING1	14			/* Cooling to hopstand 2	*/
+#define STEP_HOPSTAND2	15			/* Hopstand 71..77		*/
+#define STEP_COOLING2	16			/* Cooling to hopstand 3	*/
+#define STEP_HOPSTAND3	17			/* Hopstand 60..66		*/
+#define STEP_COOLING	18			/* Final cooling		*/
+#define STEP_WHIRLPOOL	19			/* Final whirlpool		*/
+#define	STEP_CLEANUP	20			/* Cleanup			*/
+#define	STEP_BREWDONE	21			/* Final step			*/
 
 #define	MASH_NA		0			/* Not in any state yet		*/
 #define	MASH_PROMPT	1			/* Prompt the user		*/

--- a/brewco/rdsession.c	Mon Dec 21 21:21:16 2015 +0100
+++ b/brewco/rdsession.c	Mon Dec 21 22:36:30 2015 +0100
@@ -29,7 +29,11 @@
 extern char	*etcpath;
 
 
-const char      BREWSTEP[14][10] = { "NA", "INIT", "WAITSTART", "PREMASH", "MASHING", "IODINE", "REMOVE", "PREBOIL", "BOIL", "BOILDONE", "COOLING", "WHIRLPOOL", "CLEANUP", "DONE" };
+const char      BREWSTEP[22][11] = { 	"NA", "INIT", "WATEROK", "PRIME", "WAITSTART",
+					"PREMASH", "MASHING", "IODINE", "REMOVE", "PREBOIL",
+					"BOIL", "BOILDONE", "WHIRLPOOL1", "HOPSTAND1", "COOLING1",
+					"HOPSTAND2", "COOLING2", "HOPSTAND3", "COOLING", "WHIRLPOOL",
+					"CLEANUP", "DONE" };
 const char	MASHSTEP[5][8] = { "NA", "PROMPT", "HEATING", "REST", "DONE" };
 
 #define MY_ENCODING "utf-8"
@@ -232,7 +236,7 @@
 	}
 	if ((!xmlStrcmp(cur->name, (const xmlChar *)"BREWSTEP"))) {
 	    key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
-	    for (i = 0; i < 14; i++) {
+	    for (i = 0; i < 22; i++) {
 		if (! xmlStrcmp(key, (const xmlChar *)BREWSTEP[i])) {
 		    brew->brewstep = i;
 		    break;