comparison: main/automation.c
main/automation.c
- changeset 75
- 224851e81117
- parent 64
- 326c38d3681b
- child 77
- 66c77497d86d
equal
deleted
inserted
replaced
| 74:cba50f7529d0 | 75:224851e81117 |
|---|---|
| 247 HLT_info(71,170, false, true); | 247 HLT_info(71,170, false, true); |
| 248 } | 248 } |
| 249 break; | 249 break; |
| 250 | 250 |
| 251 case MAIN_AUTO_TOBOIL: | 251 case MAIN_AUTO_TOBOIL: |
| 252 if (recipe.BoilTime == 0) { | |
| 253 /* no-boil recipe */ | |
| 254 log_msg(TAG, "No-boil, start cooling"); | |
| 255 Main_Screen = MAIN_AUTO_COOLING_H; | |
| 256 return true; | |
| 257 } | |
| 258 | |
| 252 if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { | 259 if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { |
| 253 driver_state->mlt_sp = stageTemp = config.BoilTemperature; | 260 driver_state->mlt_sp = stageTemp = config.BoilTemperature; |
| 254 driver_state->mlt_mode = MLT_MODE_EXT; | 261 driver_state->mlt_mode = MLT_MODE_EXT; |
| 255 driver_state->hlt_sp = 0.0; | 262 driver_state->hlt_sp = 0.0; |
| 256 driver_state->hlt_mode = HLT_MODE_NONE; | 263 driver_state->hlt_mode = HLT_MODE_NONE; |
| 462 y += 16; | 469 y += 16; |
| 463 } | 470 } |
| 464 } | 471 } |
| 465 ShowInteger(2, y, (char *)"Kooktijd", (char *)" min", recipe.BoilTime); | 472 ShowInteger(2, y, (char *)"Kooktijd", (char *)" min", recipe.BoilTime); |
| 466 ShowFloat(162, y, (char *)"Koel tot", (char *)" C", recipe.CoolTemp, 2); | 473 ShowFloat(162, y, (char *)"Koel tot", (char *)" C", recipe.CoolTemp, 2); |
| 467 y += 16; | 474 if (recipe.BoilTime) { |
| 468 if (recipe.Additions) { | 475 y += 16; |
| 469 _fg = TFT_YELLOW; | 476 if (recipe.Additions) { |
| 470 sprintf(tmp, "%d ", recipe.Additions); | 477 _fg = TFT_YELLOW; |
| 471 TFT_print(tmp, 2, y); | 478 sprintf(tmp, "%d ", recipe.Additions); |
| 472 _fg = TFT_WHITE; | 479 TFT_print(tmp, 2, y); |
| 473 TFT_print((char *)"toevoegingen om", LASTX, y); | 480 _fg = TFT_WHITE; |
| 474 _fg = TFT_YELLOW; | 481 TFT_print((char *)"toevoegingen om", LASTX, y); |
| 475 for (int i = 1; i <= recipe.Additions; i++) { | 482 _fg = TFT_YELLOW; |
| 476 sprintf(tmp, " %d", recipe.Addition[i-1].Time); | 483 for (int i = 1; i <= recipe.Additions; i++) { |
| 477 TFT_print(tmp, LASTX, y); | 484 sprintf(tmp, " %d", recipe.Addition[i-1].Time); |
| 478 } | 485 TFT_print(tmp, LASTX, y); |
| 479 _fg = TFT_WHITE; | 486 } |
| 480 TFT_print((char *)" minuten", LASTX, y); | 487 _fg = TFT_WHITE; |
| 481 } else { | 488 TFT_print((char *)" minuten", LASTX, y); |
| 482 _fg = TFT_WHITE; | 489 } else { |
| 483 TFT_print((char *)"Geen hop toevoegingen.", 2, y); | 490 _fg = TFT_WHITE; |
| 491 TFT_print((char *)"Geen hop toevoegingen.", 2, y); | |
| 492 } | |
| 484 } | 493 } |
| 485 y += 16; | 494 y += 16; |
| 486 if (recipe.Whirlpool9) { | 495 if (recipe.Whirlpool9) { |
| 487 ShowInteger(2, y, (char *)"Whirlpool 88..100 graden", (char *)" minuten", recipe.Whirlpool9); | 496 ShowInteger(2, y, (char *)"Whirlpool 88..100 graden", (char *)" minuten", recipe.Whirlpool9); |
| 488 y += 16; | 497 y += 16; |
| 1122 driver_state->mlt_sp += 1.0; | 1131 driver_state->mlt_sp += 1.0; |
| 1123 } else if (Main_Screen == MAIN_AUTO_COOLING_M) { | 1132 } else if (Main_Screen == MAIN_AUTO_COOLING_M) { |
| 1124 if (driver_state->mlt_sp < 66.0) | 1133 if (driver_state->mlt_sp < 66.0) |
| 1125 driver_state->mlt_sp += 1.0; | 1134 driver_state->mlt_sp += 1.0; |
| 1126 } else if (Main_Screen == MAIN_AUTO_COOLING_C) { | 1135 } else if (Main_Screen == MAIN_AUTO_COOLING_C) { |
| 1127 if (driver_state->mlt_sp < 30.0) | 1136 if (driver_state->mlt_sp < 45.0) |
| 1128 driver_state->mlt_sp += 1.0; | 1137 driver_state->mlt_sp += 1.0; |
| 1129 } | 1138 } |
| 1130 xSemaphoreGive(xSemaphoreDriver); | 1139 xSemaphoreGive(xSemaphoreDriver); |
| 1131 } | 1140 } |
| 1132 log_msg(TAG, "Increase sp to %.2f", driver_state->mlt_sp); | 1141 log_msg(TAG, "Increase sp to %.2f", driver_state->mlt_sp); |
