comparison: main/automation.c
main/automation.c
- changeset 79
- cb5c73a8ae90
- parent 78
- b58e0c9897e1
- child 81
- 72c715ac0444
equal
deleted
inserted
replaced
| 78:b58e0c9897e1 | 79:cb5c73a8ae90 |
|---|---|
| 302 break; | 302 break; |
| 303 | 303 |
| 304 case MAIN_AUTO_COOLING_H: | 304 case MAIN_AUTO_COOLING_H: |
| 305 case MAIN_AUTO_COOLING_M: | 305 case MAIN_AUTO_COOLING_M: |
| 306 case MAIN_AUTO_COOLING_C: | 306 case MAIN_AUTO_COOLING_C: |
| 307 Sub_Screen = 0; | |
| 307 TempReached = false; | 308 TempReached = false; |
| 308 runtime.StageResume = Main_Screen; | 309 runtime.StageResume = Main_Screen; |
| 309 runtime.StageTimeLeft = 0; | 310 runtime.StageTimeLeft = 0; |
| 310 updateRuntime = true; | 311 updateRuntime = true; |
| 311 if ((Main_Screen == MAIN_AUTO_COOLING_H) && (! recipe.Whirlpool7)) { | 312 if ((Main_Screen == MAIN_AUTO_COOLING_H) && (! recipe.Whirlpool7)) { |
| 1157 ds18b20_state->mlt_temperature = ((int)(Fake_MLT * 16)) / 16.0; | 1158 ds18b20_state->mlt_temperature = ((int)(Fake_MLT * 16)) / 16.0; |
| 1158 xSemaphoreGive(xSemaphoreDS18B20); | 1159 xSemaphoreGive(xSemaphoreDS18B20); |
| 1159 } | 1160 } |
| 1160 #endif | 1161 #endif |
| 1161 MLT_info(71, 26, true); | 1162 MLT_info(71, 26, true); |
| 1162 if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { | 1163 if (Sub_Screen == 1 && xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { |
| 1163 /* | 1164 /* |
| 1164 * If the pump safe temperature is reached, add the control button. | 1165 * If the pump safe temperature is reached, add the control button. |
| 1165 * Redefine key number 3 if it is at the position of key 2. | 1166 * Redefine key number 3 if it is at the position of key 2. |
| 1166 */ | 1167 */ |
| 1167 if ((driver_state->mlt_pv < equipment.PumpMaxTemp) && (Buttons[3].x == Buttons[2].x) &&(Buttons[3].y == Buttons[2].y)) { | 1168 if ((driver_state->mlt_pv < equipment.PumpMaxTemp) && (Buttons[3].x == Buttons[2].x) &&(Buttons[3].y == Buttons[2].y)) { |
| 1168 Buttons_Add(255, 200, 60, 40, (char *)"Pomp", 3); | 1169 Buttons_Add(255, 200, 60, 40, (char *)"Pomp", 3); |
| 1169 Buttons_Show(); | 1170 Buttons_Show(); |
| 1171 Sub_Screen = 2; | |
| 1170 } | 1172 } |
| 1171 xSemaphoreGive(xSemaphoreDriver); | 1173 xSemaphoreGive(xSemaphoreDriver); |
| 1174 if (Sub_Screen == 2) { | |
| 1175 snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen); | |
| 1176 ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); | |
| 1177 } | |
| 1172 } | 1178 } |
| 1173 switch (Buttons_Scan()) { | 1179 switch (Buttons_Scan()) { |
| 1174 case 1: if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { | 1180 case 1: if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { |
| 1175 if (Main_Screen == MAIN_AUTO_COOLING_H) { | 1181 if (Main_Screen == MAIN_AUTO_COOLING_H) { |
| 1176 if (driver_state->mlt_sp < 77.0) | 1182 if (driver_state->mlt_sp < 77.0) |
