fix github action error

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

.github/workflows/esp32_build.yml

@@ -1,16 +1,22 @@
-name: Thomas the tank engine - Build and Artifact the ESP-IDF Project
+name: Thomas the tank engine - Build the ESP-IDF Project
 
 on:
   push:
   pull_request:
+  merge_group:
+  schedule:
+    - cron: "0 5 * * 3"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
     strategy:
       matrix:
-        idf_ver:
+        idf_ver: [release-v5.3, release-v5.4, latest]
-          [release-v4.4.7, release-v5.0.6, release-v5.1.4, release-v5.2.1]
+        idf_target: [esp32, esp32s3, esp32c3, esp32c5, esp32h2]
-        idf_target: [esp32, esp32s3, esp32c3]
 
     runs-on: ubuntu-latest
 

.gitignore

@@ -5,6 +5,7 @@ sdkconfig.old
 
 # They ignored Idea (Webstorm) completely
 .idea/
+.cache/
 
 # However, they kept the following 4 files version controlled
 .vscode/*
@@ -12,3 +13,4 @@ sdkconfig.old
 !.vscode/launch.json
 !.vscode/extensions.json
 .history/*
+__pycache__

components/ble/CMakeLists.txt

@@ -1,3 +0,0 @@
-idf_component_register(SRCS "osr_ble.c"
-                    INCLUDE_DIRS "."
-                    PRIV_REQUIRES "nvs_flash")

main/CMakeLists.txt

@@ -1,2 +1,6 @@
-idf_component_register(SRCS "main.c"
+idf_component_register(SRCS "main.c" "osr_ble.c"
-                    INCLUDE_DIRS ".")
+                    INCLUDE_DIRS "."
+                    PRIV_REQUIRES 
+                        nvs_flash
+                        spi_flash
+                    )

main/main.c

@@ -1,19 +1,55 @@
+#include <esp_chip_info.h>
+#include <esp_flash.h>
+#include <esp_log.h>
 #include <esp_task_wdt.h>
 #include <stdio.h>
-
 #include "osr_ble.h"
+#include "sdkconfig.h"
+
+#define TAG "app"
+
+void esp32_info() {
+  esp_chip_info_t chip_info;
+  uint32_t flash_size;
+  esp_chip_info(&chip_info);
+  printf("This is %s chip with %d CPU core(s), %s%s%s%s, ", CONFIG_IDF_TARGET,
+         chip_info.cores,
+         (chip_info.features & CHIP_FEATURE_WIFI_BGN) ? "WiFi/" : "",
+         (chip_info.features & CHIP_FEATURE_BT) ? "BT" : "",
+         (chip_info.features & CHIP_FEATURE_BLE) ? "BLE" : "",
+         (chip_info.features & CHIP_FEATURE_IEEE802154)
+             ? ", 802.15.4 (Zigbee/Thread)"
+             : "");
+
+  unsigned major_rev = chip_info.revision / 100;
+  unsigned minor_rev = chip_info.revision % 100;
+  printf("silicon revision v%d.%d, ", major_rev, minor_rev);
+  if (esp_flash_get_size(NULL, &flash_size) != ESP_OK) {
+    printf("Get flash size failed");
+    return;
+  }
+
+  printf(
+      "%" PRIu32 "MB %s flash\n", flash_size / (uint32_t)(1024 * 1024),
+      (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");
+
+  printf("Minimum free heap size: %" PRIu32 " bytes\n",
+         esp_get_minimum_free_heap_size());
+}
 
 void setup() {
   osr_ble_init();
+  ESP_LOGI(TAG, "Setup done!");
 }
 
-void loop() {
+void loop(void* args) {
-  ESP_ERROR_CHECK(esp_task_wdt_reset());
+  while (1) {
+    vTaskDelay(pdMS_TO_TICKS(1000));
+    ESP_LOGI(TAG, "Hello World!");
+  }
 }
 
 void app_main() {
   setup();
-  while (1) {
+  xTaskCreatePinnedToCore(loop, "loop", 4096, NULL, 5, NULL, 1);
-    loop();
-  }
 }

pytest.ini

@@ -0,0 +1,4 @@
+[pytest]
+addopts = --embedded-services esp,idf -s
+python_files = *.py
+timeout = 60

test/CMakeLists.txt

@@ -0,0 +1,16 @@
+# This is the project CMakeLists.txt file for the test subproject
+cmake_minimum_required(VERSION 3.16)
+
+# Include the components directory of the main application:
+#
+set(EXTRA_COMPONENT_DIRS "../components")
+
+# Set the components to include the tests for.
+# This can be overriden from CMake cache:
+# - when invoking CMake directly: cmake -D TEST_COMPONENTS="xxxxx" ..
+# - when using idf.py: idf.py -T xxxxx build
+#
+set(TEST_COMPONENTS "logger" CACHE STRING "List of components to test")
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(component_unit_test)

test/Makefile

@@ -0,0 +1,6 @@
+test:
+	@echo "Running tests..."
+	@idf.py fullclean build
+	pytest
+
+.PHONE: test

test/main/CMakeLists.txt

@@ -0,0 +1,2 @@
+idf_component_register(SRCS "components_test.c"
+                    INCLUDE_DIRS ".")

test/main/components_test.c

@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include <string.h>
+#include "unity.h"
+
+static void print_banner(const char* text);
+
+void app_main(void) {
+  print_banner("Running all the registered tests");
+  UNITY_BEGIN();
+  unity_run_all_tests();
+  UNITY_END();
+}
+
+static void print_banner(const char* text) {
+  printf("\n#### %s #####\n\n", text);
+}

test/pytest_unittest.py

@@ -0,0 +1,6 @@
+import pytest
+from pytest_embedded import Dut
+
+def test_unit_test(dut: Dut) -> None:
+    dut.expect("0 Failures")
+    dut.expect("Returned from app_main")

test/sdkconfig.defaults

@@ -0,0 +1,2 @@
+# disable watchdog
+CONFIG_ESP_TASK_WDT_EN=n