From 558413df4137bbd558459fdb57632c71c2160c19 Mon Sep 17 00:00:00 2001 From: Erick Ahmed Date: Sat, 11 Oct 2025 20:03:42 +0200 Subject: [PATCH] Add WiFi connectivity initialization and configuration functions --- firmware/esp32/source/main.cpp | 4 ++-- firmware/esp32/source/wifi.cpp | 35 +++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/firmware/esp32/source/main.cpp b/firmware/esp32/source/main.cpp index 666bab7..6ca5f65 100644 --- a/firmware/esp32/source/main.cpp +++ b/firmware/esp32/source/main.cpp @@ -6,9 +6,9 @@ #include "esp_log.h" #include "esp_pm.h" #include "esp_task_wdt.h" -#include "freertos/semphr.h" +#include "wifi.hpp" -volatile bool critical_error_flag = false; +volatile bool criticalErrorFlag = false; static void watchdogTask(void *pvParameters) { esp_task_wdt_config_t twdt_config = { diff --git a/firmware/esp32/source/wifi.cpp b/firmware/esp32/source/wifi.cpp index 64e6de0..4306e15 100644 --- a/firmware/esp32/source/wifi.cpp +++ b/firmware/esp32/source/wifi.cpp @@ -4,15 +4,44 @@ #include "freertos/semphr.h" #include "esp_system.h" #include "esp_log.h" -#include "esp_pm.h" +//#include "esp_pm.h" #include "esp_task_wdt.h" #include "esp_wifi.h" +#include "main.hpp" +#include "wifi-credentials.h" + +//check this +wifi_mode_t wifi_mode = WIFI_MODE_STA; +wifi_init_config_ wifi_cfg = { + .sta = { + .ssid = WIFI_SSID, + .password = WIFI_PASSWORD, + .threshold.authmode = WIFI_AUTH, + }, +}; + +static void wifiInit() { + ESP_ERROR_CHECK(esp_wifi_init(*wifi_cfg)); + ESP_ERROR_CHECK(esp_wifi_set_mode(wifi_mode)); + + esp_wifi_start(); +} + +static inline void wifiTryConnect() { + wifiInit(); + + if(esp_wifi_get_mode(wifi_mode)) ESP_ERROR_CHECK(esp_wifi_connect()); + else criticalErrorFlag = true; +} + +static void wifiManager() { + if(!esp_wifi_get_mode(wifi_mode)) wifiTryConnect(); +} void wifiTask(void *pvParameters) { ESP_ERROR_CHECK(esp_task_wdt_add(NULL)); - // wifi here - wifiConnection(); + wifiManager(); esp_task_wdt_reset(); vTaskDelay(pdMS_TO_TICKS(2500));