optimize init sequenze

show SplashScreen while connecting

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

firmware/main/CMakeLists.txt

@@ -4,21 +4,18 @@ idf_component_register(SRCS
         button_handling.c
         i2c_checker.c
         hal/u8g2_esp32_hal.c
-        wifi_handler.c
     INCLUDE_DIRS "."
     PRIV_REQUIRES
+        analytics
         insa
-        ble-manager
+        connectivity-manager
         led-manager
         persistence-manager
         u8g2
         nvs_flash
-        driver
         esp_timer
         esp_event
         esp_wifi
         app_update
         rmaker_common
 )
-
-target_add_binary_data(${COMPONENT_TARGET} "insights_auth_key.txt" TEXT)

firmware/main/app_task.cpp

@@ -1,5 +1,6 @@
 #include "app_task.h"
 
+#include "analytics.h"
 #include "button_handling.h"
 #include "common/InactivityTracker.h"
 #include "driver/i2c.h"
@@ -14,6 +15,7 @@
 #include "ui/ClockScreenSaver.h"
 #include "ui/ScreenSaver.h"
 #include "ui/SplashScreen.h"
+#include "wifi_manager.h"
 
 #define PIN_RST GPIO_NUM_NC
 
@@ -102,6 +104,10 @@ static void init_ui(void)
         auto screensaver = std::make_shared<ClockScreenSaver>(&options);
         options.pushScreen(screensaver);
     });
+
+    u8g2_ClearBuffer(&u8g2);
+    m_widget->render();
+    u8g2_SendBuffer(&u8g2);
 }
 
 static void handle_button(uint8_t button)
@@ -160,6 +166,9 @@ void app_task(void *args)
     setup_buttons();
     init_ui();
 
+    wifi_manager_init();
+    analytics_init();
+
     auto oldTime = esp_timer_get_time();
 
     while (true)

firmware/main/main.cpp

@@ -3,38 +3,13 @@
 #include "esp_event.h"
 #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"
-
-static const char *TAG = "main";
-
-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 show_partition(void)
-{
-    const esp_partition_t *running_partition = esp_ota_get_running_partition();
-
-    if (running_partition != NULL)
-    {
-        ESP_DIAG_EVENT(TAG, "Currently running partition: %s", running_partition->label);
-        ESP_DIAG_EVENT(TAG, "  Type: %s", (running_partition->type == ESP_PARTITION_TYPE_APP) ? "APP" : "DATA");
-        ESP_DIAG_EVENT(TAG, "  Subtype: %d", running_partition->subtype);
-        ESP_DIAG_EVENT(TAG, "  Offset: 0x%lx", running_partition->address);
-        ESP_DIAG_EVENT(TAG, "  Size: %ld bytes", running_partition->size);
-    }
-    else
-    {
-        ESP_LOGE(TAG, "Could not determine the running partition!");
-    }
-}
+#include "wifi_manager.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -50,23 +25,8 @@ extern "C"
             ESP_ERROR_CHECK(nvs_flash_init());
         }
 
-        show_partition();
-
         led_status_init(CONFIG_STATUS_WLED_PIN);
 
-        wifi_init_sta();
-
-        esp_insights_config_t config = {
-            .log_type = ESP_DIAG_LOG_TYPE_ERROR | ESP_DIAG_LOG_TYPE_EVENT | ESP_DIAG_LOG_TYPE_WARNING,
-            .node_id = nullptr,
-            .auth_key = insights_auth_key_start,
-            .alloc_ext_ram = false,
-        };
-
-        esp_insights_init(&config);
-
-        esp_rmaker_time_sync_init(NULL);
-
         wled_init();
 
         register_handler();

firmware/main/wifi_handler.c

@@ -1,125 +0,0 @@
-#include "wifi_handler.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_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_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_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,
-                .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/main/wifi_handler.h

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