connect via wifi and enable esp insights

Signed-off-by: Peter Siegmund <developer@mars3142.org>

firmware/components/led-manager/CMakeLists.txt

@@ -1,6 +1,6 @@
 idf_component_register(SRCS
             src/led_manager.cpp
-            src/led_status.cpp
+            src/led_status.c
         INCLUDE_DIRS "include"
         PRIV_REQUIRES
             u8g2

firmware/components/led-manager/include/led_status.h

@@ -27,25 +27,32 @@ typedef struct
 {
     led_mode_t mode;
     rgb_t color;
-    uint32_t on_time_ms = 0;  // Only relevant for BLINK
-    uint32_t off_time_ms = 0; // Only relevant for BLINK
+    uint32_t on_time_ms;  // Only relevant for BLINK
+    uint32_t off_time_ms; // Only relevant for BLINK
 } led_behavior_t;
 
-/**
- * @brief Initializes the status manager and the LED strip.
- *
- * @param gpio_num GPIO where the data line of the LEDs is connected.
- * @return esp_err_t ESP_OK on success.
- */
-esp_err_t led_status_init(int gpio_num);
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+    /**
+     * @brief Initializes the status manager and the LED strip.
+     *
+     * @param gpio_num GPIO where the data line of the LEDs is connected.
+     * @return esp_err_t ESP_OK on success.
+     */
+    esp_err_t led_status_init(int gpio_num);
 
-/**
- * @brief Sets the lighting behavior for a single LED.
- *
- * This function is thread-safe.
- *
- * @param index Index of the LED (0 to STATUS_LED_COUNT - 1).
- * @param behavior The structure with the desired behavior.
- * @return esp_err_t ESP_OK on success, ESP_ERR_INVALID_ARG on invalid index.
- */
-esp_err_t led_status_set_behavior(uint8_t index, led_behavior_t behavior);
+    /**
+     * @brief Sets the lighting behavior for a single LED.
+     *
+     * This function is thread-safe.
+     *
+     * @param index Index of the LED (0 to STATUS_LED_COUNT - 1).
+     * @param behavior The structure with the desired behavior.
+     * @return esp_err_t ESP_OK on success, ESP_ERR_INVALID_ARG on invalid index.
+     */
+    esp_err_t led_status_set_behavior(uint8_t index, led_behavior_t behavior);
+#ifdef __cplusplus
+}
+#endif

firmware/main/CMakeLists.txt

@@ -4,6 +4,7 @@ idf_component_register(SRCS
         button_handling.c
         i2c_checker.c
         hal/u8g2_esp32_hal.c
+        wifi_handler.c
     INCLUDE_DIRS "."
     PRIV_REQUIRES
         insa
@@ -15,5 +16,7 @@ idf_component_register(SRCS
         driver
         esp_timer
         esp_event
+        esp_wifi
         app_update
+        rmaker_common
 )

firmware/main/app_task.cpp

@@ -3,6 +3,7 @@
 #include "button_handling.h"
 #include "common/InactivityTracker.h"
 #include "driver/i2c.h"
+#include "esp_diagnostics.h"
 #include "esp_log.h"
 #include "esp_timer.h"
 #include "hal/u8g2_esp32_hal.h"
@@ -151,6 +152,7 @@ void app_task(void *args)
         led_status_set_behavior(0, led0_behavior);
 
         ESP_LOGE(TAG, "Display not found, cannot continue.");
+        ESP_DIAG_EVENT(TAG, "Display not found on I2C bus");
         vTaskDelete(nullptr);
         return;
     }

firmware/main/main.cpp

@@ -4,12 +4,14 @@
 #include "esp_insights.h"
 #include "esp_log.h"
 #include "esp_ota_ops.h"
+#include "esp_rmaker_utils.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "led_manager.h"
 #include "led_status.h"
 #include "nvs_flash.h"
 #include "sdkconfig.h"
+#include "wifi_handler.h"
 
 #define ESP_INSIGHTS_AUTH_KEY                                                                                          \
     "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9."                                                                            \
@@ -58,6 +60,10 @@ extern "C"
 
         show_partition();
 
+        led_status_init(CONFIG_STATUS_WLED_PIN);
+
+        wifi_init_sta();
+
         esp_insights_config_t config = {
             .log_type = ESP_DIAG_LOG_TYPE_ERROR,
             .node_id = nullptr,
@@ -67,9 +73,10 @@ extern "C"
 
         esp_insights_init(&config);
 
-        led_status_init(CONFIG_STATUS_WLED_PIN);
+        esp_rmaker_time_sync_init(NULL);
 
         wled_init();
+
         register_handler();
 
         xTaskCreatePinnedToCore(app_task, "main_loop", 4096, NULL, tskIDLE_PRIORITY + 1, NULL, portNUM_PROCESSORS - 1);

firmware/main/wifi_handler.c

@@ -0,0 +1,119 @@
+#include "wifi_handler.h"
+
+#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 "led_status.h"
+#include "lwip/err.h"
+#include "lwip/sys.h"
+#include "nvs_flash.h"
+#include "sdkconfig.h"
+
+// Event group to signal when we are connected
+static EventGroupHandle_t s_wifi_event_group;
+
+// The bits for the event group
+#define WIFI_CONNECTED_BIT BIT0
+#define WIFI_FAIL_BIT BIT1
+
+static const char *TAG = "wifi_handler";
+
+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)
+    {
+        led_behavior_t led0_behavior = {
+            .mode = LED_MODE_BLINK, .color = {.r = 0, .g = 50, .b = 0}, .on_time_ms = 200, .off_time_ms = 200};
+        led_status_set_behavior(0, led0_behavior);
+
+        esp_wifi_connect();
+    }
+    else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED)
+    {
+        if (s_retry_num < CONFIG_WIFI_CONNECT_RETRIES)
+        {
+            led_behavior_t led0_behavior = {
+                .mode = LED_MODE_BLINK, .color = {.r = 0, .g = 50, .b = 0}, .on_time_ms = 200, .off_time_ms = 200};
+            led_status_set_behavior(0, led0_behavior);
+
+            esp_wifi_connect();
+            s_retry_num++;
+            ESP_LOGI(TAG, "Retrying to connect to the AP");
+        }
+        else
+        {
+            xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);
+        }
+        ESP_LOGI(TAG, "Failed to connect to the AP");
+    }
+    else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP)
+    {
+        led_behavior_t led0_behavior = {
+            .mode = LED_MODE_SOLID,
+            .color = {.r = 0, .g = 50, .b = 0},
+        };
+        led_status_set_behavior(0, led0_behavior);
+
+        ip_event_got_ip_t *event = (ip_event_got_ip_t *)event_data;
+        ESP_LOGI(TAG, "Got IP address:" IPSTR, IP2STR(&event->ip_info.ip));
+        s_retry_num = 0;
+        xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
+    }
+}
+
+void wifi_init_sta()
+{
+    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 wifi_config = {
+        .sta =
+            {
+                .ssid = CONFIG_WIFI_SSID,
+                .password = CONFIG_WIFI_PASSWORD,
+            },
+    };
+    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
+    ESP_ERROR_CHECK(esp_wifi_start());
+
+    ESP_LOGI(TAG, "wifi_init_sta finished.");
+
+    /* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or
+       connection failed for the maximum number of retries (WIFI_FAIL_BIT). The bits are set by event_handler() */
+    EventBits_t bits =
+        xEventGroupWaitBits(s_wifi_event_group, WIFI_CONNECTED_BIT | WIFI_FAIL_BIT, pdFALSE, pdFALSE, portMAX_DELAY);
+
+    if (bits & WIFI_CONNECTED_BIT)
+    {
+        ESP_LOGI(TAG, "Connected to AP SSID:%s", CONFIG_WIFI_SSID);
+    }
+    else if (bits & WIFI_FAIL_BIT)
+    {
+        ESP_LOGI(TAG, "Failed to connect to SSID:%s", CONFIG_WIFI_SSID);
+    }
+    else
+    {
+        ESP_LOGE(TAG, "UNERWARTETES EVENT");
+    }
+}

firmware/main/wifi_handler.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+    void wifi_init_sta(void);
+#ifdef __cplusplus
+}
+#endif

firmware/partitions.csv

@@ -1,9 +1,8 @@
 # Name   , Type , SubType  , Offset  , Size  , Flags
 nvs      , data , nvs      , 0x9000  ,   20k ,
 otadata  , data , ota      ,         ,    8k ,
-factory  , app  , factory  , 0x10000 , 1024k ,
-app0     , app  , ota_0    ,         , 1024k ,
-app1     , app  , ota_1    ,         , 1024k ,
+app0     , app  , ota_0    , 0x10000 , 1536k ,
+app1     , app  , ota_1    ,         , 1536k ,
 phy      , data , phy      ,         ,    4k ,
 coredump , data , coredump ,         ,   64k ,
 spiffs   , data , spiffs   ,         ,  892k ,