Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged master into airspeed_test_fix | Lorenz Meier | 2014-07-11 | 1 | -18/+14 |
|\ | |||||
| * | Stop warning users just because they shake a bit, be more strict to catch ↵ | Lorenz Meier | 2014-07-11 | 1 | -6/+3 |
| | | | | | | | | sensor failures or calibration errors in time | ||||
| * | Make commander error message more verbose | Lorenz Meier | 2014-07-11 | 1 | -1/+1 |
| | | |||||
| * | Commander: More hotfixes to prearm check routine | Lorenz Meier | 2014-07-11 | 1 | -2/+3 |
| | | |||||
| * | Add a check command and fix error reporting | Lorenz Meier | 2014-07-11 | 1 | -13/+10 |
| | | |||||
| * | Hotfix: Close fd before reusing it again | Lorenz Meier | 2014-07-11 | 1 | -0/+2 |
| | | |||||
* | | Generalized the airspeed check | Lorenz Meier | 2014-07-10 | 1 | -18/+11 |
|/ | |||||
* | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-07 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: src/modules/navigator/navigator.h src/modules/navigator/navigator_main.cpp | ||||
| * | commander: require home position for MISSION, fallback to LOITER | Anton Babushkin | 2014-07-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-02 | 1 | -20/+149 |
|\| | | | | | | | | | Conflicts: src/modules/uORB/topics/rc_channels.h | ||||
| * | Warning fixes in commander | Lorenz Meier | 2014-07-01 | 1 | -2/+2 |
| | | |||||
| * | Merged master into prearm_checks | Lorenz Meier | 2014-06-30 | 1 | -324/+214 |
| |\ | |||||
| | * | commander: Minor checks / improvements to power enforce patch | Lorenz Meier | 2014-06-30 | 1 | -11/+5 |
| | | | |||||
| | * | Merged master into power_enforce | Lorenz Meier | 2014-06-30 | 1 | -329/+193 |
| | |\ | |||||
| | * | | commander: put circuit breaker into effect | Lorenz Meier | 2014-05-25 | 1 | -14/+18 |
| | | | | |||||
| | * | | commander: Enforce (in presence of power sensing) that a) system is not ↵ | Lorenz Meier | 2014-05-25 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail | ||||
| * | | | commander: Remove prearm test print statements | Lorenz Meier | 2014-06-26 | 1 | -4/+0 |
| | | | | |||||
| * | | | commander: Add pre-arm check for main sensors. | Lorenz Meier | 2014-06-26 | 1 | -17/+118 |
| | | | | |||||
| * | | | commander: Formatting and logic flow cleanup, no functional change | Lorenz Meier | 2014-06-24 | 1 | -9/+15 |
| |/ / | |||||
* | | | commander: detect if offboard control is lost and missing offboard states | Julian Oes | 2014-06-27 | 1 | -0/+19 |
| | | | |||||
* | | | Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard | Julian Oes | 2014-06-20 | 1 | -0/+9 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/commander/state_machine_helper.cpp src/modules/mavlink/mavlink_receiver.cpp src/modules/mavlink/mavlink_receiver.h src/modules/uORB/topics/vehicle_status.h | ||||
| * | | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-05-21 | 1 | -0/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-05-16 | 1 | -89/+84 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-03-30 | 1 | -9/+44 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'beta' into offboard2 | Anton Babushkin | 2014-02-14 | 1 | -0/+30 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'beta' into offboard2 | Anton Babushkin | 2014-02-05 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'beta' into offboard2 | Anton Babushkin | 2014-01-29 | 1 | -55/+85 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | cammander, navigator: code style fixed | Anton Babushkin | 2014-01-23 | 1 | -27/+29 |
| | | | | | | | | | |||||
| * | | | | | | | | commander: OFFBOARD mode added, WIP | Anton Babushkin | 2014-01-22 | 1 | -0/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 1 | -6/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | commander: added some failsafe logic | Julian Oes | 2014-06-18 | 1 | -33/+99 |
| | | | | | | | | | |||||
* | | | | | | | | | commander: modes display fixes, don't activate failsafe while disarmed | Anton Babushkin | 2014-06-17 | 1 | -7/+25 |
| | | | | | | | | | |||||
* | | | | | | | | | commander: failsafe_state removed, replaced with bool failsafe, navigation ↵ | Anton Babushkin | 2014-06-16 | 1 | -42/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state and failsafe determined directly from main state and conditions | ||||
* | | | | | | | | | navigator: renamed the different RTL states | Julian Oes | 2014-06-12 | 1 | -4/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | commander and navigator: lot's of changes, failsafe handling in commander, ↵ | Julian Oes | 2014-05-27 | 1 | -330/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | navigator only for execution (WIP) | ||||
* | | | | | | | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 1 | -74/+92 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | | commander: Better audio indications on arming reject reasons | Lorenz Meier | 2014-05-23 | 1 | -2/+2 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'master' into acro2 | Anton Babushkin | 2014-05-20 | 1 | -97/+127 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | sensors, commander: code style fixed | Anton Babushkin | 2014-05-11 | 1 | -71/+85 |
| | | | | | | | | |||||
| | * | | | | | | ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL | Anton Babushkin | 2014-05-11 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Replaces poshold/althold with posctrl/altctrl | TickTock- | 2014-04-28 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | renamed EASY to POSHOLD and SEATBELT to ALTHOLD | TickTock- | 2014-04-27 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into acro2 | Anton Babushkin | 2014-03-08 | 1 | -0/+30 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'beta' into acro2 | Anton Babushkin | 2014-02-01 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | ACRO mode implemented | Anton Babushkin | 2014-01-31 | 1 | -0/+4 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge remote-tracking branch 'px4/master' into navigator_cleanup | Julian Oes | 2014-04-26 | 1 | -102/+83 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #749 from DonLakeFlyer/ArmDisarm | Lorenz Meier | 2014-04-26 | 1 | -102/+83 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM | ||||
| | * | | | | | Fixed bug with transition from in air restore to armed | Don Gagne | 2014-03-27 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added better debug output for invalid transitions | ||||
| | * | | | | | Simpler state transition code | Don Gagne | 2014-03-26 | 1 | -101/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed ARMING_STATE_ARMED_ERROR->ARMING_STATE_STANDBY_ERROR transition. | ||||
| | * | | | | | arming_state_transition now outputs error messages | Don Gagne | 2014-03-16 | 1 | -8/+13 |
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | If mavlink fd is passed in method will output reason for arming failure to mavlink. |