diff -r cf91a3a20d0d -r 7b134c27fadb main/manual.c --- a/main/manual.c Sun May 19 21:05:07 2019 +0200 +++ b/main/manual.c Mon Jul 01 23:15:49 2019 +0200 @@ -40,22 +40,22 @@ break; case MAIN_MANUAL_MAIN: - TopMessage("Handbediening"); - Buttons_Add( 5, 200, 60, 40, "Stop", 0); + TopMessage((char *)"Handbediening"); + Buttons_Add( 5, 200, 60, 40, (char *)"Stop", 0); Buttons[0].dark = true; uint8_t i = 1; if (_ManualMLT) { MLT_info(71, 26, false); - Buttons_Add( 5, 26, 60, 40, "+sp" , i++); - Buttons_Add(255, 26, 60, 40, "-sp" , i++); - Buttons_Add( 5, 76, 60, 40, "Pomp" , i++); - Buttons_Add(255, 76, 60, 40, "Aan" , i++); + Buttons_Add( 5, 26, 60, 40, (char *)"+sp" , i++); + Buttons_Add(255, 26, 60, 40, (char *)"-sp" , i++); + Buttons_Add( 5, 76, 60, 40, (char *)"Pomp" , i++); + Buttons_Add(255, 76, 60, 40, (char *)"Aan" , i++); } if (_ManualHLT) { HLT_info(71,150, false, false); - Buttons_Add( 5, 150, 60, 40, "+sp" , i++); - Buttons_Add(255, 150, 60, 40, "-sp" , i++); - Buttons_Add(255, 200, 60, 40, "Aan" , i); + Buttons_Add( 5, 150, 60, 40, (char *)"+sp" , i++); + Buttons_Add(255, 150, 60, 40, (char *)"-sp" , i++); + Buttons_Add(255, 200, 60, 40, (char *)"Aan" , i); } Buttons_Show(); break; @@ -77,12 +77,12 @@ switch (Main_Screen) { case MAIN_MANUAL_INIT: _ManualHLT = _ManualMLT = false; - Buttons_Add( 40, 100, 80, 40, "Ja", 0); - Buttons_Add(200, 100, 80, 40, "Nee", 1); + Buttons_Add( 40, 100, 80, 40, (char *)"Ja", 0); + Buttons_Add(200, 100, 80, 40, (char *)"Nee", 1); Buttons_Show(); if ((equipment.SSR2 == SSR2_HLT_SHARE) || (equipment.SSR2 == SSR2_HLT_IND)) { - TopMessage("Spoelwater ketel?"); + TopMessage((char *)"Spoelwater ketel?"); SoundPlay(SOUND_Prompt); loop = true; while (loop) { @@ -101,7 +101,7 @@ } } - TopMessage("Maisch/Kook ketel?"); + TopMessage((char *)"Maisch/Kook ketel?"); SoundPlay(SOUND_Prompt); loop = true; while (loop) { @@ -202,11 +202,11 @@ if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { if (driver_state->hlt_mode == HLT_MODE_BANG) { driver_state->hlt_mode = HLT_MODE_OFF; - Buttons_Add(255, 200, 60, 40, "Aan" , 3); + Buttons_Add(255, 200, 60, 40, (char *)"Aan" , 3); ESP_LOGI(TAG, "HLT turned off"); } else { driver_state->hlt_mode = HLT_MODE_BANG; - Buttons_Add(255, 200, 60, 40, "Uit" , 3); + Buttons_Add(255, 200, 60, 40, (char *)"Uit" , 3); ESP_LOGI(TAG, "HLT turned on"); } xSemaphoreGive(xSemaphoreDriver); @@ -218,11 +218,11 @@ case 4: if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { if (driver_state->mlt_mode == MLT_MODE_PID) { driver_state->mlt_mode = MLT_MODE_OFF; - Buttons_Add(255, 76, 60, 40, "Aan" , 4); + Buttons_Add(255, 76, 60, 40, (char *)"Aan" , 4); ESP_LOGI(TAG, "MLT turned off"); } else { driver_state->mlt_mode = MLT_MODE_PID; - Buttons_Add(255, 76, 60, 40, "Uit" , 4); + Buttons_Add(255, 76, 60, 40, (char *)"Uit" , 4); ESP_LOGI(TAG, "MLT turned on"); } xSemaphoreGive(xSemaphoreDriver); @@ -245,11 +245,11 @@ case 7: if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { if (driver_state->hlt_mode == HLT_MODE_BANG) { driver_state->hlt_mode = HLT_MODE_OFF; - Buttons_Add(255, 200, 60, 40, "Aan" , 7); + Buttons_Add(255, 200, 60, 40, (char *)"Aan" , 7); ESP_LOGI(TAG, "HLT turned off"); } else { driver_state->hlt_mode = HLT_MODE_BANG; - Buttons_Add(255, 200, 60, 40, "Uit" , 7); + Buttons_Add(255, 200, 60, 40, (char *)"Uit" , 7); ESP_LOGI(TAG, "HLT turned on"); } xSemaphoreGive(xSemaphoreDriver);