From 3fe570f8ced5c3b59da8a52208eb7f9ec04528c9 Mon Sep 17 00:00:00 2001 From: Aarav Gupta Date: Wed, 27 May 2026 11:47:23 +0530 Subject: [PATCH 1/4] Add Support for ESP-IDF v5.5 (#325) Co-authored-by: @YanKE01 Co-authored-by: Narukara (cherry picked from commit 56d5afca01ba431acd5d37faabfd7ead26ae5273) # Conflicts: # .github/workflows/ci.yml # README.md --- .github/workflows/ci.yml | 4 ++++ CMakeLists.txt | 5 ----- README.md | 6 +++++- libmicroros.mk | 5 ----- network_interfaces/uros_ethernet_netif.c | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fd5afac..12a4f540 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,11 @@ jobs: strategy: fail-fast: false matrix: +<<<<<<< HEAD idf_target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32p4] +======= + idf_target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6] +>>>>>>> 56d5afc (Add Support for ESP-IDF v5.5 (#325)) idf_version: [v5.2, v5.3, v5.4, v5.5] container: diff --git a/CMakeLists.txt b/CMakeLists.txt index c6f94e0c..a9518366 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,7 @@ execute_process( ${submake} -j -f libmicroros.mk X_CC=${CMAKE_C_COMPILER} X_AR=${CMAKE_AR} - X_STRIP=${CMAKE_STRIP} - X_CFLAGS=${CMAKE_C_FLAGS} X_CXX=${CMAKE_CXX_COMPILER} - X_CXXFLAGS=${CMAKE_CXX_FLAGS} C_STANDARD=${CMAKE_C_STANDARD} MIDDLEWARE=${MIDDLEWARE} BUILD_DIR=${CMAKE_BINARY_DIR} @@ -82,8 +79,6 @@ execute_process( IDF_PATH=${IDF_PATH} IDF_TARGET=${IDF_TARGET} APP_COLCON_META=${APP_COLCON_META} - IDF_VERSION_MAJOR=${IDF_VERSION_MAJOR} - IDF_VERSION_MINOR=${IDF_VERSION_MINOR} EXTRA_ROS_PACKAGES=${EXTRA_ROS_PACKAGES} ) if(libmicroros_ret AND NOT libmicroros_ret EQUAL 0) diff --git a/README.md b/README.md index 7b196c6f..5d702184 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,11 @@ # micro-ROS component for ESP-IDF +<<<<<<< HEAD This component has been tested in ESP-IDF v5.2, v5.3, v5.4, and v5.5 with ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6, and ESP32-P4. +======= +This component has been tested in ESP-IDF v5.2, v5.3, v5.4, and v5.5 with ESP32, ESP32-S2, ESP32-S3, ESP32-C3 and ESP32-C6. +>>>>>>> 56d5afc (Add Support for ESP-IDF v5.5 (#325)) ## Dependencies @@ -63,7 +67,7 @@ docker run -it --rm --net=host microros/micro-ros-agent:jazzy udp4 --port 8888 - It's possible to build this example application using the official Espressif [docker images](https://hub.docker.com/r/espressif/idf), following the same steps: ```bash -docker run --name micro-ros-espidf-component -it espressif/idf:release-v5.4 bash +docker run --name micro-ros-espidf-component -it espressif/idf:release-v5.5 bash git clone -b jazzy https://github.com/micro-ROS/micro_ros_espidf_component.git cd micro_ros_espidf_component/ diff --git a/libmicroros.mk b/libmicroros.mk index b6dff741..477cad08 100644 --- a/libmicroros.mk +++ b/libmicroros.mk @@ -10,9 +10,6 @@ else BUILD_TYPE = Release endif -CFLAGS_INTERNAL := $(X_CFLAGS) -ffunction-sections -fdata-sections -CXXFLAGS_INTERNAL := $(X_CXXFLAGS) -ffunction-sections -fdata-sections - all: $(EXTENSIONS_DIR)/libmicroros.a clean: @@ -27,8 +24,6 @@ $(EXTENSIONS_DIR)/esp32_toolchain.cmake: $(EXTENSIONS_DIR)/esp32_toolchain.cmake cat $(EXTENSIONS_DIR)/esp32_toolchain.cmake.in | \ sed "s/@CMAKE_C_COMPILER@/$(subst /,\/,$(X_CC))/g" | \ sed "s/@CMAKE_CXX_COMPILER@/$(subst /,\/,$(X_CXX))/g" | \ - sed "s/@CFLAGS@/$(subst /,\/,$(CFLAGS_INTERNAL))/g" | \ - sed "s/@CXXFLAGS@/$(subst /,\/,$(CXXFLAGS_INTERNAL))/g" | \ sed "s/@IDF_TARGET@/$(subst /,\/,$(IDF_TARGET))/g" | \ sed "s/@IDF_PATH@/$(subst /,\/,$(IDF_PATH))/g" | \ sed "s/@BUILD_CONFIG_DIR@/$(subst /,\/,$(BUILD_DIR)/config)/g" \ diff --git a/network_interfaces/uros_ethernet_netif.c b/network_interfaces/uros_ethernet_netif.c index 40c5b7a0..8e45971c 100644 --- a/network_interfaces/uros_ethernet_netif.c +++ b/network_interfaces/uros_ethernet_netif.c @@ -172,4 +172,4 @@ esp_err_t uros_network_interface_initialize(void) return ESP_OK; } -#endif \ No newline at end of file +#endif From 4b4219fb344bb56c0637569d38e6d24946f6dbca Mon Sep 17 00:00:00 2001 From: Aarav Gupta Date: Wed, 27 May 2026 16:37:15 +0530 Subject: [PATCH 2/4] Fix conflicts in ci.yml --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12a4f540..799a44ff 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,12 +23,11 @@ jobs: strategy: fail-fast: false matrix: -<<<<<<< HEAD idf_target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32p4] -======= - idf_target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6] ->>>>>>> 56d5afc (Add Support for ESP-IDF v5.5 (#325)) idf_version: [v5.2, v5.3, v5.4, v5.5] + exclude: + - idf_target: esp32p4 + idf_version: espressif/idf:release-v5.2 container: image: "espressif/idf:release-${{ matrix.idf_version }}" From abbe32f331e515ac1b7e332d4b1c83d7d631f660 Mon Sep 17 00:00:00 2001 From: Aarav Gupta Date: Wed, 27 May 2026 16:37:59 +0530 Subject: [PATCH 3/4] Fix conflicts in README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 5d702184..09eb3225 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,7 @@ # micro-ROS component for ESP-IDF -<<<<<<< HEAD This component has been tested in ESP-IDF v5.2, v5.3, v5.4, and v5.5 with ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6, and ESP32-P4. -======= -This component has been tested in ESP-IDF v5.2, v5.3, v5.4, and v5.5 with ESP32, ESP32-S2, ESP32-S3, ESP32-C3 and ESP32-C6. ->>>>>>> 56d5afc (Add Support for ESP-IDF v5.5 (#325)) ## Dependencies From 5ecffb830959e84654123652dbeec399302f1b26 Mon Sep 17 00:00:00 2001 From: Aarav Gupta Date: Wed, 27 May 2026 19:32:57 +0530 Subject: [PATCH 4/4] Fix matrix exclude in ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 799a44ff..3634a610 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: idf_version: [v5.2, v5.3, v5.4, v5.5] exclude: - idf_target: esp32p4 - idf_version: espressif/idf:release-v5.2 + idf_version: v5.2 container: image: "espressif/idf:release-${{ matrix.idf_version }}"