Mercurial > brewboard / file diff

--- a/main/task_tft.c	Mon Jun 01 20:27:00 2020 +0200
+++ b/main/task_tft.c	Sat Jun 06 13:28:46 2020 +0200
@@ -621,14 +621,7 @@
 		case MAIN_AUTO_INIT2:
 		case MAIN_AUTO_DELAYSTART:
 		case MAIN_AUTO_HEATUP:
-		case MAIN_AUTO_MASH_IN:
-		case MAIN_AUTO_MASH_1:
-		case MAIN_AUTO_MASH_2:
-		case MAIN_AUTO_MASH_3:
-		case MAIN_AUTO_MASH_4:
-		case MAIN_AUTO_MASH_5:
-		case MAIN_AUTO_MASH_6:
-		case MAIN_AUTO_MASH_OUT:
+		case MAIN_AUTO_MASH:
 		case MAIN_AUTO_TOBOIL:
 		case MAIN_AUTO_BOILING:
 		case MAIN_AUTO_COOLING_H:
@@ -744,14 +737,7 @@
 	    case MAIN_AUTO_INIT2:
 	    case MAIN_AUTO_DELAYSTART:
 	    case MAIN_AUTO_HEATUP:
-	    case MAIN_AUTO_MASH_IN:
-	    case MAIN_AUTO_MASH_1:
-	    case MAIN_AUTO_MASH_2:
-	    case MAIN_AUTO_MASH_3:
-	    case MAIN_AUTO_MASH_4:
-	    case MAIN_AUTO_MASH_5:
-	    case MAIN_AUTO_MASH_6:
-	    case MAIN_AUTO_MASH_OUT:
+	    case MAIN_AUTO_MASH:
 	    case MAIN_AUTO_TOBOIL:
 	    case MAIN_AUTO_BOILING:
 	    case MAIN_AUTO_COOLING_H:
@@ -784,7 +770,7 @@
 	/*
 	 * Count power average during brewing.
 	 */
-	if ((Main_Screen >= MAIN_AUTO_MASH_IN) && (Main_Screen < MAIN_AUTO_DONE)) {
+	if ((Main_Screen >= MAIN_AUTO_MASH) && (Main_Screen < MAIN_AUTO_DONE)) {
 	    if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
 		power_MLT += driver_state->mlt_power;
 		power_HLT += driver_state->hlt_power;
@@ -797,7 +783,7 @@
 	    /*
 	     * Brew logging.
 	     */
-	    if ((Main_Screen >= MAIN_AUTO_MASH_IN) && (Main_Screen < MAIN_AUTO_DONE)) {
+	    if ((Main_Screen >= MAIN_AUTO_MASH) && (Main_Screen < MAIN_AUTO_DONE)) {
 		update_json();
 		log_json();
 		power_MLT = power_HLT = counts = 0;