Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Restore proper feedback (mavlink and tone) for calibration commands, etc | Julian Oes | 2013-08-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into new_state_machine | Julian Oes | 2013-07-08 | 1 | -4/+39 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | compiling again Conflicts: src/modules/fixedwing_att_control/fixedwing_att_control_att.c src/modules/fixedwing_att_control/fixedwing_att_control_rate.c src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c src/modules/mavlink/orb_listener.c src/modules/multirotor_att_control/multirotor_attitude_control.c src/modules/multirotor_att_control/multirotor_rate_control.c src/modules/systemlib/pid/pid.c src/modules/systemlib/pid/pid.h src/modules/uORB/objects_common.cpp | ||||
| * | Copyright fixes | Anton Babushkin | 2013-06-22 | 1 | -4/+39 |
| | | |||||
* | | Shrinking the main commander file a bit | Julian Oes | 2013-06-25 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into new_state_machine | Julian Oes | 2013-05-17 | 1 | -1/+1 |
|/ | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp src/modules/commander/commander.c src/modules/commander/state_machine_helper.c | ||||
* | Merge branch 'master' of github.com:PX4/Firmware into export-build | Lorenz Meier | 2013-05-06 | 1 | -2/+2 |
| | |||||
* | Moved calibration | Lorenz Meier | 2013-05-06 | 1 | -0/+16 |