| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-02 | 1 | -0/+4 |
| |\ | | | | | | | | | Conflicts: src/modules/uORB/topics/rc_channels.h | ||||
| | * | Merged master into power_enforce | Lorenz Meier | 2014-06-30 | 1 | -22/+36 |
| | |\ | |||||
| | * | | system status topic: Add support for circuit breaker | Lorenz Meier | 2014-05-25 | 1 | -0/+2 |
| | | | | |||||
| | * | | commander: Enforce (in presence of power sensing) that a) system is not ↵ | Lorenz Meier | 2014-05-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail | ||||
| * | | | Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard | Julian Oes | 2014-06-20 | 1 | -1/+3 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | 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/+1 |
| | |\| | |||||
| | * | | Merge branch 'master' into offboard2 | Anton Babushkin | 2014-05-16 | 1 | -62/+28 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'beta' into offboard2 | Anton Babushkin | 2014-02-05 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'beta' into offboard2 | Anton Babushkin | 2014-01-29 | 1 | -6/+12 |
| | |\ \ \ \ | |||||
| | * | | | | | OFFBOARD switch added, WIP | Anton Babushkin | 2014-01-22 | 1 | -0/+8 |
| | | | | | | | |||||
| * | | | | | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 1 | -3/+2 |
| | | | | | | | |||||
| * | | | | | | commander: added some failsafe logic | Julian Oes | 2014-06-18 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | commander: modes display fixes, don't activate failsafe while disarmed | Anton Babushkin | 2014-06-17 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | commander: failsafe_state removed, replaced with bool failsafe, navigation ↵ | Anton Babushkin | 2014-06-16 | 1 | -14/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | state and failsafe determined directly from main state and conditions | ||||
| * | | | | | | navigator: renamed the different RTL states | Julian Oes | 2014-06-12 | 1 | -18/+19 |
| | | | | | | | |||||
| * | | | | | | commander and navigator: lot's of changes, failsafe handling in commander, ↵ | Julian Oes | 2014-05-27 | 1 | -13/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | navigator only for execution (WIP) | ||||
| * | | | | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 1 | -2/+3 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into acro2 | Anton Babushkin | 2014-05-20 | 1 | -63/+29 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | | 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 |
| | | | | | | | |||||
| | | * | | | | Merged mpc_rc with master | Lorenz Meier | 2014-04-27 | 1 | -0/+2 |
| | | |\ \ \ \ | |||||
| | * | \ \ \ \ | Merge branch 'beta' into acro2 | Anton Babushkin | 2014-02-02 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | | ACRO mode implemented | Anton Babushkin | 2014-01-31 | 1 | -0/+8 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'px4/master' into navigator_cleanup | Julian Oes | 2014-04-26 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | Merge pull request #749 from DonLakeFlyer/ArmDisarm | Lorenz Meier | 2014-04-26 | 1 | -0/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM | ||||
| | | * | | | | | Simpler state transition code | Don Gagne | 2014-03-26 | 1 | -0/+2 |
| | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | Also fixed ARMING_STATE_ARMED_ERROR->ARMING_STATE_STANDBY_ERROR transition. | ||||
| * | | | | | | navigator: lot's of cleanup (WIP) | Julian Oes | 2014-04-21 | 1 | -4/+9 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | commander, navigator: use updated manual_control_setpoint | Anton Babushkin | 2014-04-03 | 1 | -28/+0 |
| |/ / / / | |||||
| * | | | | Merged beta into paul_estimator | Lorenz Meier | 2014-02-16 | 1 | -16/+18 |
| |\| | | | |||||
| | * | | | Merged master into beta | Lorenz Meier | 2014-02-01 | 1 | -0/+1 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | * | | | vehicle_control_mode publication moved to commander, WIP | Anton Babushkin | 2014-01-27 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | cammander: state machine can now deny current state (e.g. when position lock ↵ | Anton Babushkin | 2014-01-26 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | lost during EASY mode), added FAILSAFE_STATE_LAND | ||||
| | * | | | commander: more user-friendly states indication | Anton Babushkin | 2014-01-25 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | «flighttermination state» replaced by more general «failsafe state» | Anton Babushkin | 2014-01-25 | 1 | -5/+6 |
| | | |/ | |/| | |||||
| | * | | Added NONE = not mapped state for mission and return switches | Anton Babushkin | 2013-12-30 | 1 | -0/+2 |
| | | | | |||||
| | * | | Moving nav state from commander to navigator, WIP | Anton Babushkin | 2013-12-29 | 1 | -16/+2 |
| | | | | |||||
| | * | | added simple flight termination state machine which enbales parachute on request | Thomas Gubler | 2013-12-08 | 1 | -0/+8 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:PX4/Firmware into paul_estimator | Lorenz Meier | 2014-02-09 | 1 | -0/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Improved RC calibration behaviour, fully supported setting trim offsets | Lorenz Meier | 2014-02-01 | 1 | -0/+1 |
| | |/ | |||||
| * / | AUTOMATED code-style fix on topics. NO MANUAL OR SEMANTIC EDITS | Lorenz Meier | 2014-01-12 | 1 | -25/+24 |
| |/ | |||||
| * | Made low/critical warnings consisting | Julian Oes | 2013-08-29 | 1 | -3/+3 |
| | | |||||
| * | Full failsafe rewrite. | Anton Babushkin | 2013-08-27 | 1 | -12/+1 |
| | | |||||
| * | merged | Lorenz Meier | 2013-08-19 | 1 | -2/+2 |
| |\ | |||||
| | * | vehicle_local_position topic updated, position_estimator_inav and commander ↵ | Anton Babushkin | 2013-08-18 | 1 | -2/+2 |
| | | | | | | | | | fixes, only altitude estimate required for SETBELT now. | ||||
| | * | merged master, updated fixed wing | Lorenz Meier | 2013-08-16 | 1 | -0/+4 |
| | |\ | |||||
| * | \ | Merged master | Lorenz Meier | 2013-08-18 | 1 | -0/+4 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Hotfix: Fixed Doxygen tags for uORB topics | Lorenz Meier | 2013-08-15 | 1 | -4/+4 |
| | | | | |||||
| * | | | System status load is now from 0 to 1 instead of non-intuitive 0 to 1000 | Julian Oes | 2013-08-16 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | State machine rewritten, compiles, WIP | Anton Babushkin | 2013-07-28 | 1 | -26/+29 |
| | | | |||||
 |
index : px4-firmware | |
| PX4 Firmware for PX4FMU autopilot and PX4IO servo / failsafe board |
| aboutsummaryrefslogtreecommitdiff |