t.korjakow/ft24_control
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Your Name
2023-07-14 11:47:52 +02:00
parent 8c64697375 3ea0c8acf6
commit 3441dc2812
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dcaiti_control/config/twist_mux.yml
View File

@ -9,4 +9,9 @@ twist_mux:
keyboard: keyboard:
topic : cmd_vel_keyboard topic : cmd_vel_keyboard
timeout : 0.5 timeout : 0.5
priority: 90
joystick:
topic : cmd_vel_joystick
timeout : 0.5
priority: 100 priority: 100

2
src/dcaiti_control/launch/launch_sim.py
View File

@ -25,7 +25,7 @@ def generate_launch_description():
package_name='dcaiti_control' #<--- CHANGE ME package_name='dcaiti_control' #<--- CHANGE ME
use_ros2_control = LaunchConfiguration('use_ros2_control') use_ros2_control = LaunchConfiguration('use_ros2_control')
world_path='worlds/cafe.world' world_path='worlds/willowgarage.world'
rsp = IncludeLaunchDescription( rsp = IncludeLaunchDescription(
PythonLaunchDescriptionSource([os.path.join( PythonLaunchDescriptionSource([os.path.join(

1
src/twist_mux

Submodule src/twist_mux deleted from c50e8bd4bd