diff -r 332e85569339 -r 715785443a95 main/task_user.c --- a/main/task_user.c Tue Oct 03 19:55:34 2023 +0200 +++ b/main/task_user.c Wed Oct 04 11:28:49 2023 +0200 @@ -23,10 +23,6 @@ QueueHandle_t event_queue; ///< Events queue QueueHandle_t gpio_evt_queue = NULL; ///< Rotary pushbutton queue static int PushDuration = 0; ///< Duration of the pushed button -wifiStation_t APs[10]; ///< List of APs we know -int edit_ssid = 0; ///< SSID being edited -int num_ssids = 0; ///< Number of SSIDs we know -wifiStation_t editAP; ///< Data of station to edit char sensors[DS18B20_MAX][17]; ///< Sensors to select uint32_t err_connect = 0; ///< Connect error count uint32_t err_alarm = 0; ///< Alarm watchdog error count @@ -45,7 +41,6 @@ extern int Main_Loop1; ///< Main measure loop extern int update_running; ///< If update is running extern int num_sensors; ///< Detected DS18B20 sensors -extern wifiStation_t wifiStation; extern char hostname[]; @@ -75,7 +70,7 @@ } if (UserTimer == 1) { - ESP_LOGI(TAG, "User inactivity timeout"); + ESP_LOGI(TAG, "UserTimer timeout"); xEventGroupClearBits(xEventGroupUser, TASK_USER_BUSY); u8g2_SetPowerSave(&u8g2, 1); } @@ -84,7 +79,7 @@ } if (LoopTimer == 1) { - ESP_LOGI(TAG, "Alarm Timer timeout"); + ESP_LOGD(TAG, "LoopTimer timeout"); Main_Loop1 = ML1_INIT; } @@ -530,85 +525,6 @@ /** - * @brief The WiFi setup menu. - * @param sub The submenu entry to hilite. - */ -/*void screen_wifi_setup(int sub) -{ - screen_top("WiFi AP setup"); - menu_line(sub == 0, 1, 25, "Lijst AP"); - menu_line(sub == 1, 1, 37, "Nieuw AP"); - menu_line(sub == 2, 1, 49, "Terug"); - u8g2_SendBuffer(&u8g2); -}*/ - - - -/** - * @brief Show the list if WiFi Access Points. - * @param sub The sub entry line. - * @param offset The offset in the list. - */ -/*void screen_list_aps(int sub, int offset) -{ - int i; - wifiStation_t ap; - uint8_t *dst = (uint8_t *)≈ - FILE *f; - size_t bytes; - - num_ssids = 0; - memset(dst, 0, sizeof(ap)); - f = fopen("/spiffs/stations.conf", "r"); - if (f) { - while (1) { - bytes = fread(dst, 1, sizeof(ap), f); - if (bytes < sizeof(ap)) { - fclose(f); - break; - } - memcpy(APs[num_ssids].SSID, ap.SSID, 32); - memcpy(APs[num_ssids].Password, ap.Password, 64); - num_ssids++; - } - } - - screen_top("WiFi AP lijst"); - if (num_ssids == 0) { - menu_line(0, 1, 25, "Geen AP's"); - } else { - for (i = 0; i < num_ssids; i++) { - menu_line(sub == i, 1, 25 + (i * 12), APs[i + offset].SSID); - if (i == 3) - break; - } - if ((i + offset) == num_ssids) - menu_line(sub == i, 1, 25 + (i * 12), "Terug"); - } - u8g2_SendBuffer(&u8g2); -}*/ - - - -/** - * @brief Edit WiFi AP menu. - * @param sub The menu entry to hilite. - */ -/*void screen_edit_ap(int sub) -{ - screen_top("WiFi wijzig AP"); - menu_line(sub == 0, 1, 25, "SSID %s", editAP.SSID); - menu_line(sub == 1, 1, 37, "PSK %s", editAP.Password); - menu_line(sub == 2, 1, 49, "Opslaan"); - if (edit_ssid >= 0) { - menu_line(sub == 3, 1, 61, "Verwijder"); - } - u8g2_SendBuffer(&u8g2); -}*/ - - - -/** * @brief The network status screen. */ void screen_network()