# HG changeset patch # User Michiel Broek # Date 1450734809 -3600 # Node ID c2794ae0def36068b04c85651ec9c31039972b15 # Parent d26def8460290245335b4a65fc41c1ce4340a86f Revised brew steps again diff -r d26def846029 -r c2794ae0def3 brewco/brewco.h --- a/brewco/brewco.h Mon Dec 21 22:36:30 2015 +0100 +++ b/brewco/brewco.h Mon Dec 21 22:53:29 2015 +0100 @@ -293,16 +293,17 @@ #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 STEP_HOPSTAND1 12 /* Hopstand 88..100 */ +#define STEP_COOLING1 13 /* Cooling to whirlpool hot */ +#define STEP_WHIRLPOOL1 14 /* Whirlpool hot */ +#define STEP_COOLING2 15 /* Cooling to hopstand 2 */ +#define STEP_HOPSTAND2 16 /* Hopstand 71..77 */ +#define STEP_COOLING3 17 /* Cooling to hopstand 3 */ +#define STEP_HOPSTAND3 18 /* Hopstand 60..66 */ +#define STEP_COOLING 19 /* Final cooling */ +#define STEP_WHIRLPOOL 20 /* Final whirlpool */ +#define STEP_CLEANUP 21 /* Cleanup */ +#define STEP_BREWDONE 22 /* Final step */ #define MASH_NA 0 /* Not in any state yet */ #define MASH_PROMPT 1 /* Prompt the user */ diff -r d26def846029 -r c2794ae0def3 brewco/rdsession.c --- a/brewco/rdsession.c Mon Dec 21 22:36:30 2015 +0100 +++ b/brewco/rdsession.c Mon Dec 21 22:53:29 2015 +0100 @@ -29,11 +29,11 @@ extern char *etcpath; -const char BREWSTEP[22][11] = { "NA", "INIT", "WATEROK", "PRIME", "WAITSTART", +const char BREWSTEP[23][11] = { "NA", "INIT", "WATEROK", "PRIME", "WAITSTART", "PREMASH", "MASHING", "IODINE", "REMOVE", "PREBOIL", - "BOIL", "BOILDONE", "WHIRLPOOL1", "HOPSTAND1", "COOLING1", - "HOPSTAND2", "COOLING2", "HOPSTAND3", "COOLING", "WHIRLPOOL", - "CLEANUP", "DONE" }; + "BOIL", "BOILDONE", "HOPSTAND1", "COOLING1", "WHIRLPOOL1", + "COOLING2", "HOPSTAND2", "COOLING3", "HOPSTAND3", "COOLING", + "WHIRLPOOL", "CLEANUP", "DONE" }; const char MASHSTEP[5][8] = { "NA", "PROMPT", "HEATING", "REST", "DONE" }; #define MY_ENCODING "utf-8" @@ -236,7 +236,7 @@ } if ((!xmlStrcmp(cur->name, (const xmlChar *)"BREWSTEP"))) { key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - for (i = 0; i < 22; i++) { + for (i = 0; i < 23; i++) { if (! xmlStrcmp(key, (const xmlChar *)BREWSTEP[i])) { brew->brewstep = i; break;