Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-18 | 1 | -256/+0 |
|\ | | | | | | | | | | | | | | | | | Conflicts: src/examples/subscriber/subscriber_params.c src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_attitude.h src/modules/uORB/topics/vehicle_attitude_setpoint.h src/platforms/px4_middleware.h | ||||
| * | extended uORB structs with VTOL specific control topics | Roman Bapst | 2014-12-02 | 1 | -1/+4 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/ROS_shared_lib_base_class' into ↵ | Thomas Gubler | 2014-12-02 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | | | dev_ros_rossharedlib Conflicts: src/modules/uORB/topics/vehicle_attitude.h src/platforms/px4_defines.h | ||||
| * | use px4_defines header to distinguish platform | Roman Bapst | 2014-11-11 | 1 | -5/+1 |
| | | |||||
| * | pulled from PX4 master | Roman Bapst | 2014-11-10 | 1 | -1/+17 |
| |\ | |||||
| * | | Adapted uORB topic files to work with ROS (data stuctures are used but not ↵ | Roman Bapst | 2014-09-25 | 1 | -0/+4 |
| | | | | | | | | | | | | the uORB functionality) | ||||
* | | | Merge remote-tracking branch 'upstream/master' into PR_RCLossDur2 | philipoe | 2014-11-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | vehicle_status: whitespace | Julian Oes | 2014-11-10 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | commander: Added duration of rc-loss to mavlink_log_critical message | philipoe | 2014-10-20 | 1 | -0/+1 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-10-05 | 1 | -1/+15 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/navigator/navigator.h src/modules/navigator/navigator_main.cpp | ||||
| * | | commander: update gps and engine cb only when changed | Thomas Gubler | 2014-09-30 | 1 | -0/+2 |
| | | | |||||
| * | | introduce new nav state to allow normal rtl with RC switch | Thomas Gubler | 2014-08-26 | 1 | -0/+1 |
| | | | |||||
| * | | commander: check if baro is healthy | Thomas Gubler | 2014-08-24 | 1 | -0/+2 |
| | | | |||||
| * | | failsafe: enable support for commands | Thomas Gubler | 2014-08-14 | 1 | -1/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-08-01 | 1 | -0/+1 |
| |\| | |||||
| * | | add simplistic gps failure detection | Thomas Gubler | 2014-07-27 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-07-27 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | define gps loss failsafe nav state | Thomas Gubler | 2014-07-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | engine_failure flag | Thomas Gubler | 2014-07-24 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | Added engine_failure flag to behicle status, alsoset_nav_state in the state machine helper takes this flag into account | ||||
| * | | | add landengfail nav state | Thomas Gubler | 2014-07-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | introduce data link lost counter | Thomas Gubler | 2014-07-20 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2014-08-11 | 1 | -1/+2 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | offboard2_externalsetpointmessages Conflicts: src/modules/mavlink/mavlink_main.cpp src/modules/mavlink/mavlink_main.h src/modules/mavlink/mavlink_receiver.cpp | ||||
| * | | | circuit_breakers: added param to disable airspeed check | Julian Oes | 2014-07-26 | 1 | -0/+1 |
| | |/ | |/| | |||||
| * | | update comment about condition_global_position_valid | Thomas Gubler | 2014-07-24 | 1 | -1/+1 |
| |/ | |||||
* / | once offboard is set by mavlink command ignore RC mode | Thomas Gubler | 2014-07-16 | 1 | -0/+2 |
|/ | |||||
* | 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 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | |