From 9e8d18d02f0e92c23a19c245401ca7724a7bcd58 Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Wed, 20 May 2020 23:48:02 +0300 Subject: [PATCH] Drone: Add takeoff and land indication options --- Drone/config/spec/configspec_client.ini | 2 ++ Drone/copter_client.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Drone/config/spec/configspec_client.ini b/Drone/config/spec/configspec_client.ini index d054bf0..6f881b9 100644 --- a/Drone/config/spec/configspec_client.ini +++ b/Drone/config/spec/configspec_client.ini @@ -72,6 +72,8 @@ yaw = string(default=180.0) use = boolean(default=False) pin = integer(default=21, min=0, max=100) count = integer(default=60, min=1) +takeoff_indication = boolean(default=True) +land_indication = boolean(default=True) [PRIVATE] # Available options: /hostname ; /default ; /ip ; any string 63 characters length diff --git a/Drone/copter_client.py b/Drone/copter_client.py index 6fdcf33..1754f3a 100644 --- a/Drone/copter_client.py +++ b/Drone/copter_client.py @@ -489,7 +489,7 @@ def _command_takeoff(*args, **kwargs): "z": client.active_client.config.copter_takeoff_height, "timeout": client.active_client.config.copter_takeoff_time, "safe_takeoff": client.active_client.config.copter_safe_takeoff, - "use_leds": client.active_client.config.led_use, + "use_leds": client.active_client.config.led_use & client.active_client.config.led_takeoff_indication, } ) @@ -520,7 +520,7 @@ def _command_land(*args, **kwargs): "z": client.active_client.config.copter_takeoff_height, "timeout": client.active_client.config.copter_takeoff_time, "frame_id": client.active_client.config.copter_frame_id, - "use_leds": client.active_client.config.led_use, + "use_leds": client.active_client.config.led_use & client.active_client.config.led_land_indication, } ) @@ -584,7 +584,7 @@ def _play_animation(*args, **kwargs): "timeout": client.active_client.config.copter_takeoff_time, "safe_takeoff": client.active_client.config.copter_safe_takeoff, # "frame_id": client.active_client.config.copter_frame_id, - "use_leds": client.active_client.config.led_use, + "use_leds": client.active_client.config.led_use & client.active_client.config.led_takeoff_indication, } ) # Fly to first point @@ -651,7 +651,7 @@ def _play_animation(*args, **kwargs): task_kwargs={ "timeout": client.active_client.config.copter_land_timeout, "frame_id": client.active_client.config.copter_frame_id, - "use_leds": client.active_client.config.led_use, + "use_leds": client.active_client.config.led_use & client.active_client.config.led_land_indication, }, )