diff -r 55bcbf92ecab -r fdd30e935079 brewco/brewco.h --- a/brewco/brewco.h Tue Dec 22 21:07:14 2015 +0100 +++ b/brewco/brewco.h Sat Dec 26 21:45:44 2015 +0100 @@ -227,6 +227,7 @@ char *code; /* Recipe code */ char *name; /* Recipe name */ int boiltime; /* 1..240 minutes */ + float coolto; /* Cooling target */ time_t starttime; /* Start time */ time_t endtime; /* Ending time */ mash_step mash[8]; /* 8 mash steps */ @@ -288,28 +289,22 @@ #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_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 STEP_MASHREMOVE 7 /* Remove mash */ +#define STEP_PREBOIL 8 /* Heating before boil */ +#define STEP_BOILING 9 /* Boil */ +#define STEP_BOILDONE 10 /* Boil done, hopstand */ +#define STEP_COOLING 11 /* Cooling */ +#define STEP_HOPSTAND 12 /* Hopstand */ +#define STEP_WHIRLPOOL 13 /* Final whirlpool */ +#define STEP_CLEANUP 14 /* Cleanup */ +#define STEP_BREWDONE 15 /* Final step */ #define MASH_NA 0 /* Not in any state yet */ -#define MASH_PROMPT 1 /* Prompt the user */ -#define MASH_HEATING 2 /* Heating phase */ -#define MASH_REST 3 /* Rest phase */ -#define MASH_DONE 4 /* This step is done */ +#define MASH_PROMPT 1 /* Prompt for mash */ +#define MASH_IODINE 2 /* Prompt for iodine test */ +#define MASH_HEATING 3 /* Heating phase */ +#define MASH_REST 4 /* Rest phase */ +#define MASH_DONE 5 /* This step is done */