diff -r 55bcbf92ecab -r fdd30e935079 brewco/setup.c --- a/brewco/setup.c Tue Dec 22 21:07:14 2015 +0100 +++ b/brewco/setup.c Sat Dec 26 21:45:44 2015 +0100 @@ -1055,22 +1055,24 @@ case 3: snprintf(pmpt, Config.lcd_cols + 1, "Boil time: %3d mins", recipe->boiltime); prompt(200, pmpt); break; - case 4: + case 4: snprintf(pmpt, Config.lcd_cols + 1, " Cool to: %5.1f\001", recipe->coolto); + prompt(200, pmpt); + break; case 5: case 6: case 7: case 8: case 9: case 10: - case 11: snprintf(pmpt, Config.lcd_cols + 1, "Mash: %s", recipe->mash[idx - 4].name); + case 11: + case 12: snprintf(pmpt, Config.lcd_cols + 1, "Mash: %s", recipe->mash[idx - 5].name); prompt(200, pmpt); - if (recipe->mash[idx - 4].skip) + if (recipe->mash[idx - 5].skip) snprintf(pmpt, Config.lcd_cols + 1, " Skipped"); else - snprintf(pmpt, Config.lcd_cols + 1, " Sv %4.1f\001 %3d mins", recipe->mash[idx - 4].setpoint, recipe->mash[idx - 4].duration); + snprintf(pmpt, Config.lcd_cols + 1, " Sv %4.1f\001 %3d mins", recipe->mash[idx - 5].setpoint, recipe->mash[idx - 5].duration); prompt(300, pmpt); break; - case 12: case 13: case 14: case 15: @@ -1079,28 +1081,29 @@ case 18: case 19: case 20: - case 21: snprintf(pmpt, Config.lcd_cols + 1, "Add: %s", recipe->hops[idx - 12].name); + case 21: + case 22: snprintf(pmpt, Config.lcd_cols + 1, "Add: %s", recipe->hops[idx - 13].name); prompt(200, pmpt); - if (recipe->hops[idx - 12].skip) + if (recipe->hops[idx - 13].skip) snprintf(pmpt, Config.lcd_cols + 1, " Skipped"); else { - if (recipe->hops[idx - 12].boiltime == -1) + if (recipe->hops[idx - 13].boiltime == -1) snprintf(pmpt, Config.lcd_cols + 1, " First Wort Hop"); else - snprintf(pmpt, Config.lcd_cols + 1, " Boil for %3d mins", recipe->hops[idx - 12].boiltime); + snprintf(pmpt, Config.lcd_cols + 1, " Boil for %3d mins", recipe->hops[idx - 13].boiltime); } prompt(300, pmpt); break; - case 22: - case 23: - case 24: snprintf(pmpt, Config.lcd_cols + 1, "Hopstand: %s", recipe->hopstand[idx - 22].name); + case 23: + case 24: + case 25: snprintf(pmpt, Config.lcd_cols + 1, "Hopstand: %s", recipe->hopstand[idx - 23].name); prompt(200, pmpt); - if (recipe->hopstand[idx - 22].skip) + if (recipe->hopstand[idx - 23].skip) snprintf(pmpt, Config.lcd_cols + 1, " Skipped"); - else if (recipe->hopstand[idx - 22].hold) - snprintf(pmpt, Config.lcd_cols + 1, "Hold at %4.1f %3d mins", recipe->hopstand[idx - 22].setpoint, recipe->hopstand[idx - 22].duration); + else if (recipe->hopstand[idx - 23].hold) + snprintf(pmpt, Config.lcd_cols + 1, "Hold at %4.1f %3d mins", recipe->hopstand[idx - 23].setpoint, recipe->hopstand[idx - 23].duration); else - snprintf(pmpt, Config.lcd_cols + 1, "Hold for %3d mins", recipe->hopstand[idx - 22].duration); + snprintf(pmpt, Config.lcd_cols + 1, "Hold for %3d mins", recipe->hopstand[idx - 23].duration); prompt(300, pmpt); break; } @@ -1147,16 +1150,17 @@ break; case 3: editInteger(&recipe->boiltime, 60, 240, 5, (char *)"Boil time:", (char *)"mins"); break; - case 4: + case 4: editFloat(&recipe->coolto, 10.0, 30.0, (char *)" Cool to"); + case 5: case 6: case 7: case 8: case 9: case 10: - case 11: editMash(&recipe->mash[idx-4]); + case 11: + case 12: editMash(&recipe->mash[idx-5]); break; - case 12: case 13: case 14: case 15: @@ -1165,11 +1169,12 @@ case 18: case 19: case 20: - case 21: editHopaddition(&recipe->hops[idx-12], recipe->boiltime); + case 21: + case 22: editHopaddition(&recipe->hops[idx-13], recipe->boiltime); break; - case 22: case 23: - case 24: editHopstand(&recipe->hopstand[idx-22]); + case 24: + case 25: editHopstand(&recipe->hopstand[idx-23]); break; } } @@ -1195,6 +1200,7 @@ snprintf(name, 21, "%04d", number); recipe->code = xstrcpy(name); recipe->boiltime = 90; + recipe->coolto = 20.0; recipe->starttime = recipe->endtime = (time_t)0; /* * Initial mash schedule, set a single-step 67 degr. mash