Skip to content

Commit 96d92c5

Browse files
Set ESP flag and change rtps branch (backport #99) (#100)
* Set ESP flag and change rtps branch (#99) * Set ESP flag and change rtps branch * Update libmicroros.mk (cherry picked from commit b705d70) # Conflicts: # libmicroros.mk * Fix branch Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Co-authored-by: Antonio Cuadros <acuadros1995@gmail.com>
1 parent 26e8456 commit 96d92c5

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

esp32_toolchain.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
2525
set(CMAKE_C_FLAGS_INIT "@CFLAGS@" CACHE STRING "" FORCE)
2626
set(CMAKE_CXX_FLAGS_INIT "@CXXFLAGS@" CACHE STRING "" FORCE)
2727

28-
add_definitions(-DLWIP_IPV4 -DLWIP_IPV6 -DPLATFORM_NAME_FREERTOS)
28+
add_definitions(-DESP_PLATFORM -DLWIP_IPV4 -DLWIP_IPV6 -DPLATFORM_NAME_FREERTOS)
2929

3030
include_directories(
3131
"@BUILD_CONFIG_DIR@"

libmicroros.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/src:
4949
rm -rf micro_ros_src; \
5050
mkdir micro_ros_src; cd micro_ros_src; \
5151
if [ "$(MIDDLEWARE)" = "embeddedrtps" ]; then \
52-
git clone -b working_esp32 https://github.com/pablogs9/embeddedRTPS src/embeddedRTPS; \
52+
git clone -b main https://github.com/pablogs9/embeddedRTPS src/embeddedRTPS; \
5353
git clone -b main https://github.com/micro-ROS/rmw_embeddedrtps src/rmw_embeddedrtps; \
5454
else \
5555
git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client; \

0 commit comments

Comments
 (0)