Skip to content

Commit f079d96

Browse files
committed
Add submodule for prebuilt MicroROS libs
1 parent 642bc4f commit f079d96

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
@@ -412,3 +412,6 @@
412412
[submodule "ports/analog/msdk"]
413413
path = ports/analog/msdk
414414
url = https://github.com/analogdevicesinc/msdk.git
415+
[submodule "ports/espressif/microros-lib"]
416+
path = ports/espressif/microros-lib
417+
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
@@ -437,52 +437,52 @@ CFLAGS += -isystem esp-camera/conversions/include
437437
endif
438438

439439
ifneq ($(CIRCUITPY_MICROROS),0)
440-
CFLAGS += -isystem microros-ext/include
441-
CFLAGS += -isystem microros-ext/include/rcl
442-
CFLAGS += -isystem microros-ext/include/statistics_msgs
443-
CFLAGS += -isystem microros-ext/include/composition_interfaces
444-
CFLAGS += -isystem microros-ext/include/example_interfaces
445-
CFLAGS += -isystem microros-ext/include/rmw_microxrcedds_c
446-
CFLAGS += -isystem microros-ext/include/test_msgs
447-
CFLAGS += -isystem microros-ext/include/std_msgs
448-
CFLAGS += -isystem microros-ext/include/rcutils
449-
CFLAGS += -isystem microros-ext/include/lifecycle_msgs
450-
CFLAGS += -isystem microros-ext/include/rosidl_typesupport_interface
451-
CFLAGS += -isystem microros-ext/include/service_msgs
452-
CFLAGS += -isystem microros-ext/include/visualization_msgs
453-
CFLAGS += -isystem microros-ext/include/rosidl_dynamic_typesupport
454-
CFLAGS += -isystem microros-ext/include/stereo_msgs
455-
CFLAGS += -isystem microros-ext/include/ucdr
456-
CFLAGS += -isystem microros-ext/include/rosidl_typesupport_c
457-
CFLAGS += -isystem microros-ext/include/std_srvs
458-
CFLAGS += -isystem microros-ext/include/rcl_lifecycle
459-
CFLAGS += -isystem microros-ext/include/action_msgs
460-
CFLAGS += -isystem microros-ext/include/micro_ros_utilities
461-
CFLAGS += -isystem microros-ext/include/rcl_action
462-
CFLAGS += -isystem microros-ext/include/rcl_logging_interface
463-
CFLAGS += -isystem microros-ext/include/type_description_interfaces
464-
CFLAGS += -isystem microros-ext/include/nav_msgs
465-
CFLAGS += -isystem microros-ext/include/actionlib_msgs
466-
CFLAGS += -isystem microros-ext/include/rmw
467-
CFLAGS += -isystem microros-ext/include/rclc_parameter
468-
CFLAGS += -isystem microros-ext/include/geometry_msgs
469-
CFLAGS += -isystem microros-ext/include/sensor_msgs
470-
CFLAGS += -isystem microros-ext/include/trajectory_msgs
471-
CFLAGS += -isystem microros-ext/include/shape_msgs
472-
CFLAGS += -isystem microros-ext/include/rosidl_runtime_c
473-
CFLAGS += -isystem microros-ext/include/rclc
474-
CFLAGS += -isystem microros-ext/include/rosgraph_msgs
475-
CFLAGS += -isystem microros-ext/include/rclc_lifecycle
476-
CFLAGS += -isystem microros-ext/include/rcl_interfaces
477-
CFLAGS += -isystem microros-ext/include/diagnostic_msgs
478-
CFLAGS += -isystem microros-ext/include/micro_ros_msgs
479-
CFLAGS += -isystem microros-ext/include/rosidl_typesupport_introspection_c
480-
CFLAGS += -isystem microros-ext/include/uxr
481-
CFLAGS += -isystem microros-ext/include/unique_identifier_msgs
482-
CFLAGS += -isystem microros-ext/include/rosidl_typesupport_microxrcedds_c
483-
CFLAGS += -isystem microros-ext/include/builtin_interfaces
484-
CFLAGS += -isystem microros-ext/include/tracetools
485-
CFLAGS += -isystem microros-ext/include/rmw_microros
440+
CFLAGS += -isystem microros-lib/include
441+
CFLAGS += -isystem microros-lib/include/rcl
442+
CFLAGS += -isystem microros-lib/include/statistics_msgs
443+
CFLAGS += -isystem microros-lib/include/composition_interfaces
444+
CFLAGS += -isystem microros-lib/include/example_interfaces
445+
CFLAGS += -isystem microros-lib/include/rmw_microxrcedds_c
446+
CFLAGS += -isystem microros-lib/include/test_msgs
447+
CFLAGS += -isystem microros-lib/include/std_msgs
448+
CFLAGS += -isystem microros-lib/include/rcutils
449+
CFLAGS += -isystem microros-lib/include/lifecycle_msgs
450+
CFLAGS += -isystem microros-lib/include/rosidl_typesupport_interface
451+
CFLAGS += -isystem microros-lib/include/service_msgs
452+
CFLAGS += -isystem microros-lib/include/visualization_msgs
453+
CFLAGS += -isystem microros-lib/include/rosidl_dynamic_typesupport
454+
CFLAGS += -isystem microros-lib/include/stereo_msgs
455+
CFLAGS += -isystem microros-lib/include/ucdr
456+
CFLAGS += -isystem microros-lib/include/rosidl_typesupport_c
457+
CFLAGS += -isystem microros-lib/include/std_srvs
458+
CFLAGS += -isystem microros-lib/include/rcl_lifecycle
459+
CFLAGS += -isystem microros-lib/include/action_msgs
460+
CFLAGS += -isystem microros-lib/include/micro_ros_utilities
461+
CFLAGS += -isystem microros-lib/include/rcl_action
462+
CFLAGS += -isystem microros-lib/include/rcl_logging_interface
463+
CFLAGS += -isystem microros-lib/include/type_description_interfaces
464+
CFLAGS += -isystem microros-lib/include/nav_msgs
465+
CFLAGS += -isystem microros-lib/include/actionlib_msgs
466+
CFLAGS += -isystem microros-lib/include/rmw
467+
CFLAGS += -isystem microros-lib/include/rclc_parameter
468+
CFLAGS += -isystem microros-lib/include/geometry_msgs
469+
CFLAGS += -isystem microros-lib/include/sensor_msgs
470+
CFLAGS += -isystem microros-lib/include/trajectory_msgs
471+
CFLAGS += -isystem microros-lib/include/shape_msgs
472+
CFLAGS += -isystem microros-lib/include/rosidl_runtime_c
473+
CFLAGS += -isystem microros-lib/include/rclc
474+
CFLAGS += -isystem microros-lib/include/rosgraph_msgs
475+
CFLAGS += -isystem microros-lib/include/rclc_lifecycle
476+
CFLAGS += -isystem microros-lib/include/rcl_interfaces
477+
CFLAGS += -isystem microros-lib/include/diagnostic_msgs
478+
CFLAGS += -isystem microros-lib/include/micro_ros_msgs
479+
CFLAGS += -isystem microros-lib/include/rosidl_typesupport_introspection_c
480+
CFLAGS += -isystem microros-lib/include/uxr
481+
CFLAGS += -isystem microros-lib/include/unique_identifier_msgs
482+
CFLAGS += -isystem microros-lib/include/rosidl_typesupport_microxrcedds_c
483+
CFLAGS += -isystem microros-lib/include/builtin_interfaces
484+
CFLAGS += -isystem microros-lib/include/tracetools
485+
CFLAGS += -isystem microros-lib/include/rmw_microros
486486
endif
487487

488488
ifneq ($(CIRCUITPY_ESPIDF),0)
@@ -725,11 +725,11 @@ endif
725725

726726
ifeq ($(CIRCUITPY_MICROROS),1)
727727
ifeq ($(IDF_TARGET),esp32)
728-
BINARY_BLOBS += microros-ext/esp32/libmicroros.a
728+
BINARY_BLOBS += microros-lib/esp32/libmicroros.a
729729
else ifeq ($(IDF_TARGET),esp32s2)
730-
BINARY_BLOBS+= microros-ext/esp32s2/libmicroros.a
730+
BINARY_BLOBS+= microros-lib/esp32s2/libmicroros.a
731731
else ifeq ($(IDF_TARGET),esp32s3)
732-
BINARY_BLOBS += microros-ext/esp32s3/libmicroros.a
732+
BINARY_BLOBS += microros-lib/esp32s3/libmicroros.a
733733
endif
734734
endif
735735

ports/espressif/microros-lib

Submodule microros-lib added at 4b2a696

0 commit comments

Comments
 (0)