From a08e3810bcbf99112c4ba226ba928f829514eec7 Mon Sep 17 00:00:00 2001 From: Thobias Stahlschmidt Date: Thu, 4 Jan 2024 12:59:59 -0300 Subject: [PATCH 1/3] Revert "Temporarily remove the ESP build on GH, #423" This reverts commit f00e3e64d243d0497197019c3c5a24d49d8489f8. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df44c1148..13e7b679a 100644 --- 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] From b1e2b213c62bbb99dc81a9f5c82beec3f95df148 Mon Sep 17 00:00:00 2001 From: Thobias Stahlschmidt Date: Thu, 4 Jan 2024 13:35:28 -0300 Subject: [PATCH 2/3] update component dir --- examples/projects/ESP32/button/CMakeLists.txt | 2 +- examples/projects/ESP32/gate_serialcom/CMakeLists.txt | 2 +- examples/projects/ESP32/led/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/projects/ESP32/button/CMakeLists.txt b/examples/projects/ESP32/button/CMakeLists.txt index 279875e59..dee497df5 100644 --- 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 index 5299ab640..da966dfe4 100644 --- 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 index 2aaa7a7fc..391b006a1 100644 --- 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") From 96c487f927ce51f37772b29ca00e916983746fef Mon Sep 17 00:00:00 2001 From: Thobias Stahlschmidt Date: Thu, 4 Jan 2024 13:35:57 -0300 Subject: [PATCH 3/3] update engine cmake list --- network/robus_network/HAL/ESP32/luos_engine/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/network/robus_network/HAL/ESP32/luos_engine/CMakeLists.txt b/network/robus_network/HAL/ESP32/luos_engine/CMakeLists.txt index eb286ed18..4cccb14b9 100644 --- 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")