From 3cecb7648c741fcd5f9d1c3bdc60c33015d2ccac Mon Sep 17 00:00:00 2001 From: Kimberly McGuire Date: Tue, 23 Jul 2024 15:04:07 +0200 Subject: [PATCH 1/2] Update launch.py --- crazyflie/launch/launch.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crazyflie/launch/launch.py b/crazyflie/launch/launch.py index 961d1f447..a0294364e 100644 --- a/crazyflie/launch/launch.py +++ b/crazyflie/launch/launch.py @@ -115,6 +115,7 @@ def generate_launch_description(): DeclareLaunchArgument('debug', default_value='False'), DeclareLaunchArgument('rviz', default_value='False'), DeclareLaunchArgument('gui', default_value='True'), + DeclareLaunchArgument('teleop', default_value='False'), DeclareLaunchArgument('mocap', default_value='True'), DeclareLaunchArgument('teleop_yaml_file', default_value=''), OpaqueFunction(function=parse_yaml), @@ -135,6 +136,7 @@ def generate_launch_description(): parameters= [PythonExpression(["'" + telop_yaml_path +"' if '", LaunchConfiguration('teleop_yaml_file'), "' == '' else '", LaunchConfiguration('teleop_yaml_file'), "'"])], ), Node( + condition=LaunchConfigurationEquals('teleop', 'True'), package='joy', executable='joy_node', name='joy_node' # by default id=0 From de09edba2ebdb32a351168775a3bc82dd8588e86 Mon Sep 17 00:00:00 2001 From: Kimberly McGuire Date: Wed, 24 Jul 2024 10:15:04 +0200 Subject: [PATCH 2/2] Update launch.py --- crazyflie/launch/launch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crazyflie/launch/launch.py b/crazyflie/launch/launch.py index a0294364e..8c8a31480 100644 --- a/crazyflie/launch/launch.py +++ b/crazyflie/launch/launch.py @@ -115,11 +115,12 @@ def generate_launch_description(): DeclareLaunchArgument('debug', default_value='False'), DeclareLaunchArgument('rviz', default_value='False'), DeclareLaunchArgument('gui', default_value='True'), - DeclareLaunchArgument('teleop', default_value='False'), + DeclareLaunchArgument('teleop', default_value='True'), DeclareLaunchArgument('mocap', default_value='True'), DeclareLaunchArgument('teleop_yaml_file', default_value=''), OpaqueFunction(function=parse_yaml), Node( + condition=LaunchConfigurationEquals('teleop', 'True'), package='crazyflie', executable='teleop', name='teleop',