Mercurial > mbsePi-apps / changeset
changeset
Moved mash added question to after mash rest mash-in step.
Sun, 27 Dec 2015 17:18:58 +0100
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Sun, 27 Dec 2015 17:18:58 +0100
- changeset 476
- 8f159cd4f5fc
- parent 475
- bec993331061
- child 477
- 9167ad4c2e77
Moved mash added question to after mash rest mash-in step.
| brewco/brewco.c | file | annotate | diff | comparison | revisions |
--- a/brewco/brewco.c Sun Dec 27 16:09:44 2015 +0100 +++ b/brewco/brewco.c Sun Dec 27 17:18:58 2015 +0100 @@ -462,10 +462,7 @@ } else { mltSetpoint = recipe->mash[brew->mashstep].setpoint; brew->timeout = recipe->mash[brew->mashstep].duration * 60; - if ((brew->mashstep == 0) && ! unit->skip_add) { - mash_fase = MASH_PROMPT; - } else - mash_fase = MASH_HEATING; + mash_fase = MASH_HEATING; syslog(LOG_NOTICE, "AUTO: mash step %d fase NA, setpoint %6.2f, duration %d", brew->mashstep, mltSetpoint, brew->timeout); } @@ -485,7 +482,8 @@ slcdDummy(slcdHandle); key = keycheck(); if (key == KEY_ENTER) { - mash_fase = MASH_HEATING; + mash_fase = MASH_NA; + brew->mashstep++; syslog(LOG_NOTICE, "AUTO: confirmed mash added"); } if (key == KEY_RETURN) { @@ -573,7 +571,9 @@ brew->timeout--; if (brew->timeout <= 0) { syslog(LOG_NOTICE, "AUTO: mash step %d fase REST done", brew->mashstep); - if ((brew->mashstep == 6) && ! unit->skip_iodine) { + if ((brew->mashstep == 0) && ! unit->skip_add) { + mash_fase = MASH_PROMPT; + } else if ((brew->mashstep == 6) && ! unit->skip_iodine) { mash_fase = MASH_IODINE; brew->timeout = unit->iodine_time * 60; } else if (brew->mashstep == 7) {
