Skip to content

Commit f7ab677

Browse files
committed
ros2 foxy
1 parent 1a439ec commit f7ab677

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

radl_lib/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ target_include_directories(${PROJECT_NAME}
1313
"$<INSTALL_INTERFACE:include>")
1414

1515
ament_export_include_directories(include)
16-
ament_export_interfaces(export_${PROJECT_NAME})
16+
ament_export_targets(export_${PROJECT_NAME})
1717
ament_export_libraries(${PROJECT_NAME})
1818

1919
ament_package()

radler/radlr/cgen/packagen.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def clear(d, templates):
8080
)
8181
8282
ament_export_include_directories(include)
83-
ament_export_interfaces(export_{package_name})
83+
ament_export_targets(export_{package_name})
8484
ament_export_libraries({package_name})
8585
8686
ament_package()

radler/radlr/ros/roscmake.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def clear(d, templates):
151151
rosidl_target_interfaces({node_target}
152152
{module} "rosidl_typesupport_cpp")
153153
154-
ament_target_dependencies({node_target} {module})
154+
#ament_target_dependencies({node_target} {module})
155155
"""
156156
}
157157

radler/radlr/ros/rosnode.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
"""
160160
{actionname}(*_out.{pubname});"""
161161
, 'set_pub' :
162-
"""auto {actionname}_ros = _h->create_publisher<{topic_t}>("{topic_name}", rmw_qos_profile_default);{actiondef}"""
162+
"""auto {actionname}_ros = _h->create_publisher<{topic_t}>("{topic_name}", rclcpp::SystemDefaultsQoS());{actiondef}"""
163163
, 'in_struct_def' : "{topic_t}::ConstSharedPtr {subname};"
164164
, 'in_fill' :
165165
"""// Retrieve data for {subname} subscription
@@ -176,7 +176,7 @@
176176
{actionclass}<{topic_t}> {actionname}(_wrap{initmsg});
177177
std::function<void (const {topic_t}::SharedPtr)> {actionname}_func;
178178
{actionname}_func = std::ref({actionname});
179-
auto {actionname}_ros = _h->create_subscription<{topic_t}>("{topic_name}", {actionname}_func, rmw_qos_profile_default);
179+
auto {actionname}_ros = _h->create_subscription<{topic_t}>("{topic_name}", rclcpp::SystemDefaultsQoS(), {actionname}_func);
180180
181181
double _{subname}_maxperiod = 10; // pub_period * pub_each + pub_wcet in seconds
182182
/* TODO

0 commit comments

Comments
 (0)