Skip to content

Commit 24e71f9

Browse files
committed
Add submodule for prebuilt MicroROS libs
1 parent d40a84f commit 24e71f9

File tree

4 files changed

+54
-50
lines changed

4 files changed

+54
-50
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*.o
1010
*.a
1111
!atmel-samd/asf/**/*.a
12-
!ports/espressif/microros-ext/**/*.a
12+
!ports/espressif/microros-lib/**/*.a
1313
*.elf
1414
*.bin
1515
!*.toml.bin

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,3 +410,6 @@
410410
[submodule "ports/analog/msdk"]
411411
path = ports/analog/msdk
412412
url = https://github.com/analogdevicesinc/msdk.git
413+
[submodule "ports/espressif/microros-lib"]
414+
path = ports/espressif/microros-lib
415+
url = https://github.com/hierophect/microros-lib.git

ports/espressif/Makefile

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -423,52 +423,52 @@ CFLAGS += -isystem esp-camera/conversions/include
423423
endif
424424

425425
ifneq ($(CIRCUITPY_MICROROS),0)
426-
CFLAGS += -isystem microros-ext/include
427-
CFLAGS += -isystem microros-ext/include/rcl
428-
CFLAGS += -isystem microros-ext/include/statistics_msgs
429-
CFLAGS += -isystem microros-ext/include/composition_interfaces
430-
CFLAGS += -isystem microros-ext/include/example_interfaces
431-
CFLAGS += -isystem microros-ext/include/rmw_microxrcedds_c
432-
CFLAGS += -isystem microros-ext/include/test_msgs
433-
CFLAGS += -isystem microros-ext/include/std_msgs
434-
CFLAGS += -isystem microros-ext/include/rcutils
435-
CFLAGS += -isystem microros-ext/include/lifecycle_msgs
436-
CFLAGS += -isystem microros-ext/include/rosidl_typesupport_interface
437-
CFLAGS += -isystem microros-ext/include/service_msgs
438-
CFLAGS += -isystem microros-ext/include/visualization_msgs
439-
CFLAGS += -isystem microros-ext/include/rosidl_dynamic_typesupport
440-
CFLAGS += -isystem microros-ext/include/stereo_msgs
441-
CFLAGS += -isystem microros-ext/include/ucdr
442-
CFLAGS += -isystem microros-ext/include/rosidl_typesupport_c
443-
CFLAGS += -isystem microros-ext/include/std_srvs
444-
CFLAGS += -isystem microros-ext/include/rcl_lifecycle
445-
CFLAGS += -isystem microros-ext/include/action_msgs
446-
CFLAGS += -isystem microros-ext/include/micro_ros_utilities
447-
CFLAGS += -isystem microros-ext/include/rcl_action
448-
CFLAGS += -isystem microros-ext/include/rcl_logging_interface
449-
CFLAGS += -isystem microros-ext/include/type_description_interfaces
450-
CFLAGS += -isystem microros-ext/include/nav_msgs
451-
CFLAGS += -isystem microros-ext/include/actionlib_msgs
452-
CFLAGS += -isystem microros-ext/include/rmw
453-
CFLAGS += -isystem microros-ext/include/rclc_parameter
454-
CFLAGS += -isystem microros-ext/include/geometry_msgs
455-
CFLAGS += -isystem microros-ext/include/sensor_msgs
456-
CFLAGS += -isystem microros-ext/include/trajectory_msgs
457-
CFLAGS += -isystem microros-ext/include/shape_msgs
458-
CFLAGS += -isystem microros-ext/include/rosidl_runtime_c
459-
CFLAGS += -isystem microros-ext/include/rclc
460-
CFLAGS += -isystem microros-ext/include/rosgraph_msgs
461-
CFLAGS += -isystem microros-ext/include/rclc_lifecycle
462-
CFLAGS += -isystem microros-ext/include/rcl_interfaces
463-
CFLAGS += -isystem microros-ext/include/diagnostic_msgs
464-
CFLAGS += -isystem microros-ext/include/micro_ros_msgs
465-
CFLAGS += -isystem microros-ext/include/rosidl_typesupport_introspection_c
466-
CFLAGS += -isystem microros-ext/include/uxr
467-
CFLAGS += -isystem microros-ext/include/unique_identifier_msgs
468-
CFLAGS += -isystem microros-ext/include/rosidl_typesupport_microxrcedds_c
469-
CFLAGS += -isystem microros-ext/include/builtin_interfaces
470-
CFLAGS += -isystem microros-ext/include/tracetools
471-
CFLAGS += -isystem microros-ext/include/rmw_microros
426+
CFLAGS += -isystem microros-lib/include
427+
CFLAGS += -isystem microros-lib/include/rcl
428+
CFLAGS += -isystem microros-lib/include/statistics_msgs
429+
CFLAGS += -isystem microros-lib/include/composition_interfaces
430+
CFLAGS += -isystem microros-lib/include/example_interfaces
431+
CFLAGS += -isystem microros-lib/include/rmw_microxrcedds_c
432+
CFLAGS += -isystem microros-lib/include/test_msgs
433+
CFLAGS += -isystem microros-lib/include/std_msgs
434+
CFLAGS += -isystem microros-lib/include/rcutils
435+
CFLAGS += -isystem microros-lib/include/lifecycle_msgs
436+
CFLAGS += -isystem microros-lib/include/rosidl_typesupport_interface
437+
CFLAGS += -isystem microros-lib/include/service_msgs
438+
CFLAGS += -isystem microros-lib/include/visualization_msgs
439+
CFLAGS += -isystem microros-lib/include/rosidl_dynamic_typesupport
440+
CFLAGS += -isystem microros-lib/include/stereo_msgs
441+
CFLAGS += -isystem microros-lib/include/ucdr
442+
CFLAGS += -isystem microros-lib/include/rosidl_typesupport_c
443+
CFLAGS += -isystem microros-lib/include/std_srvs
444+
CFLAGS += -isystem microros-lib/include/rcl_lifecycle
445+
CFLAGS += -isystem microros-lib/include/action_msgs
446+
CFLAGS += -isystem microros-lib/include/micro_ros_utilities
447+
CFLAGS += -isystem microros-lib/include/rcl_action
448+
CFLAGS += -isystem microros-lib/include/rcl_logging_interface
449+
CFLAGS += -isystem microros-lib/include/type_description_interfaces
450+
CFLAGS += -isystem microros-lib/include/nav_msgs
451+
CFLAGS += -isystem microros-lib/include/actionlib_msgs
452+
CFLAGS += -isystem microros-lib/include/rmw
453+
CFLAGS += -isystem microros-lib/include/rclc_parameter
454+
CFLAGS += -isystem microros-lib/include/geometry_msgs
455+
CFLAGS += -isystem microros-lib/include/sensor_msgs
456+
CFLAGS += -isystem microros-lib/include/trajectory_msgs
457+
CFLAGS += -isystem microros-lib/include/shape_msgs
458+
CFLAGS += -isystem microros-lib/include/rosidl_runtime_c
459+
CFLAGS += -isystem microros-lib/include/rclc
460+
CFLAGS += -isystem microros-lib/include/rosgraph_msgs
461+
CFLAGS += -isystem microros-lib/include/rclc_lifecycle
462+
CFLAGS += -isystem microros-lib/include/rcl_interfaces
463+
CFLAGS += -isystem microros-lib/include/diagnostic_msgs
464+
CFLAGS += -isystem microros-lib/include/micro_ros_msgs
465+
CFLAGS += -isystem microros-lib/include/rosidl_typesupport_introspection_c
466+
CFLAGS += -isystem microros-lib/include/uxr
467+
CFLAGS += -isystem microros-lib/include/unique_identifier_msgs
468+
CFLAGS += -isystem microros-lib/include/rosidl_typesupport_microxrcedds_c
469+
CFLAGS += -isystem microros-lib/include/builtin_interfaces
470+
CFLAGS += -isystem microros-lib/include/tracetools
471+
CFLAGS += -isystem microros-lib/include/rmw_microros
472472
endif
473473

474474
ifneq ($(CIRCUITPY_ESPIDF),0)
@@ -715,11 +715,11 @@ endif
715715

716716
ifeq ($(CIRCUITPY_MICROROS),1)
717717
ifeq ($(IDF_TARGET),esp32)
718-
BINARY_BLOBS += microros-ext/esp32/libmicroros.a
718+
BINARY_BLOBS += microros-lib/esp32/libmicroros.a
719719
else ifeq ($(IDF_TARGET),esp32s2)
720-
BINARY_BLOBS+= microros-ext/esp32s2/libmicroros.a
720+
BINARY_BLOBS+= microros-lib/esp32s2/libmicroros.a
721721
else ifeq ($(IDF_TARGET),esp32s3)
722-
BINARY_BLOBS += microros-ext/esp32s3/libmicroros.a
722+
BINARY_BLOBS += microros-lib/esp32s3/libmicroros.a
723723
endif
724724
endif
725725

ports/espressif/microros-lib

Submodule microros-lib added at 4b2a696

0 commit comments

Comments
 (0)