diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fd5afac..3634a610 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,9 @@ jobs: matrix: idf_target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32p4] idf_version: [v5.2, v5.3, v5.4, v5.5] + exclude: + - idf_target: esp32p4 + idf_version: v5.2 container: image: "espressif/idf:release-${{ matrix.idf_version }}" 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..09eb3225 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,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