Skip to content

Commit f45d356

Browse files
authored
Add humble as default ROS2 distro (#27)
1 parent 9330dfa commit f45d356

5 files changed

Lines changed: 46 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
platform: [teensy41, teensy40, teensy36, teensy35, teensy31, due, zero, olimex_e407, esp32dev, nanorp2040connect, portenta_h7_m7, teensy41_eth, nanorp2040connect_wifi, portenta_h7_m7_wifi, esp32dev_wifi, portenta_h7_m7_foxy, portenta_h7_m7_rolling, teensy41_custom]
17+
platform: [teensy41, teensy40, teensy36, teensy35, teensy31, due, zero, olimex_e407, esp32dev, nanorp2040connect, portenta_h7_m7, teensy41_eth, nanorp2040connect_wifi, portenta_h7_m7_wifi, esp32dev_wifi, portenta_h7_m7_galactic, portenta_h7_m7_foxy, portenta_h7_m7_rolling, teensy41_custom]
1818

1919
steps:
2020
- uses: actions/checkout@v3

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ A explanation for adding custom targets is also present
8282

8383
### ROS 2 distribution
8484
The target ROS 2 distribution can be configured with the `board_microros_distro = <distribution>`, supported values are:
85-
- `galactic` *(default value)*
85+
- `humble` *(default value)*
86+
- `galactic`
8687
- `rolling`
8788
- `foxy`
8889

ci/platformio.ini

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
; Galactic test
2+
[env:portenta_h7_m7_galactic]
3+
platform = ststm32
4+
board = portenta_h7_m7
5+
framework = arduino
6+
board_microros_transport = serial
7+
board_microros_distro = galactic
8+
lib_deps =
9+
../
10+
111
; Foxy test
212
[env:portenta_h7_m7_foxy]
313
platform = ststm32

extra_script.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
selected_board_meta = boards_metas[board] if board in boards_metas else "colcon.meta"
3333

34-
# Retrieve the required transport. Default galactic
35-
microros_distro = global_env.BoardConfig().get("microros_distro", "galactic")
34+
# Retrieve the required transport. Default humble
35+
microros_distro = global_env.BoardConfig().get("microros_distro", "humble")
3636

3737
# Retrieve the required transport. Default serial
3838
microros_transport = global_env.BoardConfig().get("microros_transport", "serial")

microros_utils/repositories.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ def get_package_name_from_colcon_pkg(colcon_pkg):
6767

6868
class Sources:
6969
dev_environments = {
70+
'humble': [
71+
Repository("ament_cmake", "https://github.com/ament/ament_cmake", "humble"),
72+
Repository("ament_lint", "https://github.com/ament/ament_lint", "humble"),
73+
Repository("ament_package", "https://github.com/ament/ament_package", "humble"),
74+
Repository("googletest", "https://github.com/ament/googletest", "humble"),
75+
Repository("ament_cmake_ros", "https://github.com/ros2/ament_cmake_ros", "humble"),
76+
Repository("ament_index", "https://github.com/ament/ament_index", "humble")
77+
],
7078
'galactic': [
7179
Repository("ament_cmake", "https://github.com/ament/ament_cmake", "galactic"),
7280
Repository("ament_lint", "https://github.com/ament/ament_lint", "galactic"),
@@ -94,6 +102,28 @@ class Sources:
94102
}
95103

96104
mcu_environments = {
105+
'humble': [
106+
Repository("micro-CDR", "https://github.com/eProsima/micro-CDR", "humble", "ros2"),
107+
Repository("Micro-XRCE-DDS-Client", "https://github.com/eProsima/Micro-XRCE-DDS-Client", "humble", "ros2"),
108+
Repository("rcl", "https://github.com/micro-ROS/rcl", "humble"),
109+
Repository("rclc", "https://github.com/ros2/rclc", "humble"),
110+
Repository("micro_ros_utilities", "https://github.com/micro-ROS/micro_ros_utilities", "humble"),
111+
Repository("rcutils", "https://github.com/micro-ROS/rcutils", "humble"),
112+
Repository("micro_ros_msgs", "https://github.com/micro-ROS/micro_ros_msgs", "humble"),
113+
Repository("rmw-microxrcedds", "https://github.com/micro-ROS/rmw-microxrcedds", "humble"),
114+
Repository("rosidl_typesupport", "https://github.com/micro-ROS/rosidl_typesupport", "humble"),
115+
Repository("rosidl_typesupport_microxrcedds", "https://github.com/micro-ROS/rosidl_typesupport_microxrcedds", "humble"),
116+
Repository("rosidl", "https://github.com/ros2/rosidl", "humble"),
117+
Repository("rmw", "https://github.com/ros2/rmw", "humble"),
118+
Repository("rcl_interfaces", "https://github.com/ros2/rcl_interfaces", "humble"),
119+
Repository("rosidl_defaults", "https://github.com/ros2/rosidl_defaults", "humble"),
120+
Repository("unique_identifier_msgs", "https://github.com/ros2/unique_identifier_msgs", "humble"),
121+
Repository("common_interfaces", "https://github.com/ros2/common_interfaces", "humble"),
122+
Repository("test_interface_files", "https://github.com/ros2/test_interface_files", "humble"),
123+
Repository("rmw_implementation", "https://github.com/ros2/rmw_implementation", "humble"),
124+
Repository("rcl_logging", "https://github.com/ros2/rcl_logging", "humble"),
125+
Repository("ros2_tracing", "https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing", "humble"),
126+
],
97127
'galactic': [
98128
Repository("micro-CDR", "https://github.com/eProsima/micro-CDR", "galactic", "ros2"),
99129
Repository("Micro-XRCE-DDS-Client", "https://github.com/eProsima/Micro-XRCE-DDS-Client", "galactic", "ros2"),
@@ -163,6 +193,7 @@ class Sources:
163193
}
164194

165195
ignore_packages = {
196+
'humble': ['rcl_logging_log4cxx', 'rcl_logging_spdlog', 'rcl_yaml_param_parser', 'rclc_examples'],
166197
'galactic': ['rcl_logging_log4cxx', 'rcl_logging_spdlog', 'rcl_yaml_param_parser', 'rclc_examples'],
167198
'rolling': ['rcl_logging_log4cxx', 'rcl_logging_spdlog', 'rcl_yaml_param_parser', 'rclc_examples'],
168199
'foxy': [ 'rosidl_typesupport_introspection_c', 'rosidl_typesupport_introspection_cpp', 'rcl_logging_log4cxx', 'rcl_logging_spdlog', 'rcl_yaml_param_parser', 'rclc_examples']

0 commit comments

Comments
 (0)