diff -r cba50f7529d0 -r 224851e81117 main/automation.c --- a/main/automation.c Mon Nov 25 21:01:46 2019 +0100 +++ b/main/automation.c Sun Apr 19 23:28:26 2020 +0200 @@ -249,6 +249,13 @@ break; case MAIN_AUTO_TOBOIL: + if (recipe.BoilTime == 0) { + /* no-boil recipe */ + log_msg(TAG, "No-boil, start cooling"); + Main_Screen = MAIN_AUTO_COOLING_H; + return true; + } + if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { driver_state->mlt_sp = stageTemp = config.BoilTemperature; driver_state->mlt_mode = MLT_MODE_EXT; @@ -464,23 +471,25 @@ } ShowInteger(2, y, (char *)"Kooktijd", (char *)" min", recipe.BoilTime); ShowFloat(162, y, (char *)"Koel tot", (char *)" C", recipe.CoolTemp, 2); - y += 16; - if (recipe.Additions) { - _fg = TFT_YELLOW; - sprintf(tmp, "%d ", recipe.Additions); - TFT_print(tmp, 2, y); - _fg = TFT_WHITE; - TFT_print((char *)"toevoegingen om", LASTX, y); - _fg = TFT_YELLOW; - for (int i = 1; i <= recipe.Additions; i++) { - sprintf(tmp, " %d", recipe.Addition[i-1].Time); - TFT_print(tmp, LASTX, y); + if (recipe.BoilTime) { + y += 16; + if (recipe.Additions) { + _fg = TFT_YELLOW; + sprintf(tmp, "%d ", recipe.Additions); + TFT_print(tmp, 2, y); + _fg = TFT_WHITE; + TFT_print((char *)"toevoegingen om", LASTX, y); + _fg = TFT_YELLOW; + for (int i = 1; i <= recipe.Additions; i++) { + sprintf(tmp, " %d", recipe.Addition[i-1].Time); + TFT_print(tmp, LASTX, y); + } + _fg = TFT_WHITE; + TFT_print((char *)" minuten", LASTX, y); + } else { + _fg = TFT_WHITE; + TFT_print((char *)"Geen hop toevoegingen.", 2, y); } - _fg = TFT_WHITE; - TFT_print((char *)" minuten", LASTX, y); - } else { - _fg = TFT_WHITE; - TFT_print((char *)"Geen hop toevoegingen.", 2, y); } y += 16; if (recipe.Whirlpool9) { @@ -1124,7 +1133,7 @@ if (driver_state->mlt_sp < 66.0) driver_state->mlt_sp += 1.0; } else if (Main_Screen == MAIN_AUTO_COOLING_C) { - if (driver_state->mlt_sp < 30.0) + if (driver_state->mlt_sp < 45.0) driver_state->mlt_sp += 1.0; } xSemaphoreGive(xSemaphoreDriver);