From 4c72c6901e007414aebb4cb6534c1a49d63558b0 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 14 Jul 2023 13:46:27 +0200 Subject: esp32 build, cli --- esp32/esp_project/components/olm/CMakeLists.txt | 2 +- esp32/esp_project/main/CMakeLists.txt | 2 +- esp32/esp_project/main/main.c | 5 ++ esp32/esp_project/main/wifi.c | 104 ++++++++++++++++++++++++ esp32/esp_project/sdkconfig | 6 +- 5 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 esp32/esp_project/main/wifi.c (limited to 'esp32') diff --git a/esp32/esp_project/components/olm/CMakeLists.txt b/esp32/esp_project/components/olm/CMakeLists.txt index 8ce9b41..352ab9c 100644 --- a/esp32/esp_project/components/olm/CMakeLists.txt +++ b/esp32/esp_project/components/olm/CMakeLists.txt @@ -1,6 +1,6 @@ idf_component_register(SRCS "../../../../ext/olm/src/account.cpp" - "../../../../ext/olm/lib/crypto-algorithms/aes.c" + #"../../../../ext/olm/lib/crypto-algorithms/aes.c" "../../../../ext/olm/src/base64.cpp" "../../../../ext/olm/src/cipher.cpp" "../../../../ext/olm/src/crypto.cpp" diff --git a/esp32/esp_project/main/CMakeLists.txt b/esp32/esp_project/main/CMakeLists.txt index 8d26c93..d0c6abb 100644 --- a/esp32/esp_project/main/CMakeLists.txt +++ b/esp32/esp_project/main/CMakeLists.txt @@ -1,2 +1,2 @@ -idf_component_register(SRCS "main.c" +idf_component_register(SRCS "main.c" "wifi.c" INCLUDE_DIRS "") \ No newline at end of file diff --git a/esp32/esp_project/main/main.c b/esp32/esp_project/main/main.c index d53fdf7..f4d3c8c 100644 --- a/esp32/esp_project/main/main.c +++ b/esp32/esp_project/main/main.c @@ -14,6 +14,8 @@ #include #include +#include + #define SERVER "https://matrix.org" #define ACCESS_TOKEN "syt_cHNjaG8_yBvTjVTquGCikvsAenOJ_49mBMO" #define DEVICE_ID "MAZNCCZLBR" @@ -26,6 +28,9 @@ app_main(void) MatrixClientInit(&client, SERVER); + void wifi_init(const char *ssid, const char *pass); + wifi_init("Hundehuette", "Affensicherespw55"); + MatrixHttpInit(&client); MatrixClientSetAccessToken(&client, diff --git a/esp32/esp_project/main/wifi.c b/esp32/esp_project/main/wifi.c new file mode 100644 index 0000000..07d1e41 --- /dev/null +++ b/esp32/esp_project/main/wifi.c @@ -0,0 +1,104 @@ +// Code taken from the ESP32 IDF WiFi station Example + +#include +#include "esp_event.h" +#include "esp_log.h" +#include "esp_system.h" +#include "esp_wifi.h" +#include "freertos/FreeRTOS.h" +#include "freertos/event_groups.h" +#include "freertos/task.h" +#include "nvs_flash.h" + +#include "lwip/err.h" +#include "lwip/sys.h" + +#include "mongoose.h" + +static EventGroupHandle_t s_wifi_event_group; + +/* The event group allows multiple bits for each event, but we only care about + * two events: + * - we are connected to the AP with an IP + * - we failed to connect after the maximum amount of retries */ +#define WIFI_CONNECTED_BIT BIT0 +#define WIFI_FAIL_BIT BIT1 + +static int s_retry_num = 0; + +static void event_handler(void *arg, esp_event_base_t event_base, + int32_t event_id, void *event_data) { + if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) { + esp_wifi_connect(); + } else if (event_base == WIFI_EVENT && + event_id == WIFI_EVENT_STA_DISCONNECTED) { + if (s_retry_num < 3) { + esp_wifi_connect(); + s_retry_num++; + MG_INFO(("retry to connect to the AP")); + } else { + xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT); + } + MG_ERROR(("connect to the AP fail")); + } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { + ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data; + MG_INFO(("IP ADDRESS:" IPSTR, IP2STR(&event->ip_info.ip))); + s_retry_num = 0; + xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT); + } +} + +void wifi_init(const char *ssid, const char *pass) { + esp_err_t ret = nvs_flash_init(); + if (ret == ESP_ERR_NVS_NO_FREE_PAGES || + ret == ESP_ERR_NVS_NEW_VERSION_FOUND) { + ESP_ERROR_CHECK(nvs_flash_erase()); + ret = nvs_flash_init(); + } + ESP_ERROR_CHECK(ret); + + s_wifi_event_group = xEventGroupCreate(); + + ESP_ERROR_CHECK(esp_netif_init()); + + ESP_ERROR_CHECK(esp_event_loop_create_default()); + esp_netif_create_default_wifi_sta(); + + wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); + ESP_ERROR_CHECK(esp_wifi_init(&cfg)); + + esp_event_handler_instance_t instance_any_id; + esp_event_handler_instance_t instance_got_ip; + ESP_ERROR_CHECK(esp_event_handler_instance_register( + WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL, &instance_any_id)); + ESP_ERROR_CHECK(esp_event_handler_instance_register( + IP_EVENT, IP_EVENT_STA_GOT_IP, &event_handler, NULL, &instance_got_ip)); + + wifi_config_t c = {.sta = {.threshold = {.authmode = WIFI_AUTH_WPA2_PSK}, + .pmf_cfg = {.capable = true, .required = false}}}; + snprintf((char *) c.sta.ssid, sizeof(c.sta.ssid), "%s", ssid); + snprintf((char *) c.sta.password, sizeof(c.sta.password), "%s", pass); + ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); + ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &c)); + ESP_ERROR_CHECK(esp_wifi_start()); + MG_DEBUG(("wifi_init_sta finished.")); + + EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group, + WIFI_CONNECTED_BIT | WIFI_FAIL_BIT, + pdFALSE, pdFALSE, portMAX_DELAY); + + if (bits & WIFI_CONNECTED_BIT) { + MG_INFO(("connected to ap SSID:%s password:%s", ssid, pass)); + } else if (bits & WIFI_FAIL_BIT) { + MG_ERROR(("Failed to connect to SSID:%s, password:%s", ssid, pass)); + } else { + MG_ERROR(("UNEXPECTED EVENT")); + } + + /* The event will not be processed after unregister */ + ESP_ERROR_CHECK(esp_event_handler_instance_unregister( + IP_EVENT, IP_EVENT_STA_GOT_IP, instance_got_ip)); + ESP_ERROR_CHECK(esp_event_handler_instance_unregister( + WIFI_EVENT, ESP_EVENT_ANY_ID, instance_any_id)); + vEventGroupDelete(s_wifi_event_group); +} \ No newline at end of file diff --git a/esp32/esp_project/sdkconfig b/esp32/esp_project/sdkconfig index f405b2c..c55b691 100644 --- a/esp32/esp_project/sdkconfig +++ b/esp32/esp_project/sdkconfig @@ -325,12 +325,12 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table # -CONFIG_PARTITION_TABLE_SINGLE_APP=y -# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set +# CONFIG_PARTITION_TABLE_SINGLE_APP is not set +CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y # CONFIG_PARTITION_TABLE_TWO_OTA is not set # CONFIG_PARTITION_TABLE_CUSTOM is not set CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv" +CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp_large.csv" CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_MD5=y # end of Partition Table -- cgit v1.2.3