Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Warning fixes in commander | Lorenz Meier | 2014-07-01 | 1 | -2/+2 |
| | |||||
* | commander: Notify negative on manual arming fails | Lorenz Meier | 2014-06-30 | 1 | -0/+1 |
| | |||||
* | Merge branch 'warning_fixes_v3' into prearm_checks | Lorenz Meier | 2014-06-30 | 3 | -9/+27 |
|\ | |||||
| * | Re-send the RC config warnings once the GCS is connected, fixed compile warnings | Lorenz Meier | 2014-06-30 | 3 | -9/+27 |
| | | |||||
* | | Merged master into prearm_checks | Lorenz Meier | 2014-06-30 | 7 | -659/+584 |
|\ \ | |||||
| * | | commander: Minor checks / improvements to power enforce patch | Lorenz Meier | 2014-06-30 | 2 | -12/+8 |
| | | | |||||
| * | | Merge branch 'master' of github.com:PX4/Firmware into power_enforce | Lorenz Meier | 2014-06-30 | 2 | -3/+5 |
| |\| | |||||
| | * | Fix compiler warnings | Don Gagne | 2014-06-29 | 2 | -3/+5 |
| | | | |||||
| * | | Merged master into power_enforce | Lorenz Meier | 2014-06-30 | 5 | -661/+522 |
| |\| | |||||
| | * | Merged estimator fixes and mavlink rate config bits | Lorenz Meier | 2014-06-30 | 1 | -1/+0 |
| | |\ | |||||
| | | * | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-27 | 2 | -12/+9 |
| | | |\ | |||||
| | | * \ | Merge branch 'navigator_rewrite' into navigator_rewrite_estimator | Julian Oes | 2014-06-27 | 1 | -4/+26 |
| | | |\ \ | |||||
| | | * | | | Remove debug output in commander spamming console | Lorenz Meier | 2014-06-22 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | More tab fixes | Don Gagne | 2014-06-29 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix bugs found through compiler warnings | Don Gagne | 2014-06-29 | 1 | -0/+1 |
| | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-06-27 | 2 | -12/+9 |
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/commander/state_machine_helper.h src/modules/mavlink/mavlink_messages.cpp | ||||
| | * | | | commander: modes fallback and reject messages fixed | Anton Babushkin | 2014-06-25 | 1 | -4/+26 |
| | | |/ | | |/| | |||||
| | * | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 3 | -10/+9 |
| | | | | |||||
| | * | | commander: added some failsafe logic | Julian Oes | 2014-06-18 | 4 | -50/+136 |
| | | | | |||||
| | * | | commander: modes display fixes, don't activate failsafe while disarmed | Anton Babushkin | 2014-06-17 | 3 | -26/+64 |
| | | | | |||||
| | * | | commander: failsafe_state removed, replaced with bool failsafe, navigation ↵ | Anton Babushkin | 2014-06-16 | 3 | -96/+108 |
| | | | | | | | | | | | | | | | | state and failsafe determined directly from main state and conditions | ||||
| | * | | navigator: renamed the different RTL states | Julian Oes | 2014-06-12 | 2 | -9/+9 |
| | | | | |||||
| | * | | navigator: audio messages about what is happening, RTL during mission not ↵ | Julian Oes | 2014-06-06 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | triggered but after mission | ||||
| | * | | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-03 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| | * | | | commander: modes and RC loss working now | Julian Oes | 2014-05-27 | 1 | -32/+37 |
| | | | | | |||||
| | * | | | commander and navigator: lot's of changes, failsafe handling in commander, ↵ | Julian Oes | 2014-05-27 | 3 | -600/+302 |
| | | | | | | | | | | | | | | | | | | | | navigator only for execution (WIP) | ||||
| | * | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 11 | -289/+442 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/gps/gps.cpp src/drivers/gps/mtk.cpp src/modules/commander/commander.cpp src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp src/modules/navigator/mission.cpp src/modules/navigator/mission.h src/modules/navigator/navigator_main.cpp src/modules/navigator/navigator_state.h src/modules/position_estimator_inav/position_estimator_inav_main.c | ||||
| | * \ \ \ | Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params | Julian Oes | 2014-05-07 | 2 | -19/+45 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp | ||||
| | * \ \ \ \ | Merge remote-tracking branch 'px4/ekf_params' into ↵ | Julian Oes | 2014-04-27 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator_cleanup_ekf_home_init Conflicts: src/drivers/gps/gps.cpp | ||||
| | | * | | | | | Let commander be less pedantic about positioning data | Lorenz Meier | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | commander: some HIL commands and land detector cleanup | Julian Oes | 2014-04-27 | 1 | -77/+53 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'px4/ekf_home_init' into ↵ | Julian Oes | 2014-04-26 | 1 | -74/+158 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator_cleanup_ekf_home_init Conflicts: src/modules/commander/commander.cpp src/modules/mc_pos_control/mc_pos_control_main.cpp src/modules/navigator/navigator_main.cpp src/modules/uORB/topics/vehicle_global_position.h | ||||
| | | * | | | | | | Send current local position estimate as well | Lorenz Meier | 2014-04-26 | 1 | -8/+16 |
| | | |/ / / / / | |||||
| | | * | | | | | Merged mpc_rc into ekf_params | Lorenz Meier | 2014-04-26 | 1 | -121/+194 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merged home_fix | Lorenz Meier | 2014-04-22 | 1 | -3/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | commander: Fix altitude initialisation, do not depend on global pos valid flag. | Lorenz Meier | 2014-04-22 | 1 | -3/+2 |
| | | | | | | | | | | |||||
| | | | * | | | | | | Added home position switch on GPS position - gives a more reliable home ↵ | Lorenz Meier | 2014-04-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position setup | ||||
| | | * | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into ekf_params | Lorenz Meier | 2014-04-22 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch 'ArmDisarm' of github.com:DonLakeFlyer/Firmware into ekf_params | Lorenz Meier | 2014-04-21 | 6 | -279/+386 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Added home position switch on GPS position - gives a more reliable home ↵ | Lorenz Meier | 2014-04-20 | 1 | -3/+3 |
| | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position setup | ||||
| | * | | | | | | | | | Merge remote-tracking branch 'px4/master' into navigator_cleanup | Julian Oes | 2014-04-26 | 6 | -279/+386 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'px4/master' into navigator_cleanup | Julian Oes | 2014-04-22 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ROMFS/px4fmu_common/init.d/rcS src/modules/mavlink/mavlink_main.cpp src/modules/mavlink/mavlink_messages.cpp src/modules/mavlink/module.mk src/modules/sdlog2/sdlog2_messages.h | ||||
| | * | | | | | | | | | | navigator: lot's of cleanup (WIP) | Julian Oes | 2014-04-21 | 2 | -34/+29 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | commander: handle_command: do not filter command if componentid == 0 | Thomas Gubler | 2014-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | commander: handle_command: filter commands by sysid and componentid | Thomas Gubler | 2014-04-18 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | commander: put unsupported warning back in place | Julian Oes | 2014-04-18 | 1 | -6/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | commander: don't beep if message is not understood | Julian Oes | 2014-04-18 | 1 | -5/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into power_enforce | Lorenz Meier | 2014-06-26 | 2 | -12/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Add mavlink_fd to all commander arm transitions to provide user feedback why ↵ | Lorenz Meier | 2014-06-26 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the arming command failed | ||||
| | * | | | | | | | | | | commander: Make mavlink_fd in arming command non-optional | Lorenz Meier | 2014-06-26 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | |