Mercurial > brewboard / file comparison

comparison: main/manual.c

main/manual.c

changeset 54
7b134c27fadb
parent 0
b74b0e4902c3
child 62
2e90ada37476
equal deleted inserted replaced
53:cf91a3a20d0d 54:7b134c27fadb
38 xSemaphoreGive(xSemaphoreDriver); 38 xSemaphoreGive(xSemaphoreDriver);
39 } 39 }
40 break; 40 break;
41 41
42 case MAIN_MANUAL_MAIN: 42 case MAIN_MANUAL_MAIN:
43 TopMessage("Handbediening"); 43 TopMessage((char *)"Handbediening");
44 Buttons_Add( 5, 200, 60, 40, "Stop", 0); 44 Buttons_Add( 5, 200, 60, 40, (char *)"Stop", 0);
45 Buttons[0].dark = true; 45 Buttons[0].dark = true;
46 uint8_t i = 1; 46 uint8_t i = 1;
47 if (_ManualMLT) { 47 if (_ManualMLT) {
48 MLT_info(71, 26, false); 48 MLT_info(71, 26, false);
49 Buttons_Add( 5, 26, 60, 40, "+sp" , i++); 49 Buttons_Add( 5, 26, 60, 40, (char *)"+sp" , i++);
50 Buttons_Add(255, 26, 60, 40, "-sp" , i++); 50 Buttons_Add(255, 26, 60, 40, (char *)"-sp" , i++);
51 Buttons_Add( 5, 76, 60, 40, "Pomp" , i++); 51 Buttons_Add( 5, 76, 60, 40, (char *)"Pomp" , i++);
52 Buttons_Add(255, 76, 60, 40, "Aan" , i++); 52 Buttons_Add(255, 76, 60, 40, (char *)"Aan" , i++);
53 } 53 }
54 if (_ManualHLT) { 54 if (_ManualHLT) {
55 HLT_info(71,150, false, false); 55 HLT_info(71,150, false, false);
56 Buttons_Add( 5, 150, 60, 40, "+sp" , i++); 56 Buttons_Add( 5, 150, 60, 40, (char *)"+sp" , i++);
57 Buttons_Add(255, 150, 60, 40, "-sp" , i++); 57 Buttons_Add(255, 150, 60, 40, (char *)"-sp" , i++);
58 Buttons_Add(255, 200, 60, 40, "Aan" , i); 58 Buttons_Add(255, 200, 60, 40, (char *)"Aan" , i);
59 } 59 }
60 Buttons_Show(); 60 Buttons_Show();
61 break; 61 break;
62 62
63 default: 63 default:
75 bool Manual_Loop(void) 75 bool Manual_Loop(void)
76 { 76 {
77 switch (Main_Screen) { 77 switch (Main_Screen) {
78 case MAIN_MANUAL_INIT: 78 case MAIN_MANUAL_INIT:
79 _ManualHLT = _ManualMLT = false; 79 _ManualHLT = _ManualMLT = false;
80 Buttons_Add( 40, 100, 80, 40, "Ja", 0); 80 Buttons_Add( 40, 100, 80, 40, (char *)"Ja", 0);
81 Buttons_Add(200, 100, 80, 40, "Nee", 1); 81 Buttons_Add(200, 100, 80, 40, (char *)"Nee", 1);
82 Buttons_Show(); 82 Buttons_Show();
83 83
84 if ((equipment.SSR2 == SSR2_HLT_SHARE) || (equipment.SSR2 == SSR2_HLT_IND)) { 84 if ((equipment.SSR2 == SSR2_HLT_SHARE) || (equipment.SSR2 == SSR2_HLT_IND)) {
85 TopMessage("Spoelwater ketel?"); 85 TopMessage((char *)"Spoelwater ketel?");
86 SoundPlay(SOUND_Prompt); 86 SoundPlay(SOUND_Prompt);
87 loop = true; 87 loop = true;
88 while (loop) { 88 while (loop) {
89 switch (Buttons_Scan()) { 89 switch (Buttons_Scan()) {
90 case 0: loop = false; 90 case 0: loop = false;
99 } 99 }
100 vTaskDelay(20 / portTICK_PERIOD_MS); 100 vTaskDelay(20 / portTICK_PERIOD_MS);
101 } 101 }
102 } 102 }
103 103
104 TopMessage("Maisch/Kook ketel?"); 104 TopMessage((char *)"Maisch/Kook ketel?");
105 SoundPlay(SOUND_Prompt); 105 SoundPlay(SOUND_Prompt);
106 loop = true; 106 loop = true;
107 while (loop) { 107 while (loop) {
108 switch (Buttons_Scan()) { 108 switch (Buttons_Scan()) {
109 case 0: loop = false; 109 case 0: loop = false;
200 } 200 }
201 } else { 201 } else {
202 if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { 202 if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
203 if (driver_state->hlt_mode == HLT_MODE_BANG) { 203 if (driver_state->hlt_mode == HLT_MODE_BANG) {
204 driver_state->hlt_mode = HLT_MODE_OFF; 204 driver_state->hlt_mode = HLT_MODE_OFF;
205 Buttons_Add(255, 200, 60, 40, "Aan" , 3); 205 Buttons_Add(255, 200, 60, 40, (char *)"Aan" , 3);
206 ESP_LOGI(TAG, "HLT turned off"); 206 ESP_LOGI(TAG, "HLT turned off");
207 } else { 207 } else {
208 driver_state->hlt_mode = HLT_MODE_BANG; 208 driver_state->hlt_mode = HLT_MODE_BANG;
209 Buttons_Add(255, 200, 60, 40, "Uit" , 3); 209 Buttons_Add(255, 200, 60, 40, (char *)"Uit" , 3);
210 ESP_LOGI(TAG, "HLT turned on"); 210 ESP_LOGI(TAG, "HLT turned on");
211 } 211 }
212 xSemaphoreGive(xSemaphoreDriver); 212 xSemaphoreGive(xSemaphoreDriver);
213 } 213 }
214 Buttons_Show(); 214 Buttons_Show();
216 break; 216 break;
217 217
218 case 4: if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { 218 case 4: if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
219 if (driver_state->mlt_mode == MLT_MODE_PID) { 219 if (driver_state->mlt_mode == MLT_MODE_PID) {
220 driver_state->mlt_mode = MLT_MODE_OFF; 220 driver_state->mlt_mode = MLT_MODE_OFF;
221 Buttons_Add(255, 76, 60, 40, "Aan" , 4); 221 Buttons_Add(255, 76, 60, 40, (char *)"Aan" , 4);
222 ESP_LOGI(TAG, "MLT turned off"); 222 ESP_LOGI(TAG, "MLT turned off");
223 } else { 223 } else {
224 driver_state->mlt_mode = MLT_MODE_PID; 224 driver_state->mlt_mode = MLT_MODE_PID;
225 Buttons_Add(255, 76, 60, 40, "Uit" , 4); 225 Buttons_Add(255, 76, 60, 40, (char *)"Uit" , 4);
226 ESP_LOGI(TAG, "MLT turned on"); 226 ESP_LOGI(TAG, "MLT turned on");
227 } 227 }
228 xSemaphoreGive(xSemaphoreDriver); 228 xSemaphoreGive(xSemaphoreDriver);
229 } 229 }
230 Buttons_Show(); 230 Buttons_Show();
243 break; 243 break;
244 244
245 case 7: if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { 245 case 7: if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) {
246 if (driver_state->hlt_mode == HLT_MODE_BANG) { 246 if (driver_state->hlt_mode == HLT_MODE_BANG) {
247 driver_state->hlt_mode = HLT_MODE_OFF; 247 driver_state->hlt_mode = HLT_MODE_OFF;
248 Buttons_Add(255, 200, 60, 40, "Aan" , 7); 248 Buttons_Add(255, 200, 60, 40, (char *)"Aan" , 7);
249 ESP_LOGI(TAG, "HLT turned off"); 249 ESP_LOGI(TAG, "HLT turned off");
250 } else { 250 } else {
251 driver_state->hlt_mode = HLT_MODE_BANG; 251 driver_state->hlt_mode = HLT_MODE_BANG;
252 Buttons_Add(255, 200, 60, 40, "Uit" , 7); 252 Buttons_Add(255, 200, 60, 40, (char *)"Uit" , 7);
253 ESP_LOGI(TAG, "HLT turned on"); 253 ESP_LOGI(TAG, "HLT turned on");
254 } 254 }
255 xSemaphoreGive(xSemaphoreDriver); 255 xSemaphoreGive(xSemaphoreDriver);
256 } 256 }
257 Buttons_Show(); 257 Buttons_Show();

Mercurial Repository: brewboard

mercurial