From fccf92f6566a757d18e3d1dca9fb1e4aa1526065 Mon Sep 17 00:00:00 2001 From: Snorky Date: Thu, 9 Jan 2025 20:13:14 +0100 Subject: [PATCH] fullclean --- CMakeLists.txt | 2 +- main/idf_component.yml | 2 -- main/wifi_connect.c | 13 ++++--------- main/wifi_connect.h | 6 +++--- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a54292..862d9cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,4 +5,4 @@ cmake_minimum_required(VERSION 3.16) include($ENV{IDF_PATH}/tools/cmake/project.cmake) # "Trim" the build. Include the minimal set of components, main, and anything it depends on. idf_build_set_property(MINIMAL_BUILD ON) -project(wifi_station) +project(esp_project) diff --git a/main/idf_component.yml b/main/idf_component.yml index 2de408d..467e9fc 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -3,5 +3,3 @@ dependencies: idf: version: '>=4.1.0' - espressif/esp_lcd_touch_gt911: ^1.1.0 - lvgl/lvgl: ^8.3.11 diff --git a/main/wifi_connect.c b/main/wifi_connect.c index dfeafb7..83c77b4 100644 --- a/main/wifi_connect.c +++ b/main/wifi_connect.c @@ -72,13 +72,8 @@ void wifi_init_sta(void) wifi_config_t wifi_config = { .sta = { - .ssid = CONFIG_ESP_WIFI_SSID, - .password = CONFIG_ESP_WIFI_PASS, - /* Authmode threshold resets to WPA2 as default if password matches WPA2 standards (password len => 8). - * If you want to connect the device to deprecated WEP/WPA networks, Please set the threshold value - * to WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK and set the password with length and format matching to - * WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK standards. - */ + .ssid = ESP_WIFI_SSID, + .password = ESP_WIFI_PASS, .threshold.authmode = ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD, .sae_pwe_h2e = ESP_WIFI_SAE_MODE, .sae_h2e_identifier = EXAMPLE_H2E_IDENTIFIER, @@ -102,10 +97,10 @@ void wifi_init_sta(void) * happened. */ if (bits & WIFI_CONNECTED_BIT) { ESP_LOGI(TAG, "connected to ap SSID:%s password:%s", - EXAMPLE_ESP_WIFI_SSID, EXAMPLE_ESP_WIFI_PASS); + ESP_WIFI_SSID, ESP_WIFI_PASS); } else if (bits & WIFI_FAIL_BIT) { ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s", - EXAMPLE_ESP_WIFI_SSID, EXAMPLE_ESP_WIFI_PASS); + ESP_WIFI_SSID, ESP_WIFI_PASS); } else { ESP_LOGE(TAG, "UNEXPECTED EVENT"); } diff --git a/main/wifi_connect.h b/main/wifi_connect.h index ddb1e39..d203d2a 100644 --- a/main/wifi_connect.h +++ b/main/wifi_connect.h @@ -1,9 +1,9 @@ #include "esp_event.h" -#define CONFIG_ESP_WIFI_SSID "YourSSID" -#define CONFIG_ESP_WIFI_PASS "YourPASSWORD" -#define CONFIG_ESP_MAXIMUM_RETRY 3 +#define ESP_WIFI_SSID "" +#define ESP_WIFI_PASS "" +#define ESP_MAXIMUM_RETRY 3 #if CONFIG_ESP_WPA3_SAE_PWE_HUNT_AND_PECK #define ESP_WIFI_SAE_MODE WPA3_SAE_PWE_HUNT_AND_PECK