Skip to content

Commit 50e77a2

Browse files
xmfcxkaigohirao
authored andcommitted
fix(raw_vehicle_cmd_converter): csv paths are resolved in param.yaml (autowarefoundation#6476)
Signed-off-by: M. Fatih Cırıt <mfc@leodrive.ai> Signed-off-by: kaigohirao <kaigo.hirao@proxima-ai-tech.com>
1 parent 6d0cc9a commit 50e77a2

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

vehicle/raw_vehicle_cmd_converter/config/raw_vehicle_cmd_converter.param.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/**:
22
ros__parameters:
3+
csv_path_accel_map: $(find-pkg-share raw_vehicle_cmd_converter)/data/default/accel_map.csv
4+
csv_path_brake_map: $(find-pkg-share raw_vehicle_cmd_converter)/data/default/brake_map.csv
5+
csv_path_steer_map: $(find-pkg-share raw_vehicle_cmd_converter)/data/default/steer_map.csv
36
convert_accel_cmd: true
47
convert_brake_cmd: true
58
convert_steer_cmd: true

vehicle/raw_vehicle_cmd_converter/launch/raw_vehicle_converter.launch.xml

-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0"?>
22
<launch>
3-
<arg name="csv_path_accel_map" default="$(find-pkg-share raw_vehicle_cmd_converter)/data/default/accel_map.csv"/>
4-
<arg name="csv_path_brake_map" default="$(find-pkg-share raw_vehicle_cmd_converter)/data/default/brake_map.csv"/>
5-
<arg name="csv_path_steer_map" default="$(find-pkg-share raw_vehicle_cmd_converter)/data/default/steer_map.csv"/>
6-
73
<arg name="input_control_cmd" default="/control/command/control_cmd"/>
84
<arg name="input_odometry" default="/localization/kinematic_state"/>
95
<arg name="input_steering" default="/vehicle/status/steering_status"/>
@@ -13,9 +9,6 @@
139

1410
<node pkg="raw_vehicle_cmd_converter" exec="raw_vehicle_cmd_converter_node" name="raw_vehicle_cmd_converter" output="screen">
1511
<param from="$(var config_file)" allow_substs="true"/>
16-
<param name="csv_path_accel_map" value="$(var csv_path_accel_map)"/>
17-
<param name="csv_path_brake_map" value="$(var csv_path_brake_map)"/>
18-
<param name="csv_path_steer_map" value="$(var csv_path_steer_map)"/>
1912
<remap from="~/input/control_cmd" to="$(var input_control_cmd)"/>
2013
<remap from="~/input/odometry" to="$(var input_odometry)"/>
2114
<remap from="~/input/steering" to="$(var input_steering)"/>

vehicle/raw_vehicle_cmd_converter/schema/raw_vehicle_cmd_converter.schema.json

+18
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@
66
"raw_vehicle_cmd_converter": {
77
"type": "object",
88
"properties": {
9+
"csv_path_accel_map": {
10+
"type": "string",
11+
"description": "path for acceleration map csv file",
12+
"default": "$(find-pkg-share raw_vehicle_cmd_converter)/data/default/accel_map.csv"
13+
},
14+
"csv_path_brake_map": {
15+
"type": "string",
16+
"description": "path for brake map csv file",
17+
"default": "$(find-pkg-share raw_vehicle_cmd_converter)/data/default/brake_map.csv"
18+
},
19+
"csv_path_steer_map": {
20+
"type": "string",
21+
"description": "path for steer map csv file",
22+
"default": "$(find-pkg-share raw_vehicle_cmd_converter)/data/default/steer_map.csv"
23+
},
924
"convert_accel_cmd": {
1025
"type": "boolean",
1126
"description": "use accel or not",
@@ -142,6 +157,9 @@
142157
}
143158
},
144159
"required": [
160+
"csv_path_accel_map",
161+
"csv_path_brake_map",
162+
"csv_path_steer_map",
145163
"convert_accel_cmd",
146164
"convert_brake_cmd",
147165
"convert_steer_cmd",

0 commit comments

Comments
 (0)