dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'new_state_machine_drton' of github.com:DrTon/Firmware into new_state_machine_drton 

Conflicts:
	Documentation/flight_mode_state_machine.odg
This commit is contained in:
Julian Oes 2013-08-15 10:43:11 +02:00
parent cc9f1e81ad 7476b03543
commit 561ec495b7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Documentation/flight_mode_state_machine.odg
View File

Binary file not shown.

11
src/modules/commander/commander.cpp
View File

@ -1336,6 +1336,7 @@ toggle_status_leds(vehicle_status_s *status, actuator_armed_s *armed, vehicle_gp
/* ready to arm, blink at 2.5Hz */ /* ready to arm, blink at 2.5Hz */
if (leds_counter & 8) { if (leds_counter & 8) {
led_on(LED_AMBER); led_on(LED_AMBER);
} else { } else {
led_off(LED_AMBER); led_off(LED_AMBER);
} }
@ -1574,6 +1575,7 @@ void *commander_low_prio_loop(void *arg)
tune_error(); tune_error();
} }
low_prio_task = LOW_PRIO_TASK_NONE;
break; break;
case LOW_PRIO_TASK_PARAM_SAVE: case LOW_PRIO_TASK_PARAM_SAVE:
@ -1586,36 +1588,43 @@ void *commander_low_prio_loop(void *arg)
tune_error(); tune_error();
} }
low_prio_task = LOW_PRIO_TASK_NONE;
break; break;
case LOW_PRIO_TASK_GYRO_CALIBRATION: case LOW_PRIO_TASK_GYRO_CALIBRATION:
do_gyro_calibration(mavlink_fd); do_gyro_calibration(mavlink_fd);
low_prio_task = LOW_PRIO_TASK_NONE;
break; break;
case LOW_PRIO_TASK_MAG_CALIBRATION: case LOW_PRIO_TASK_MAG_CALIBRATION:
do_mag_calibration(mavlink_fd); do_mag_calibration(mavlink_fd);
low_prio_task = LOW_PRIO_TASK_NONE;
break; break;
case LOW_PRIO_TASK_ALTITUDE_CALIBRATION: case LOW_PRIO_TASK_ALTITUDE_CALIBRATION:
// do_baro_calibration(mavlink_fd); // do_baro_calibration(mavlink_fd);
low_prio_task = LOW_PRIO_TASK_NONE;
break; break;
case LOW_PRIO_TASK_RC_CALIBRATION: case LOW_PRIO_TASK_RC_CALIBRATION:
// do_rc_calibration(mavlink_fd); // do_rc_calibration(mavlink_fd);
low_prio_task = LOW_PRIO_TASK_NONE;
break; break;
case LOW_PRIO_TASK_ACCEL_CALIBRATION: case LOW_PRIO_TASK_ACCEL_CALIBRATION:
do_accel_calibration(mavlink_fd); do_accel_calibration(mavlink_fd);
low_prio_task = LOW_PRIO_TASK_NONE;
break; break;
case LOW_PRIO_TASK_AIRSPEED_CALIBRATION: case LOW_PRIO_TASK_AIRSPEED_CALIBRATION:
do_airspeed_calibration(mavlink_fd); do_airspeed_calibration(mavlink_fd);
low_prio_task = LOW_PRIO_TASK_NONE;
break; break;
case LOW_PRIO_TASK_NONE: case LOW_PRIO_TASK_NONE:
@ -1625,8 +1634,6 @@ void *commander_low_prio_loop(void *arg)
break; break;
} }
low_prio_task = LOW_PRIO_TASK_NONE;
} }
return 0; return 0;