Merge branch 'Fool-Stuck:main' into main

KobeKosenRobotics · Sep 5, 2024 · 7bae82c · 7bae82c
2 parents 2b8889d + f983a7c
commit 7bae82c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -55,7 +55,7 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.8.0-1
+    rev: v3.9.0-1
     hooks:
       - id: shfmt
         args: [-w, -s, -i=4]
@@ -85,7 +85,7 @@ repos:
         exclude: .cu
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.29.1
+    rev: 0.29.2
     hooks:
       - id: check-metaschema
         files: ^.+/schema/.*schema\.json$

diff --git a/src/control/joy2twist/config/joy2twist.param.yaml b/src/control/joy2twist/config/joy2twist.param.yaml
@@ -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"
diff --git a/src/control/joy2twist/src/joy2twist.cpp b/src/control/joy2twist/src/joy2twist.cpp
@@ -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");