diff options
| author | Julian Oes <julian@oes.ch> | 2013-08-15 10:43:11 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-08-15 10:43:11 +0200 |
| commit | 561ec495b7df5b3ff4536d16d1389d1f02affd06 (patch) | |
| tree | 44974ded3cd2c9651967c57259819b9f82d11a0c | |
| parent | cc9f1e81adaa71c5f86f56df45cf14f8bc8e7abc (diff) | |
| parent | 7476b03543f879df5ea29d44be147ff4926f8216 (diff) | |
| download | px4-firmware-561ec495b7df5b3ff4536d16d1389d1f02affd06.tar.gz px4-firmware-561ec495b7df5b3ff4536d16d1389d1f02affd06.tar.bz2 px4-firmware-561ec495b7df5b3ff4536d16d1389d1f02affd06.zip | |
Merge branch 'new_state_machine_drton' of github.com:DrTon/Firmware into new_state_machine_drton
Conflicts:
Documentation/flight_mode_state_machine.odg
| -rw-r--r-- | Documentation/flight_mode_state_machine.odg | bin | 22619 -> 18452 bytes | |||
| -rw-r--r-- | src/modules/commander/commander.cpp | 11 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/flight_mode_state_machine.odg b/Documentation/flight_mode_state_machine.odg Binary files differindex 2d119bd8c..f9fa7a032 100644 --- a/Documentation/flight_mode_state_machine.odg +++ b/Documentation/flight_mode_state_machine.odg diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index d4c2c4c84..5de99040c 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1336,6 +1336,7 @@ toggle_status_leds(vehicle_status_s *status, actuator_armed_s *armed, vehicle_gp /* ready to arm, blink at 2.5Hz */ if (leds_counter & 8) { led_on(LED_AMBER); + } else { led_off(LED_AMBER); } @@ -1574,6 +1575,7 @@ void *commander_low_prio_loop(void *arg) tune_error(); } + low_prio_task = LOW_PRIO_TASK_NONE; break; case LOW_PRIO_TASK_PARAM_SAVE: @@ -1586,36 +1588,43 @@ void *commander_low_prio_loop(void *arg) tune_error(); } + low_prio_task = LOW_PRIO_TASK_NONE; break; case LOW_PRIO_TASK_GYRO_CALIBRATION: do_gyro_calibration(mavlink_fd); + low_prio_task = LOW_PRIO_TASK_NONE; break; case LOW_PRIO_TASK_MAG_CALIBRATION: do_mag_calibration(mavlink_fd); + low_prio_task = LOW_PRIO_TASK_NONE; break; case LOW_PRIO_TASK_ALTITUDE_CALIBRATION: // do_baro_calibration(mavlink_fd); + low_prio_task = LOW_PRIO_TASK_NONE; break; case LOW_PRIO_TASK_RC_CALIBRATION: // do_rc_calibration(mavlink_fd); + low_prio_task = LOW_PRIO_TASK_NONE; break; case LOW_PRIO_TASK_ACCEL_CALIBRATION: do_accel_calibration(mavlink_fd); + low_prio_task = LOW_PRIO_TASK_NONE; break; case LOW_PRIO_TASK_AIRSPEED_CALIBRATION: do_airspeed_calibration(mavlink_fd); + low_prio_task = LOW_PRIO_TASK_NONE; break; case LOW_PRIO_TASK_NONE: @@ -1625,8 +1634,6 @@ void *commander_low_prio_loop(void *arg) break; } - low_prio_task = LOW_PRIO_TASK_NONE; - } return 0; |