# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1451233138 -3600
# Node ID 8f159cd4f5fccef270b97868318c4e56b70682f1
# Parent  bec99333106160d78e8821fe76d05edaca8049ad
Moved mash added question to after mash rest mash-in step.

diff -r bec993331061 -r 8f159cd4f5fc brewco/brewco.c
--- 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) {