diff -r 0432d9147682 -r 15dc572a7fcb main/task_user.c --- a/main/task_user.c Thu Sep 28 11:29:23 2023 +0200 +++ b/main/task_user.c Tue Oct 03 17:24:06 2023 +0200 @@ -45,8 +45,9 @@ extern int Main_Loop1; ///< Main measure loop extern int update_running; ///< If update is running extern int num_sensors; ///< Detected DS18B20 sensors -extern strConfig_t config; extern wifiStation_t wifiStation; +extern char hostname[]; + const int TASK_USER_COLD = BIT0; ///< System cold start const int TASK_USER_WAKEUP = BIT1; ///< System wakeup from deepsleep @@ -533,14 +534,14 @@ * @brief The WiFi setup menu. * @param sub The submenu entry to hilite. */ -void screen_wifi_setup(int sub) +/*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); -} +}*/ @@ -549,7 +550,7 @@ * @param sub The sub entry line. * @param offset The offset in the list. */ -void screen_list_aps(int sub, int offset) +/*void screen_list_aps(int sub, int offset) { int i; wifiStation_t ap; @@ -586,7 +587,7 @@ menu_line(sub == i, 1, 25 + (i * 12), "Terug"); } u8g2_SendBuffer(&u8g2); -} +}*/ @@ -594,7 +595,7 @@ * @brief Edit WiFi AP menu. * @param sub The menu entry to hilite. */ -void screen_edit_ap(int sub) +/*void screen_edit_ap(int sub) { screen_top("WiFi wijzig AP"); menu_line(sub == 0, 1, 25, "SSID %s", editAP.SSID); @@ -604,7 +605,7 @@ menu_line(sub == 3, 1, 61, "Verwijder"); } u8g2_SendBuffer(&u8g2); -} +}*/ @@ -628,22 +629,7 @@ menu_line(0, 1, 25, "IP %s", ip); menu_line(0, 1, 37, "Mask %s", nm); menu_line(0, 1, 49, "GW %s", gw); - menu_line(0, 1, 61, "Naam %s", config.hostname); - u8g2_SendBuffer(&u8g2); -} - - - -/** - * @brief The network setup menu. - * @param sub The menu entry to hilite. - */ -void screen_network_setup(int sub) -{ - screen_top("Netwerk setup"); - menu_line(sub == 0, 1, 25, "Naam %s", config.hostname); - menu_line(sub == 1, 1, 37, "NTP %s", config.ntp_server); - menu_line(sub == 2, 1, 49, "Terug"); + menu_line(0, 1, 61, "Naam %s", hostname); u8g2_SendBuffer(&u8g2); } @@ -655,25 +641,9 @@ void screen_mqtt() { screen_top("MQTT Status"); - menu_line(0, 1, 25, "serv %s", config.mqtt_server); - menu_line(0, 1, 37, "port %d", config.mqtt_port); - menu_line(0, 1, 49, "user %s", config.mqtt_user); - u8g2_SendBuffer(&u8g2); -} - - - -/** - * @brief MQTT setup menu. - * @param sub The submenu entry to hilite. - */ -void screen_mqtt_setup(int sub) -{ - screen_top("MQTT Setup"); - menu_line(sub == 0, 1, 25, "serv %s", config.mqtt_server); - menu_line(sub == 1, 1, 37, "port %d", config.mqtt_port); - menu_line(sub == 2, 1, 49, "user %s", config.mqtt_user); - menu_line(sub == 3, 1, 61, "Terug"); + menu_line(0, 1, 25, "serv %s", CONFIG_MQTT_SERVER); + menu_line(0, 1, 37, "port %d", CONFIG_MQTT_PORT); + menu_line(0, 1, 49, "user %s", CONFIG_MQTT_USER); u8g2_SendBuffer(&u8g2); } @@ -889,35 +859,14 @@ screen_wifi(); break; - case ML2_SETUP_WIFI: - screen_wifi_setup(SubMenu); - break; - - case ML2_LIST_APS: - SubMenu = SubOffset = 0; - screen_list_aps(SubMenu, SubOffset); - break; - - case ML2_EDIT_AP: - screen_edit_ap(0); - break; - case ML2_NETWORK: screen_network(); break; - case ML2_SETUP_NETWORK: - screen_network_setup(SubMenu); - break; - case ML2_MQTT: screen_mqtt(); break; - case ML2_SETUP_MQTT: - screen_mqtt_setup(SubMenu); - break; - case ML2_UPDATE: screen_update(); break; @@ -991,26 +940,6 @@ case ML2_SEL_SENSOR3: if (rotate_to_sub(event.state.position, num_sensors, &SubMenu, &SubOffset)) screen_list_sensors(Main_Loop2 - ML2_SEL_SENSOR1, SubMenu, SubOffset); break; - case ML2_SETUP_WIFI: if (rotate_to_sub(event.state.position, 2, &SubMenu, &SubOffset)) - screen_wifi_setup(SubMenu); - break; - case ML2_LIST_APS: if (rotate_to_sub(event.state.position, num_ssids, &SubMenu, &SubOffset)) - screen_list_aps(SubMenu, SubOffset); - break; - case ML2_EDIT_AP: if (edit_ssid < 0) { - if (rotate_to_sub(event.state.position, 2, &SubMenu, &SubOffset)) - screen_edit_ap(SubMenu); - } else { - if (rotate_to_sub(event.state.position, 3, &SubMenu, &SubOffset)) - screen_edit_ap(SubMenu); - } - break; - case ML2_SETUP_MQTT: if (rotate_to_sub(event.state.position, 3, &SubMenu, &SubOffset)) - screen_mqtt_setup(SubMenu); - break; - case ML2_SETUP_NETWORK: if (rotate_to_sub(event.state.position, 2, &SubMenu, &SubOffset)) - screen_network_setup(SubMenu); - break; default: ESP_LOGI(TAG, "Event: position %ld, direction %s", event.state.position, event.state.direction ? (event.state.direction == ROTARY_ENCODER_DIRECTION_CLOCKWISE ? "CW":"CCW"):"NOT_SET"); @@ -1036,7 +965,6 @@ void menu_loop(void) { int idx = 0; - char txt[32]; switch (Main_Loop2) { case ML2_UNIT1: @@ -1121,105 +1049,12 @@ break; case ML2_WIFI: - New_Loop2 = ML2_SETUP_WIFI; - break; - - case ML2_SETUP_WIFI: - if (SubMenu == 0) { - New_Loop2 = ML2_LIST_APS; - } else if (SubMenu == 1) { - edit_ssid = -1; - editAP.SSID[0] = '\0'; - editAP.Password[0] = '\0'; - SubMenu = SubOffset = 0; - New_Loop2 = ML2_EDIT_AP; - } else if (SubMenu == 2) { - New_Loop2 = ML2_WIFI; - } - break; - - case ML2_LIST_APS: - if ((SubMenu + SubOffset) < num_ssids) { - edit_ssid = SubMenu + SubOffset; - memcpy(editAP.SSID, APs[edit_ssid].SSID, 32); - memcpy(editAP.Password, APs[edit_ssid].Password, 64); - SubMenu = SubOffset = 0; - New_Loop2 = ML2_EDIT_AP; - } else { - New_Loop2 = ML2_SETUP_WIFI; - SubMenu = SubOffset = 0; - } - break; - - case ML2_EDIT_AP: - ESP_LOGI(TAG, " ML2_EDIT_AP: SubMenu %d edit_ssid %d", SubMenu, edit_ssid); - if (SubMenu == 0) { - rotary_editer("SSID", editAP.SSID, "", 16, EDIT_TYPE_TEXT); - screen_edit_ap(SubMenu); - } else if (SubMenu == 1) { - rotary_editer("PSK", editAP.Password, "", 16, EDIT_TYPE_TEXT); - screen_edit_ap(SubMenu); - } else if (SubMenu == 2 || SubMenu == 3) { - update_running = 1; // Block measurements - if (edit_ssid < 0) - New_Loop2 = ML2_SETUP_WIFI; - else - New_Loop2 = ML2_LIST_APS; - - if (edit_ssid >= 0) { - ESP_LOGI(TAG, "Remove %s", APs[edit_ssid].SSID); - remove_station((uint8_t *)APs[edit_ssid].SSID); - } - if (SubMenu == 2) { - ESP_LOGI(TAG, "Add %s %s", editAP.SSID, editAP.Password); - add_station((uint8_t *)editAP.SSID, (uint8_t *)editAP.Password); - } - } - update_running = 0; break; case ML2_NETWORK: - New_Loop2 = ML2_SETUP_NETWORK; break; - case ML2_SETUP_NETWORK: - if (SubMenu == 0) { - rotary_editer("Hostnaam", config.hostname, "", 16, EDIT_TYPE_TEXT); - screen_network_setup(SubMenu); - } else if (SubMenu == 1) { - rotary_editer("NTP server", config.ntp_server, "", 16, EDIT_TYPE_TEXT); - screen_network_setup(SubMenu); - } else if (SubMenu == 2) { - ESP_LOGI(TAG, "Hostname `%s`", config.hostname); - ESP_LOGI(TAG, "NTP server `%s`", config.ntp_server); - write_config(); - New_Loop2 = ML2_NETWORK; - } - break; - case ML2_MQTT: - New_Loop2 = ML2_SETUP_MQTT; - break; - - case ML2_SETUP_MQTT: - if (SubMenu == 0) { - rotary_editer("MQTT server", config.mqtt_server, "", 16, EDIT_TYPE_TEXT); - screen_mqtt_setup(SubMenu); - } else if (SubMenu == 1) { - sprintf(txt, "%d", config.mqtt_port); - rotary_editer("MQTT server poort", txt, "", 6, EDIT_TYPE_INT); - config.mqtt_port = atoi(txt); - screen_mqtt_setup(SubMenu); - } else if (SubMenu == 2) { - rotary_editer("MQTT user", config.mqtt_user, "", 16, EDIT_TYPE_TEXT); - rotary_editer("MQTT password", config.mqtt_pwd, "", 16, EDIT_TYPE_TEXT); - screen_mqtt_setup(SubMenu); - } else if (SubMenu == 3) { - ESP_LOGI(TAG, "mqtt_server %s:%d", config.mqtt_server, config.mqtt_port); - ESP_LOGI(TAG, "mqtt_user/pass `%s/%s`", config.mqtt_user, config.mqtt_pwd); - write_config(); - New_Loop2 = ML2_MQTT; - } break; case ML2_UPDATE: