Merge branch 'nav2_setup' of github.com:dcaiti-robot/dcaiti_ws into nav2_setup

2023-07-14 11:47:52 +02:00 · 2023-07-14 11:47:52 +02:00 · 3441dc2812
commit 3441dc2812
parent 8c64697375 3ea0c8acf6
3 changed files with 6 additions and 2 deletions
--- a/src/dcaiti_control/config/twist_mux.yml
+++ b/src/dcaiti_control/config/twist_mux.yml
@ -9,4 +9,9 @@ twist_mux:
      keyboard:
        topic   : cmd_vel_keyboard
        timeout : 0.5
+        priority: 90
+
+      joystick:
+        topic   : cmd_vel_joystick
+        timeout : 0.5
        priority: 100
--- a/src/dcaiti_control/launch/launch_sim.py
+++ b/src/dcaiti_control/launch/launch_sim.py
@ -25,7 +25,7 @@ def generate_launch_description():
    package_name='dcaiti_control' #<--- CHANGE ME

    use_ros2_control = LaunchConfiguration('use_ros2_control')
-    world_path='worlds/cafe.world'
+    world_path='worlds/willowgarage.world'

    rsp = IncludeLaunchDescription(
                PythonLaunchDescriptionSource([os.path.join(
--- a/src/twist_mux
+++ b/src/twist_mux
@ -1 +0,0 @@
-Subproject commit c50e8bd4bdcff856969979b0b640fad9190b17a8
				`@ -1 +0,0 @@`
				`Subproject commit c50e8bd4bdcff856969979b0b640fad9190b17a8`