Skip to content

Commit

Permalink
Merge branch 'main' into feat/description/create_sample_description_pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
Autumn60 authored Sep 3, 2024
2 parents 4477d00 + f983a7c commit da62dad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions src/control/joy2twist/config/joy2twist.param.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/**:
joy2twist:
ros__parameters:
linear_x_axis: "LEFT_STICK_Y"
angular_z_axis: "LEFT_STICK_X"
ros__parameters:
linear_x_axis: "LEFT_STICK_Y"
angular_z_axis: "LEFT_STICK_X"
2 changes: 1 addition & 1 deletion src/control/joy2twist/src/joy2twist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace joy2twist
{
Joy2Twist::Joy2Twist(const rclcpp::NodeOptions & options) : Node("joy2twist", options)
{
// パラメータの取得
// パラメータの取得
std::string linear_x_axis_str = declare_parameter<std::string>("linear_x_axis", "LEFT_STICK_Y");
std::string angular_z_axis_str = declare_parameter<std::string>("angular_z_axis", "LEFT_STICK_X");

Expand Down

0 comments on commit da62dad

Please sign in to comment.