drone: Update after testing

drone/modules/animation.py

@@ -507,7 +507,7 @@ try:
     def execute_frame(frame, config, interrupter=interrupt_event):
         auto_arm = False
         use_leds = config.led_use
-        frame_id = config.frame_id
+        frame_id = config.flight_frame_id
         if frame.action == 'takeoff':
             use_leds = use_leds & config.led_takeoff_indication
             takeoff(z=config.flight_takeoff_height, frame_id=frame_id, timeout=config.flight_takeoff_time, use_leds=use_leds, interrupter=interrupter)
@@ -531,6 +531,9 @@ try:
             else:
                 led.set_effect(r=red, g=green, b=blue)
 
+    def turn_off_led(interrupter=interrupt_event):
+        led.set_effect(r=0, g=0, b=0)
+
     def takeoff(z=1.5, safe_takeoff=False, frame_id='map', timeout=5.0, use_leds=True,
                 interrupter=interrupt_event):
         if use_leds:

drone/modules/tasking.py

@@ -88,7 +88,13 @@ class TaskManager(object):
             raise KeyError('Pop from an empty priority queue')
 
     def get_last_task_name(self):
-        return self._last_task
+        try:
+            name = self._last_task.func.__name__
+            if name == 'execute_frame':
+                return name.kwargs["frame"].action
+            return name
+        except AttributeError:
+            return None
 
     def get_current_task(self):
         try:
@@ -207,7 +213,7 @@ class TaskManager(object):
                     self.pop_task()
                 except KeyError as e:
                     logger.error(str(e))
-                self._last_task = task.func.__name__
+                self._last_task = task
                 #try:
                     #print("Pop {} function!".format(task.func.__name__))
                 #except Exception as e: