From 2b86ff133c9fe4814ff35a41473929382b29e1b8 Mon Sep 17 00:00:00 2001 From: Erick Ahmed Date: Sun, 12 Oct 2025 01:01:50 +0200 Subject: [PATCH] Remove trailing whitespace --- firmware/esp32/Dockerfile | 2 +- firmware/esp32/source/wifi.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/firmware/esp32/Dockerfile b/firmware/esp32/Dockerfile index e253725..364ba7f 100644 --- a/firmware/esp32/Dockerfile +++ b/firmware/esp32/Dockerfile @@ -36,5 +36,5 @@ COPY . /usr/src/esp/firmware/ WORKDIR /usr/src/esp/firmware/ RUN rm -rf build && /bin/bash -c "source $IDF_PATH/export.sh && idf.py set-target esp32c3 && idf.py build" -# Copy binary to standard location for extraction + RUN mkdir -p /usr/src/build && cp build/plant-manager.bin /usr/src/build/esp32.bin diff --git a/firmware/esp32/source/wifi.cpp b/firmware/esp32/source/wifi.cpp index 0bc8d35..c7421b3 100644 --- a/firmware/esp32/source/wifi.cpp +++ b/firmware/esp32/source/wifi.cpp @@ -19,18 +19,18 @@ static wifi_config_t wifi_cfg; static void wifiInit() { ESP_LOGI(TAG, "Initializing WiFi..."); - // Initialize WiFi configuration + memset(&wifi_cfg, 0, sizeof(wifi_cfg)); strcpy((char*)wifi_cfg.sta.ssid, WIFI_SSID); strcpy((char*)wifi_cfg.sta.password, WIFI_PASSWORD); wifi_cfg.sta.threshold.authmode = WIFI_AUTH; - + ESP_ERROR_CHECK(nvs_flash_init()); 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_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); @@ -43,6 +43,7 @@ static inline void wifiTryConnect() { wifiInit(); wifi_mode_t mode; + if(esp_wifi_get_mode(&mode) == ESP_OK && mode == WIFI_MODE_STA) { ESP_LOGI(TAG, "Attempting to connect to WiFi..."); ESP_ERROR_CHECK(esp_wifi_connect());