Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine | Julian Oes | 2013-06-18 | 1 | -5/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp src/modules/commander/commander.c src/modules/commander/state_machine_helper.c src/modules/commander/state_machine_helper.h src/modules/px4iofirmware/mixer.cpp src/modules/uORB/topics/actuator_controls.h src/modules/uORB/topics/vehicle_status.h | ||||
| * | Code formatting and warning fixes | Lorenz Meier | 2013-06-09 | 1 | -5/+5 |
| | | |||||
* | | Introduced new actuator_safety topic | Julian Oes | 2013-06-14 | 1 | -1/+20 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into new_state_machine | Julian Oes | 2013-05-17 | 1 | -19/+20 |
|/ | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp src/modules/commander/commander.c src/modules/commander/state_machine_helper.c | ||||
* | Moved the bulk of sensor drivers to the new world | Lorenz Meier | 2013-04-27 | 2 | -0/+959 |