Skip to content

Commit 0eae45b

Browse files
nielstibenjacobperron
authored andcommitted
Fix action generation (#108)
Generate action code for: * `<goal_name>_SendGoal_Request` * `<goal_name>_SendGoal_Response` * `<goal_name>_GetResult_Request` * `<goal_name>_GetResult_Response`
1 parent de918db commit 0eae45b

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

rosidl_generator_java/resource/action.cpp.em

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,45 @@ expand_template(
5858
data,
5959
output_file)
6060

61+
# Generate SendGoal message type
62+
data.update({'msg': action.send_goal_service.request_message})
63+
output_file = os.path.join(output_dir, *namespaces[1:], '{0}.ep.{1}.cpp'.format(send_goal_type_name, typesupport_impl))
64+
expand_template(
65+
'msg.cpp.em',
66+
data,
67+
output_file)
68+
69+
# Generate GetResult message type
70+
data.update({'msg': action.get_result_service.request_message})
71+
output_file = os.path.join(output_dir, *namespaces[1:], '{0}.ep.{1}.cpp'.format(send_goal_type_name, typesupport_impl))
72+
expand_template(
73+
'msg.cpp.em',
74+
data,
75+
output_file)
76+
77+
data = {
78+
'package_name': package_name,
79+
'interface_path': interface_path,
80+
'output_dir': output_dir,
81+
'template_basepath': template_basepath,
82+
'typesupport_impl': typesupport_impl,
83+
}
84+
6185
# Generate SendGoal service type
6286
data.update({'service': action.send_goal_service})
6387
output_file = os.path.join(
6488
output_dir, *namespaces[1:], '{0}.ep.{1}.cpp'.format(send_goal_type_name, typesupport_impl))
6589
expand_template(
66-
'msg.cpp.em',
90+
'srv.cpp.em',
6791
data,
6892
output_file)
6993

70-
# Generate SendGoal service type
94+
# Generate GetResult service type
7195
data.update({'service': action.get_result_service})
7296
output_file = os.path.join(
7397
output_dir, *namespaces[1:], '{0}.ep.{1}.cpp'.format(get_result_type_name, typesupport_impl))
7498
expand_template(
75-
'msg.cpp.em',
99+
'srv.cpp.em',
76100
data,
77101
output_file)
78102
}@

0 commit comments

Comments
 (0)