Merge pull request #461 from thobias90/esp-build

Fix issue for ESP build test
Luos-io · Jan 5, 2024 · 73792a5 · 73792a5
2 parents 649161e + 96c487f
commit 73792a5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,7 +101,7 @@ jobs:
                           examples/projects/NUCLEO-F072RB,
                           examples/projects/NUCLEO-L073RZ,
                           examples/projects/STM32L4S5_discovery,
-                          # examples/projects/ESP32,
+                          examples/projects/ESP32,
                           examples/projects/native
                           ]
         os: [macos-latest, windows-latest, ubuntu-latest]

diff --git a/examples/projects/ESP32/button/CMakeLists.txt b/examples/projects/ESP32/button/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-list(APPEND EXTRA_COMPONENT_DIRS "../../../../network/robus/HAL/ESP32")
+list(APPEND EXTRA_COMPONENT_DIRS "../../../../network/robus_network/HAL/ESP32")
 list(APPEND EXTRA_COMPONENT_DIRS "lib/button")
 list(APPEND EXTRA_COMPONENT_DIRS "src")
 

diff --git a/examples/projects/ESP32/gate_serialcom/CMakeLists.txt b/examples/projects/ESP32/gate_serialcom/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-list(APPEND EXTRA_COMPONENT_DIRS "../../../../network/robus/HAL/ESP32")
+list(APPEND EXTRA_COMPONENT_DIRS "../../../../network/robus_network/HAL/ESP32")
 list(APPEND EXTRA_COMPONENT_DIRS "../../../../tool_services/gate")
 list(APPEND EXTRA_COMPONENT_DIRS "../../../../tool_services/pipe/SERIAL/ESP32_IDF")
 list(APPEND EXTRA_COMPONENT_DIRS "src")

diff --git a/examples/projects/ESP32/led/CMakeLists.txt b/examples/projects/ESP32/led/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-list(APPEND EXTRA_COMPONENT_DIRS "../../../../network/robus/HAL/ESP32")
+list(APPEND EXTRA_COMPONENT_DIRS "../../../../network/robus_network/HAL/ESP32")
 list(APPEND EXTRA_COMPONENT_DIRS "lib/led")
 list(APPEND EXTRA_COMPONENT_DIRS "lib/led_strip")
 list(APPEND EXTRA_COMPONENT_DIRS "src")

diff --git a/network/robus_network/HAL/ESP32/luos_engine/CMakeLists.txt b/network/robus_network/HAL/ESP32/luos_engine/CMakeLists.txt
@@ -8,7 +8,7 @@ set(srcs "../../../../../engine/core/src/luos_engine.c"
     "../../../../../engine/core/src/stats.c"
     "../../../../../engine/core/src/streaming.c"
     "../../../../../engine/core/src/timestamp.c"
-    "../../../../../engine/bootloader/bootloader_core.c"
+    "../../../../../engine/bootloader/luos_bootloader.c"
     "../../../../../engine/HAL/ESP32/luos_hal.c"
     "../../../../../engine/IO/src/msg_alloc.c"
     "../../../../../engine/IO/src/luos_phy.c"
@@ -17,7 +17,6 @@ set(srcs "../../../../../engine/core/src/luos_engine.c"
     "../../../src/port_manager.c"
     "../../../src/reception.c"
     "../../../src/robus.c"
-    "../../../src/topic.c"
     "../../../src/transmission.c"
     "../../../HAL/ESP32/robus_hal.c")
 
@@ -26,6 +25,8 @@ set(inc "../../../../../engine/core/inc"
     "../../../../../engine/OD"
     "../../../../../engine/HAL/ESP32"
     "../../../../../engine/bootloader"
+    "../../../../../engine"
+    "../../../../../network/robus_network"
     "../../../inc"
     "../../ESP32")