diff -r cf91a3a20d0d -r 7b134c27fadb main/task_tft.c --- a/main/task_tft.c Sun May 19 21:05:07 2019 +0200 +++ b/main/task_tft.c Mon Jul 01 23:15:49 2019 +0200 @@ -223,7 +223,7 @@ TFT_print(s_timer, X, Y); _oldTime = Time; snprintf(msg, 31, "{\"timer\":\"%s\"}", s_timer); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } } @@ -241,7 +241,7 @@ TFT_print(s_top_msg, CENTER, 2); font_transparent = 0; snprintf(msg, 63, "{\"top_msg\":\"%s\"}", s_top_msg); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } @@ -264,7 +264,7 @@ TFT_drawRect(x, y, 178, 90, _fg); TFT_drawFastHLine(x, y + 21, 178, _fg); TFT_setFont(DEJAVU18_FONT, NULL); - TFT_print("MLT", x + 67, y + 3); + TFT_print((char *)"MLT", x + 67, y + 3); } if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { @@ -291,7 +291,7 @@ } lon = con; snprintf(msg, 31, "{\"mlt_led\":\"%s\"}", con ? "1":"0"); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } cpump = (Pump_pin) ? true : false; @@ -303,7 +303,7 @@ } lpump = cpump; snprintf(msg, 31, "{\"pump_led\":\"%s\"}", cpump ? "1":"0"); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } if (equipment.SSR2 == SSR2_ON_IDLE) { @@ -316,7 +316,7 @@ } lpwr = cpwr; snprintf(msg, 31, "{\"hlt_led\":\"%s\"}", cpwr ? "1":"0"); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } } @@ -325,23 +325,23 @@ TFT_print(ctemp, x + 5, y + 23); strncpy(ltemp, ctemp, 16); snprintf(msg, 31, "{\"mlt_pv\":\"%s\"}", ctemp); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } TFT_setFont(DEJAVU18_FONT, NULL); if (strcmp(csp, lsp) || (! update)) { - TFT_clearStringRect(x + 5, y + 70, "123.45 sp"); + TFT_clearStringRect(x + 5, y + 70, (char *)"123.45 sp"); TFT_print(csp, x + 5, y + 70); strncpy(lsp, csp, 16); snprintf(msg, 31, "{\"mlt_sp\":\"%s\"}", csp); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } if (strcmp(cpower, lpower) || (! update)) { - TFT_clearStringRect(x + 120, y + 70, "100%"); + TFT_clearStringRect(x + 120, y + 70, (char *)"100%"); TFT_print(cpower, x + 120, y + 70); strncpy(lpower, cpower, 16); snprintf(msg, 31, "{\"mlt_power\":\"%s\"}", cpower); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } } @@ -365,7 +365,7 @@ TFT_drawRect(x, y, 178, H, _fg); TFT_drawFastHLine(x, y + 21, 178, _fg); TFT_setFont(DEJAVU18_FONT, NULL); - TFT_print("HLT", x + 67, y + 3); + TFT_print((char *)"HLT", x + 67, y + 3); } if (xSemaphoreTake(xSemaphoreDriver, 10) == pdTRUE) { @@ -392,7 +392,7 @@ } lon = con; snprintf(msg, 31, "{\"hlt_led\":\"%s\"}", con ? "1":"0"); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } if (strcmp(ltemp, ctemp) || (! update)) { @@ -405,24 +405,24 @@ } strncpy(ltemp, ctemp, 16); snprintf(msg, 31, "{\"hlt_pv\":\"%s\"}", ctemp); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } H = (small) ? 50 : 70; TFT_setFont(DEJAVU18_FONT, NULL); if (strcmp(csp, lsp) || (! update)) { - TFT_clearStringRect(x + 5, y + H, "123.45 sp"); + TFT_clearStringRect(x + 5, y + H, (char *)"123.45 sp"); TFT_print(csp, x + 5, y + H); strncpy(lsp, csp, 16); snprintf(msg, 31, "{\"hlt_sp\":\"%s\"}", csp); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } if (strcmp(cpower, lpower) || (! update)) { - TFT_clearStringRect(x + 120, y + H, "100%"); + TFT_clearStringRect(x + 120, y + H, (char *)"100%"); TFT_print(cpower, x + 120, y + H); strncpy(lpower, cpower, 16); snprintf(msg, 31, "{\"hlt_power\":\"%s\"}", cpower); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } } @@ -528,7 +528,7 @@ */ Sub_Screen = 0; snprintf(msg, 63, "{\"main\":\"%d\",\"sub\":\"%d\",\"timer\":\"\"}", Main_Screen, Sub_Screen); - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); ESP_LOGI(TAG, "Change screen %d to %d", Old_Screen, Main_Screen); _bg = TFT_BLACK; @@ -539,15 +539,15 @@ switch (Main_Screen) { case MAIN_MODE_FREE: - TopMessage("Hoofdmenu"); + TopMessage((char *)"Hoofdmenu"); MLT_info(71, 26, false); if ((equipment.SSR2 == SSR2_HLT_SHARE) || (equipment.SSR2 == SSR2_HLT_IND)) { HLT_info(71,150, false, false); } - Buttons_Add( 5, 26, 60, 40, "Hand", 0); - Buttons_Add(255, 26, 60, 40, "Auto", 1); - Buttons_Add( 5, 200, 60, 40, "Info", 2); - Buttons_Add(255, 200, 60, 40, "Tools", 3); + Buttons_Add( 5, 26, 60, 40, (char *)"Hand", 0); + Buttons_Add(255, 26, 60, 40, (char *)"Auto", 1); + Buttons_Add( 5, 200, 60, 40, (char *)"Info", 2); + Buttons_Add(255, 200, 60, 40, (char *)"Tools", 3); Buttons_Show(); break; @@ -560,26 +560,26 @@ TopMessage(temp_buf); _fg = TFT_YELLOW; TFT_setFont(UBUNTU16_FONT, NULL); - TFT_print("Written by Michiel Broek (C) 2018\r\n\n", 0, 50); + TFT_print((char *)"Written by Michiel Broek (C) 2018\r\n\n", 0, 50); // ------------------------------------- _fg = TFT_ORANGE; - TFT_print("Parts are written by Chris Morgan,\r\n", 0, LASTY); - TFT_print("Brett Beauregard, Blake Felt, LoBo,\r\n", 0, LASTY); - TFT_print("and David Antliff.\r\n", 0, LASTY); - ShowInteger(1,140, "Free memory", " bytes", esp_get_free_heap_size()); - ShowText(1,158, "IDF version", (char *)esp_get_idf_version()); - Buttons_Add(130, 200, 60, 40, "Ok", 0); + TFT_print((char *)"Parts are written by Chris Morgan,\r\n", 0, LASTY); + TFT_print((char *)"Brett Beauregard, Blake Felt, LoBo,\r\n", 0, LASTY); + TFT_print((char *)"and David Antliff.\r\n", 0, LASTY); + ShowInteger(1,140, (char *)"Free memory", (char *)" bytes", esp_get_free_heap_size()); + ShowText(1,158, (char *)"IDF version", (char *)esp_get_idf_version()); + Buttons_Add(130, 200, 60, 40, (char *)"Ok", 0); Buttons[0].dark = true; Buttons_Show(); break; case MAIN_TOOLS: - TopMessage("Tools menu"); - Buttons_Add( 20, 40,120, 40, "Setup", 0); - Buttons_Add( 20,120,120, 40, "Bestanden", 1); - Buttons_Add(180, 40,120, 40, "Recepten", 2); - Buttons_Add(180,120,120, 40, "Updates", 3); - Buttons_Add(130, 200, 60, 40, "Ok", 4); + TopMessage((char *)"Tools menu"); + Buttons_Add( 20, 40,120, 40, (char *)"Setup", 0); + Buttons_Add( 20,120,120, 40, (char *)"Bestanden", 1); + Buttons_Add(180, 40,120, 40, (char *)"Recepten", 2); + Buttons_Add(180,120,120, 40, (char *)"Updates", 3); + Buttons_Add(130, 200, 60, 40, (char *)"Ok", 4); Buttons[4].dark = true; Buttons_Show(); break; @@ -674,12 +674,12 @@ if (System_TimeOk && (now != last)) { last = now; strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo); - TFT_setFont(DEJAVU18_FONT, NULL); _bg = TFT_BLACK; _fg = TFT_ORANGE; + TFT_setFont(DEJAVU18_FONT, NULL); TFT_print(strftime_buf, CENTER, 125); snprintf(msg, 63, "{\"timer\":\"%s\"}", strftime_buf); // Fix string termination and only send once/second. - ws_server_send_text_clients("/ws", msg, strlen(msg)); + ws_server_send_text_clients((char *)"/ws", msg, strlen(msg)); } break;