Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | commander, mavlink: fixed base_mode and custom_mode in mavlink | Anton Babushkin | 2013-08-14 | 3 | -38/+38 |
| | |||||
* | State machine rewritten, compiles, WIP | Anton Babushkin | 2013-07-28 | 1 | -38/+15 |
| | |||||
* | commander: WIP, SEATBELT renamed to ASSISTED, added SIMPLE mode, added ↵ | Anton Babushkin | 2013-07-22 | 1 | -6/+6 |
| | | | | ASSISTED switch, some cleanup and reorganizing | ||||
* | Merge branch 'master' of github.com:PX4/Firmware into new_state_machine | Lorenz Meier | 2013-07-19 | 2 | -25/+33 |
|\ | |||||
| * | Script cleanup, WIP on mavlink logging | Lorenz Meier | 2013-07-18 | 1 | -0/+11 |
| | | |||||
| * | Lunchtime HOTFIX: Bring back USB console to operational, allow single-USB ↵ | Lorenz Meier | 2013-07-18 | 1 | -25/+22 |
| | | | | | | | | connection operation via QGC | ||||
* | | Changed location of lots of flags and conditions, needs testing and more work | Julian Oes | 2013-07-16 | 2 | -7/+13 |
| | | |||||
* | | Renamed actuator_safety back to actuator_armed, compiling but untested | Julian Oes | 2013-07-15 | 2 | -10/+11 |
| | | |||||
* | | Merged master | Lorenz Meier | 2013-07-15 | 9 | -19/+16 |
|\| | |||||
| * | Hotfix for relative altitude waypoints | Lorenz Meier | 2013-07-12 | 1 | -1/+1 |
| | | |||||
| * | Cleaned up MAVLink include hierarchy | Lorenz Meier | 2013-07-08 | 9 | -18/+15 |
| | | |||||
* | | Merge branch 'master' into new_state_machine | Julian Oes | 2013-07-08 | 8 | -120/+403 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fixed HIL handling | Lorenz Meier | 2013-07-05 | 2 | -3/+4 |
| | | |||||
| * | Removed leftover mavlink_receiver.c file | Lorenz Meier | 2013-07-04 | 1 | -600/+0 |
| | | |||||
| * | Updated mavlink version, massive improvements in mission lib, fixes to HIL ↵ | Lorenz Meier | 2013-07-04 | 8 | -49/+931 |
| | | | | | | | | (state and sensor level) | ||||
| * | Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own ↵ | px4dev | 2013-06-01 | 1 | -1/+1 |
| | | | | | | | | version of task_spawn that's different. | ||||
* | | Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine | Julian Oes | 2013-06-18 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Minor state machine improvements and fixes for IO safety / in-air restart ↵ | Lorenz Meier | 2013-06-12 | 1 | -1/+1 |
| |/ | | | | | | | handling | ||||
* | | Controllers should not access state machine anymore but access the ↵ | Julian Oes | 2013-06-15 | 1 | -0/+1 |
| | | | | | | | | vehicle_control_mode flags | ||||
* | | Introduced new actuator_safety topic | Julian Oes | 2013-06-14 | 2 | -10/+11 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into new_state_machine | Julian Oes | 2013-06-12 | 2 | -5/+34 |
|\| | | | | | | | | | Conflicts: src/examples/fixedwing_control/main.c | ||||
| * | Hotfix: Removing GPS debug output | Lorenz Meier | 2013-05-22 | 1 | -5/+5 |
| | | |||||
| * | Removed unnecessary cplusplus check | Lorenz Meier | 2013-05-21 | 1 | -4/+0 |
| | | |||||
| * | Fixed missing count | Lorenz Meier | 2013-05-21 | 1 | -0/+8 |
| | | |||||
| * | Fixed va args in MAVLink, tested with RC config, correct output | Lorenz Meier | 2013-05-21 | 1 | -5/+4 |
| | | |||||
| * | VA args now supported by MAVLink text messages | Lorenz Meier | 2013-05-21 | 1 | -0/+26 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into new_state_machine | Julian Oes | 2013-05-17 | 2 | -61/+55 |
|/ | | | | | | | Conflicts: src/drivers/px4io/px4io.cpp src/modules/commander/commander.c src/modules/commander/state_machine_helper.c | ||||
* | Merged with master | Lorenz Meier | 2013-05-09 | 1 | -120/+2 |
| | |||||
* | Cut over MAVLink to new build system | Lorenz Meier | 2013-04-27 | 16 | -0/+4614 |