From 1b40f1f37742823be5167582846a46b273b7608b Mon Sep 17 00:00:00 2001 From: Snorky Date: Thu, 9 Jan 2025 19:45:45 +0100 Subject: [PATCH 1/4] Modification du README --- README.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7ffd038..930340b 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,17 @@ Projet sur une board esp32-8048S043. Le code suivant est fonctionnel. Il s'appui * [github esp-idf](https://github.com/espressif/esp-idf) * [Lien du code](https://github.com/espressif/esp-idf/tree/master/examples/wifi/getting_started/station) +Il existe aussi une branch [dev](https://gogs.sincrone.fr/Snorky/esp-project/src/branch/dev). + +## TODO + +| Status | Description | +|--- |:-: | +|In Progress | Intégration le lvgl | +|In Progress | Intégration Marauder | +|In Progress | Lecture flux vidéo | + + ## Configurer vos accés wifi. @@ -18,8 +29,6 @@ Modifier les `#define` suivant: ### Build et Flash -Build the project and flash it to the board, then run the monitor tool to view the serial output: - Pour build et flasher le board, connectez la via usb et lancer la commande suivante: `idf.py -p PORT flash monitor` @@ -125,8 +134,8 @@ I (1100) wifi:pm start, type: 1 I (1100) wifi:dp: 1, bi: 102400, li: 3, scale listen interval from 307200 us to 307200 us I (1100) wifi:set rx beacon pti, rx_bcn_pti: 0, bcn_timeout: 25000, mt_pti: 0, mt_time: 10000 I (1130) wifi:AP's beacon interval = 102400 us, DTIM period = 1 -I (4400) esp_netif_handlers: sta ip: 192.168.1.101, mask: 255.255.255.0, gw: 192.168.1.254 -I (4400) wifi_connect: got ip:192.168.1.101 +I (4400) esp_netif_handlers: sta ip: 192.168.X.X, mask: 255.255.255.0, gw: 192.168.X.X +I (4400) wifi_connect: got ip:192.168.X.X I (4400) wifi_connect: connected to ap SSID:YourSSID password:YourPassword I (4410) Main: End of main I (4410) main_task: Returned from app_main() From 03d86c6f2b675fadd239f0188e018013c830d754 Mon Sep 17 00:00:00 2001 From: Snorky Date: Thu, 9 Jan 2025 19:47:22 +0100 Subject: [PATCH 2/4] Modification du README --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..434d4f8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.vscode +build/ +sdkconfig +sdkconfig.old +dependencies.lock +managed_components/ From dd593b72a6e8fa607819d4db644241feeeea3812 Mon Sep 17 00:00:00 2001 From: Snorky Date: Thu, 9 Jan 2025 19:59:48 +0100 Subject: [PATCH 3/4] =?UTF-8?q?Ajout=20des=20d=C3=A9pendances=20lvgl=20et?= =?UTF-8?q?=20esp=5Flcd=5Ftouch=5Fgt911?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/idf_component.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/idf_component.yml b/main/idf_component.yml index 467e9fc..2de408d 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -3,3 +3,5 @@ dependencies: idf: version: '>=4.1.0' + espressif/esp_lcd_touch_gt911: ^1.1.0 + lvgl/lvgl: ^8.3.11 From fccf92f6566a757d18e3d1dca9fb1e4aa1526065 Mon Sep 17 00:00:00 2001 From: Snorky Date: Thu, 9 Jan 2025 20:13:14 +0100 Subject: [PATCH 4/4] 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