Add Support for ESP-IDF v5.5 (#325)

Co-authored-by: @YanKE01

Co-authored-by: Narukara <narukara17@gmail.com>
(cherry picked from commit 56d5afc)

# Conflicts:
#	.github/workflows/ci.yml
#	README.md

Author: Amronos

.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:

CMakeLists.txt

@@ -71,19 +71,14 @@ 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}
                 IDF_INCLUDES=${IDF_INCLUDES}
                 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)

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:humble 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 humble https://github.com/micro-ROS/micro_ros_espidf_component.git
 cd micro_ros_espidf_component/

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" \

network_interfaces/uros_ethernet_netif.c

@@ -172,4 +172,4 @@ esp_err_t uros_network_interface_initialize(void)
     return ESP_OK;
 }
 
-#endif
+#endif