Skip to content

Commit

Permalink
fix other packages
Browse files Browse the repository at this point in the history
Signed-off-by: Takayuki Murooka <[email protected]>
  • Loading branch information
takayuki5168 committed Jun 8, 2024
1 parent 2267336 commit 4054438
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions launch/tier4_vehicle_launch/launch/vehicle.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<arg name="vehicle_id" default="$(env VEHICLE_ID default)" description="vehicle specific ID"/>
<arg name="initial_engage_state" default="false" description="/vehicle/engage state after starting Autoware"/>
<arg name="config_dir" default="$(find-pkg-share $(var sensor_model)_description)/config" description="path to dir where sensors_calibration.yaml, etc. are located"/>
<arg name="autoware_raw_vehicle_cmd_converter_param_path" default="$(find-pkg-share autoware_raw_vehicle_cmd_converter)/config/autoware_raw_vehicle_cmd_converter.param.yaml"/>
<arg name="raw_vehicle_cmd_converter_param_path" default="$(find-pkg-share autoware_raw_vehicle_cmd_converter)/config/raw_vehicle_cmd_converter.param.yaml"/>

<let name="vehicle_launch_pkg" value="$(find-pkg-share $(var vehicle_model)_launch)"/>

Expand All @@ -22,7 +22,7 @@
<group if="$(var launch_vehicle_interface)">
<include file="$(var vehicle_launch_pkg)/launch/vehicle_interface.launch.xml">
<arg name="vehicle_id" value="$(var vehicle_id)"/>
<arg name="autoware_raw_vehicle_cmd_converter_param_path" value="$(var autoware_raw_vehicle_cmd_converter_param_path)"/>
<arg name="raw_vehicle_cmd_converter_param_path" value="$(var raw_vehicle_cmd_converter_param_path)"/>
<arg name="initial_engage_state" value="$(var initial_engage_state)"/>
</include>
</group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
namespace accel_brake_map_calibrator
{

using autoware_raw_vehicle_cmd_converter::AccelMap;
using autoware_raw_vehicle_cmd_converter::BrakeMap;
using autoware::raw_vehicle_cmd_converter::AccelMap;
using autoware::raw_vehicle_cmd_converter::BrakeMap;
using autoware_vehicle_msgs::msg::SteeringReport;
using autoware_vehicle_msgs::msg::VelocityReport;
using geometry_msgs::msg::TwistStamped;
Expand Down
2 changes: 1 addition & 1 deletion vehicle/autoware_raw_vehicle_cmd_converter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ For ease of calibration and adjustments to the lookup table, an auto-calibration

## Parameters

{{ json_to_markdown("vehicle/autoware_raw_vehicle_cmd_converter/schema/autoware_raw_vehicle_cmd_converter.schema.json") }}
{{ json_to_markdown("vehicle/autoware_raw_vehicle_cmd_converter/schema/raw_vehicle_cmd_converter.schema.json") }}

## Limitation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<arg name="input_steering" default="/vehicle/status/steering_status"/>
<arg name="output_actuation_cmd" default="/control/command/actuation_cmd"/>
<!-- Parameter -->
<arg name="config_file" default="$(find-pkg-share autoware_raw_vehicle_cmd_converter)/config/autoware_raw_vehicle_cmd_converter.param.yaml"/>
<arg name="config_file" default="$(find-pkg-share autoware_raw_vehicle_cmd_converter)/config/raw_vehicle_cmd_converter.param.yaml"/>

<node pkg="autoware_raw_vehicle_cmd_converter" exec="autoware_raw_vehicle_cmd_converter_node" name="autoware_raw_vehicle_cmd_converter" output="screen">
<node pkg="autoware_raw_vehicle_cmd_converter" exec="autoware_raw_vehicle_cmd_converter_node" name="raw_vehicle_cmd_converter" output="screen">
<param from="$(var config_file)" allow_substs="true"/>
<remap from="~/input/control_cmd" to="$(var input_control_cmd)"/>
<remap from="~/input/odometry" to="$(var input_odometry)"/>
Expand Down
2 changes: 1 addition & 1 deletion vehicle/autoware_raw_vehicle_cmd_converter/src/node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ RawVehicleCommandConverterNode::RawVehicleCommandConverterNode(
sub_steering_ = create_subscription<Steering>(
"~/input/steering", 1, std::bind(&RawVehicleCommandConverterNode::onSteering, this, _1));
debug_pub_steer_pid_ = create_publisher<Float32MultiArrayStamped>(
"/vehicle/autoware_raw_vehicle_cmd_converter/debug/steer_pid", 1);
"/vehicle/raw_vehicle_cmd_converter/debug/steer_pid", 1);

logger_configure_ = std::make_unique<tier4_autoware_utils::LoggerLevelConfigure>(this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ using GearCommand = autoware_vehicle_msgs::msg::GearCommand;
using Control = autoware_control_msgs::msg::Control;
using ExternalControlCommand = tier4_external_api_msgs::msg::ControlCommandStamped;
using Odometry = nav_msgs::msg::Odometry;
using autoware_raw_vehicle_cmd_converter::AccelMap;
using autoware_raw_vehicle_cmd_converter::BrakeMap;
using autoware::raw_vehicle_cmd_converter::AccelMap;
using autoware::raw_vehicle_cmd_converter::BrakeMap;
using Odometry = nav_msgs::msg::Odometry;

class ExternalCmdConverterNode : public rclcpp::Node
Expand Down

0 comments on commit 4054438

Please sign in to comment.