optimize init sequenze

show SplashScreen while connecting

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

firmware/components/analytics/CMakeLists.txt

@@ -0,0 +1,10 @@
+idf_component_register(SRCS
+            src/analytics.c
+        INCLUDE_DIRS "include"
+        REQUIRES
+            rmaker_common
+            esp_insights
+            rmaker_common
+)
+
+target_add_binary_data(${COMPONENT_TARGET} "insights_auth_key.txt" TEXT)

firmware/components/analytics/include/analytics.h

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

firmware/components/analytics/src/analytics.c

@@ -0,0 +1,20 @@
+#include "analytics.h"
+#include "esp_insights.h"
+#include "esp_rmaker_utils.h"
+
+extern const char insights_auth_key_start[] asm("_binary_insights_auth_key_txt_start");
+extern const char insights_auth_key_end[] asm("_binary_insights_auth_key_txt_end");
+
+void analytics_init(void)
+{
+    esp_insights_config_t config = {
+        .log_type = ESP_DIAG_LOG_TYPE_ERROR | ESP_DIAG_LOG_TYPE_EVENT | ESP_DIAG_LOG_TYPE_WARNING,
+        .node_id = NULL,
+        .auth_key = insights_auth_key_start,
+        .alloc_ext_ram = false,
+    };
+
+    esp_insights_init(&config);
+
+    esp_rmaker_time_sync_init(NULL);
+}

firmware/components/connectivity-manager/CMakeLists.txt

@@ -1,7 +1,11 @@
 idf_component_register(SRCS
             src/ble_manager.c
+            src/wifi_manager.c
         INCLUDE_DIRS "include"
         PRIV_REQUIRES
             bt
+            driver
             nvs_flash
-)
+            esp_insights
+            led-manager
+)

firmware/components/connectivity-manager/include/wifi_manager.h

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

firmware/components/connectivity-manager/src/wifi_manager.c

@@ -0,0 +1,125 @@
+#include "wifi_manager.h"
+
+#include "esp_event.h"
+#include "esp_insights.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_manager";
+
+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_DIAG_EVENT(TAG, "Retrying to connect to the AP");
+        }
+        else
+        {
+            led_behavior_t led0_behavior = {
+                .mode = LED_MODE_BLINK, .color = {.r = 0, .g = 50, .b = 0}, .on_time_ms = 1000, .off_time_ms = 500};
+            led_status_set_behavior(0, led0_behavior);
+
+            xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);
+        }
+        ESP_DIAG_EVENT(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_DIAG_EVENT(TAG, "Got IP address:" IPSTR, IP2STR(&event->ip_info.ip));
+        s_retry_num = 0;
+        xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
+    }
+}
+
+void wifi_manager_init()
+{
+    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,
+                .threshold.authmode = WIFI_AUTH_WPA2_PSK,
+            },
+    };
+    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_DIAG_EVENT(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_DIAG_EVENT(TAG, "Connected to AP SSID:%s", CONFIG_WIFI_SSID);
+    }
+    else if (bits & WIFI_FAIL_BIT)
+    {
+        ESP_DIAG_EVENT(TAG, "Failed to connect to SSID:%s", CONFIG_WIFI_SSID);
+    }
+    else
+    {
+        ESP_LOGE(TAG, "Unexpected event");
+    }
+}

firmware/components/insa/src/ui/SplashScreen.cpp

@@ -1,13 +1,10 @@
 #include "ui/SplashScreen.h"
 
+#include "analytics.h"
 #include "ui/MainMenu.h"
+#include "wifi_manager.h"
 
-#ifndef ESP32
-#include <chrono>
-#include <thread>
-#endif
-
-uint64_t counter = 0;
+uint64_t splashTime = 0;
 
 SplashScreen::SplashScreen(menu_options_t *options) : Widget(options->u8g2), m_options(options)
 {
@@ -15,18 +12,14 @@ SplashScreen::SplashScreen(menu_options_t *options) : Widget(options->u8g2), m_o
 
 void SplashScreen::update(const uint64_t dt)
 {
-    counter += dt;
-    if (counter >= 3000)
+    splashTime += dt;
+    if (splashTime > 100)
     {
-        counter = 0;
         if (m_options && m_options->setScreen)
         {
             m_options->setScreen(std::make_shared<MainMenu>(m_options));
         }
     }
-#ifndef ESP32
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-#endif
 }
 
 void SplashScreen::render()
@@ -36,4 +29,4 @@ void SplashScreen::render()
     u8g2_DrawStr(u8g2, 30, u8g2->height / 2 + 5, "Axel Janz");
     u8g2_SetFont(u8g2, u8g2_font_haxrcorp4089_tr);
     u8g2_DrawStr(u8g2, 35, 50, "Initialisierung...");
-}
+}