aboutsummaryrefslogtreecommitdiff
path: root/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/mtecs' into navigator_rewriteThomas Gubler2014-06-281-56/+16
|\
| * Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-06-281-2/+12
| |\
| * | Remove old TECS implementation - we can really only decently flight-test and ↵Lorenz Meier2014-06-281-56/+16
| | | | | | | | | | | | support one.
* | | Merge branch 'master' into navigator_rewriteJulian Oes2014-06-271-2/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/commander/state_machine_helper.h src/modules/mavlink/mavlink_messages.cpp
| * | fw pos ctrl: remove commentsThomas Gubler2014-06-241-2/+0
| | |
| * | fw pos ctrl: move setting of attitude integral reset flagThomas Gubler2014-06-241-5/+8
| | |
| * | fw pos control: set integrator reset flags in attitude setpoint topic, set ↵Thomas Gubler2014-06-241-0/+9
| | | | | | | | | | | | them to true when launchdetection is running (while waiting for launch)
* | | Merge remote-tracking branch 'upstream/mtecs' into navigator_rewriteThomas Gubler2014-06-111-1/+1
|\ \ \ | | |/ | |/|
| * | mtecs: small cleanup, move subclass to own fileThomas Gubler2014-06-111-1/+1
| | |
| * | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-06-111-6/+0
| |\|
* | | Merge remote-tracking branch 'px4/mtecs' into navigator_rewriteJulian Oes2014-06-061-6/+19
|\| |
| * | fw pos control: don't call tecs 50hz update loop if mtecs is enabledThomas Gubler2014-06-011-1/+4
| | |
| * | mtecs: do not calculate derivative in first iterationThomas Gubler2014-06-011-0/+1
| | |
| * | mtecs publish stateThomas Gubler2014-05-301-4/+4
| | |
| * | fw pos control: set takeoff min pitch for mtecsThomas Gubler2014-05-281-1/+10
| | |
* | | Merge remote-tracking branch 'px4/master' into navigator_rewriteJulian Oes2014-06-061-6/+0
|\ \ \ | | |/ | |/|
| * | Remove unused loiter radius parameter. Fixes #1042Lorenz Meier2014-06-061-6/+0
| | |
* | | Merge branch 'mtecs' into navigator_rewriteJulian Oes2014-06-031-77/+160
|\ \ \ | | |/ | |/|
| * | fw pos control: landing: continue horizontally instead of climbing if just ↵Thomas Gubler2014-05-271-3/+4
| | | | | | | | | | | | below slope
| * | fw: resolve an issue when the aircraft was climbing before landingThomas Gubler2014-05-251-4/+7
| | |
| * | Merge branch 'fwattrobustify' into mtecsThomas Gubler2014-05-211-1/+1
| |\|
| * | fw pos control: landing: fix argument orderThomas Gubler2014-05-171-8/+22
| | |
| * | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-05-131-63/+136
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| * | | mtecs: landing mode which limits pitch and as well throttle at the end of ↵Thomas Gubler2014-05-011-14/+8
| | | | | | | | | | | | | | | | the landing
| * | | mtecs: first rough version of takeoff modeThomas Gubler2014-03-271-2/+9
| | | |
| * | | mtecsThomas Gubler2014-03-231-32/+69
| | | |
| * | | fw pos ctrl: add wrapper function for tecsThomas Gubler2014-03-231-43/+53
| | | |
* | | | navigator: mission class added (WIP)Julian Oes2014-06-031-1/+1
| | | |
* | | | Merge branch 'master' into navigator_rewriteJulian Oes2014-05-261-48/+104
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | apps: Compile warning fixesLorenz Meier2014-05-211-1/+1
| | |/ | |/|
| * | Merge remote-tracking branch 'upstream/master' into manualcontrolrenameThomas Gubler2014-05-131-17/+73
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_att_control/fw_att_control_main.cpp
| | * \ Merge pull request #744 from thomasgubler/fw_landing_rangefinderThomas Gubler2014-05-121-17/+73
| | |\ \ | | | | | | | | | | Fw landing rangefinder
| | | * | fw landing: do not use relative altitudes in TECSThomas Gubler2014-03-151-2/+2
| | | | |
| | | * | integrate range finder into fw landingThomas Gubler2014-03-151-17/+73
| | | |/
| * | | Merge remote-tracking branch 'upstream/master' into manualcontrolrenameThomas Gubler2014-05-121-22/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/commander/commander.cpp src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/uORB/topics/manual_control_setpoint.h
| | * | Remove noreturn attribute from all apps that actually can returnLorenz Meier2014-05-091-1/+1
| | | |
| | * | Replaces poshold/althold with posctrl/altctrlTickTock-2014-04-281-21/+21
| | | |
| | * | renamed EASY to POSHOLD and SEATBELT to ALTHOLDTickTock-2014-04-271-21/+21
| | |/
| * / fw pos control: use new manual control setpoint variable namesThomas Gubler2014-05-121-10/+10
| |/
* / navigator: lot's of cleanup (WIP)Julian Oes2014-04-211-6/+2
|/
* fw posctrl: change 2 functions that return nothing from int to voidThomas Gubler2014-03-101-4/+4
|
* launchdetection: better integration of Blocks classThomas Gubler2014-03-081-1/+2
|
* Merge remote-tracking branch 'upstream/master' into launchdetectorThomas Gubler2014-03-061-76/+58
|\ | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| * l1_pos_control: fix stupid 'if not' mistakeJulian Oes2014-02-241-1/+1
| |
| * l1_pos_control: set gndspeed_undershoot to 0 in loiterJulian Oes2014-02-241-1/+1
| |
| * Merge remote-tracking branch 'px4/beta' into fix_mission_diveJulian Oes2014-02-241-27/+11
| |\ | | | | | | | | | | | | Conflicts: src/modules/navigator/navigator_main.cpp
| | * fw autoland: add very short commentThomas Gubler2014-02-191-0/+2
| | |
| | * fw autoland: remove old commentsThomas Gubler2014-02-191-4/+0
| | |
| | * fw autoland: fix warningThomas Gubler2014-02-191-1/+1
| | |
| | * fw autoland: completely remove the virtual wp between the last wp and the ↵Thomas Gubler2014-02-191-21/+11
| | | | | | | | | | | | landing wp. autoland starts now from the last normal wp.