Skip to content

Commit 56ff175

Browse files
authored
Add support for ESP-IDF v4.4 (#110)
* Add support for ESP-IDF v4.4 * Add includes * Add includes * Fix atomics
1 parent 8fe7234 commit 56ff175

5 files changed

Lines changed: 14 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
idf_target: [ esp32, esp32s2, esp32c3]
16-
idf_version: [ "espressif/idf:release-v4.1", "espressif/idf:release-v4.2", "espressif/idf:release-v4.3" ]
16+
idf_version: [ "espressif/idf:release-v4.1", "espressif/idf:release-v4.2", "espressif/idf:release-v4.3", "espressif/idf:release-v4.4" ]
1717
exclude:
1818
- idf_target: esp32s2
1919
idf_version: "espressif/idf:release-v4.1"

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
branch: [foxy, main, galactic]
1818
idf_target: [ esp32, esp32s2, esp32c3]
19-
idf_version: [ "espressif/idf:release-v4.1", "espressif/idf:release-v4.2", "espressif/idf:release-v4.3" ]
19+
idf_version: [ "espressif/idf:release-v4.1", "espressif/idf:release-v4.2", "espressif/idf:release-v4.3", "espressif/idf:release-v4.4" ]
2020
exclude:
2121
- idf_target: esp32s2
2222
idf_version: "espressif/idf:release-v4.1"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# micro-ROS component for ESP-IDF
22

3-
This component has been tested in ESP-IDF v4.1, v4.2 and v4.3 with ESP32, ESP32-S2 and ESP32-C3.
3+
This component has been tested in ESP-IDF v4.1, v4.2, v4.3 and v4.4 with ESP32, ESP32-S2 and ESP32-C3.
44

55
## Dependencies
66

esp32_toolchain.cmake.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,11 @@ include_directories(
132132
${idf_path}/components/unity/include
133133
${idf_path}/components/unity/unity/src
134134
${idf_path}/components/wifi_provisioning/include
135+
136+
${idf_path}/components/freertos/include/esp_additions/freertos
137+
${idf_path}/components/freertos/include/esp_additions
138+
${idf_path}/components/esp_hw_support/include
139+
${idf_path}/components/esp_hw_support/include/soc
140+
${idf_path}/components/esp_hw_support/include/soc/${idf_target}
141+
${idf_path}/components/esp_hw_support/port/${idf_target}/.
135142
)

libmicroros.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ ifeq ($(IDF_TARGET),$(filter $(IDF_TARGET),esp32s2 esp32c3))
111111
if [ $(IDF_VERSION_MAJOR) -ge 4 ] && [ $(IDF_VERSION_MINOR) -ge 3 ]; then \
112112
$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_exchange_8; \
113113
fi; \
114+
if [ $(IDF_VERSION_MAJOR) -ge 4 ] && [ $(IDF_VERSION_MINOR) -ge 4 ]; then \
115+
$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
116+
$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
117+
fi; \
114118
$(X_AR) rc -s librcutils.a *.obj; \
115119
cp -rf librcutils.a $(UROS_DIR)/install/lib/librcutils.a; \
116120
rm -rf $(UROS_DIR)/atomic_workaround; \

0 commit comments

Comments
 (0)