Mercurial > brewboard / file diff

--- a/main/task_wifi.c	Sun May 19 21:05:07 2019 +0200
+++ b/main/task_wifi.c	Mon Jul 01 23:15:49 2019 +0200
@@ -257,7 +257,7 @@
 		sntp_stop();
 		if (strlen(config.ntp_server))
 		    sntp_setservername(0, config.ntp_server);
-		sntp_setservername(1, "pool.ntp.org"); // Will get you servers nearby
+		sntp_setservername(1, (char *)"pool.ntp.org"); // Will get you servers nearby
                 sntp_set_sync_mode(SNTP_SYNC_MODE_IMMED);
                 sntp_set_time_sync_notification_cb(time_sync_notification_cb);
                 sntp_init();
@@ -610,27 +610,27 @@
 
     switch (Main_Screen) {
 	case MAIN_TOOLS_SETUP_WIFI:
-			TopMessage("WiFi");
+			TopMessage((char *)"WiFi");
 			TFT_setFont(DEJAVU24_FONT, NULL);
 			_fg = TFT_WHITE;
-			TFT_print("Momentje ..", CENTER, CENTER);
+			TFT_print((char *)"Momentje ..", CENTER, CENTER);
 			_wifi_ScanAPs = true;
 			_wifi_ScanDone = false;
-			Buttons_Add(260, 200, 60, 40, "Ok", 0);
+			Buttons_Add(260, 200, 60, 40, (char *)"Ok", 0);
 			Buttons[0].dark = true;
 			Buttons_Show();
 			// Now add the buttons we draw manually.
-			Buttons_Add(  0, 30, 250, 30, "", 1);
-			Buttons_Add(  0, 60, 250, 30, "", 2);
-			Buttons_Add(  0, 90, 250, 30, "", 3);
-			Buttons_Add(  0,120, 250, 30, "", 4);
-			Buttons_Add(  0,150, 250, 30, "", 5);
-			Buttons_Add(  0,180, 250, 30, "", 6);
-			Buttons_Add(  0,210, 250, 30, "", 7);
+			Buttons_Add(  0, 30, 250, 30, (char *)"", 1);
+			Buttons_Add(  0, 60, 250, 30, (char *)"", 2);
+			Buttons_Add(  0, 90, 250, 30, (char *)"", 3);
+			Buttons_Add(  0,120, 250, 30, (char *)"", 4);
+			Buttons_Add(  0,150, 250, 30, (char *)"", 5);
+			Buttons_Add(  0,180, 250, 30, (char *)"", 6);
+			Buttons_Add(  0,210, 250, 30, (char *)"", 7);
 			break;
 
 	case MAIN_TOOLS_SETUP_WIFI_CUR:
-			TopMessage("WiFi verbinding");
+			TopMessage((char *)"WiFi verbinding");
 			// Get extra information.
 			wifi_ap_record_t ap_info;
 			esp_wifi_sta_get_ap_info(&ap_info);
@@ -648,13 +648,13 @@
 			    strcpy(gw, ip4addr_ntoa(&ip_info.gw));
 			    TFT_setFont(DEFAULT_FONT, NULL);
 			    _fg = TFT_WHITE;
-			    TFT_print("SSID", 155 - TFT_getStringWidth("SSID"), 40);
-			    TFT_print("Kanaal", 155 - TFT_getStringWidth("Kanaal"), 60);
-			    TFT_print("Rssi", 155 - TFT_getStringWidth("Rssi"), 80);
-			    TFT_print("Mode", 155 - TFT_getStringWidth("Mode"), 100);
-			    TFT_print("IP adres", 155 - TFT_getStringWidth("IP adres"), 120);
-			    TFT_print("Netmask", 155 - TFT_getStringWidth("Netmask"), 140);
-			    TFT_print("Gateway", 155 - TFT_getStringWidth("Gateway"), 160);
+			    TFT_print((char *)"SSID", 155 - TFT_getStringWidth((char *)"SSID"), 40);
+			    TFT_print((char *)"Kanaal", 155 - TFT_getStringWidth((char *)"Kanaal"), 60);
+			    TFT_print((char *)"Rssi", 155 - TFT_getStringWidth((char *)"Rssi"), 80);
+			    TFT_print((char *)"Mode", 155 - TFT_getStringWidth((char *)"Mode"), 100);
+			    TFT_print((char *)"IP adres", 155 - TFT_getStringWidth((char *)"IP adres"), 120);
+			    TFT_print((char *)"Netmask", 155 - TFT_getStringWidth((char *)"Netmask"), 140);
+			    TFT_print((char *)"Gateway", 155 - TFT_getStringWidth((char *)"Gateway"), 160);
 			    _fg = TFT_YELLOW;
 			    TFT_print((char*)wconfig->sta.ssid, 165, 40);
 			    sprintf(pmpt, "%d", ap_info.primary);
@@ -667,27 +667,27 @@
 			    TFT_print((char*)netmask, 165, 140);
 			    TFT_print((char*)gw, 165, 160);
 			}
-			Buttons_Add(130, 200, 60, 40, "Ok", 0);
+			Buttons_Add(130, 200, 60, 40, (char *)"Ok", 0);
 			Buttons[0].dark = true;
 			Buttons_Show();
 			break;
 
 	case MAIN_TOOLS_SETUP_WIFI_CON:
-			TopMessage("WiFi verbinden");
+			TopMessage((char *)"WiFi verbinden");
 			TFT_setFont(DEJAVU18_FONT, NULL);
 			_fg = TFT_WHITE;
-			TFT_print("SSID", 155 - TFT_getStringWidth("SSID"), 70);
+			TFT_print((char *)"SSID", 155 - TFT_getStringWidth((char *)"SSID"), 70);
 			_fg = TFT_YELLOW;
 			TFT_print((char*)_wifi_ssid, 165, 70);
-			Buttons_Add(  0, 200, 100, 40, "Annuleer", 0);
-			Buttons_Add(110, 200, 100, 40, "Vergeet",  1);
-			Buttons_Add(220, 200, 100, 40, "Verbind",  2);
+			Buttons_Add(  0, 200, 100, 40, (char *)"Annuleer", 0);
+			Buttons_Add(110, 200, 100, 40, (char *)"Vergeet",  1);
+			Buttons_Add(220, 200, 100, 40, (char *)"Verbind",  2);
 			Buttons_Show();
 			Buttons[0].dark = true;
 			break;
 
 	case MAIN_TOOLS_SETUP_WIFI_NEW:
-			TopMessage("WiFi nieuw");
+			TopMessage((char *)"WiFi nieuw");
 			snprintf(pmpt, 32, "Password for %s", _wifi_ssid);
 			pwd[0] = '\0';
 			EditTextMin(pmpt, pwd, 64, 8);
@@ -698,7 +698,7 @@
 			TFT_fillScreen(_bg);
 			TFT_setFont(DEJAVU24_FONT, NULL);
 			_fg = TFT_WHITE;
-			TFT_print("Momentje ..", CENTER, CENTER);
+			TFT_print((char *)"Momentje ..", CENTER, CENTER);
 			xEventGroupSetBits(xEventGroupWifi, TASK_WIFI_REQUEST_STA_DISCONNECT);
 			vTaskDelay(100 / portTICK_PERIOD_MS);
 			xEventGroupWaitBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED, pdFALSE, pdTRUE, portMAX_DELAY );
@@ -851,7 +851,7 @@
 					TFT_fillScreen(_bg);
 					TFT_setFont(DEJAVU24_FONT, NULL);
 					_fg = TFT_WHITE;
-					TFT_print("Momentje ..", CENTER, CENTER);
+					TFT_print((char *)"Momentje ..", CENTER, CENTER);
 					/*
 					 * Disconnect old connections and wait until it's gone.
 					 */