Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite | Thomas Gubler | 2014-06-28 | 1 | -56/+16 |
|\ | |||||
| * | Merge remote-tracking branch 'upstream/master' into mtecs | Thomas Gubler | 2014-06-28 | 1 | -2/+12 |
| |\ | |||||
| * | | Remove old TECS implementation - we can really only decently flight-test and ↵ | Lorenz Meier | 2014-06-28 | 1 | -56/+16 |
| | | | | | | | | | | | | support one. | ||||
* | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-06-27 | 1 | -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 comments | Thomas Gubler | 2014-06-24 | 1 | -2/+0 |
| | | | |||||
| * | | fw pos ctrl: move setting of attitude integral reset flag | Thomas Gubler | 2014-06-24 | 1 | -5/+8 |
| | | | |||||
| * | | fw pos control: set integrator reset flags in attitude setpoint topic, set ↵ | Thomas Gubler | 2014-06-24 | 1 | -0/+9 |
| | | | | | | | | | | | | them to true when launchdetection is running (while waiting for launch) | ||||
* | | | Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite | Thomas Gubler | 2014-06-11 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | mtecs: small cleanup, move subclass to own file | Thomas Gubler | 2014-06-11 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into mtecs | Thomas Gubler | 2014-06-11 | 1 | -6/+0 |
| |\| | |||||
* | | | Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite | Julian Oes | 2014-06-06 | 1 | -6/+19 |
|\| | | |||||
| * | | fw pos control: don't call tecs 50hz update loop if mtecs is enabled | Thomas Gubler | 2014-06-01 | 1 | -1/+4 |
| | | | |||||
| * | | mtecs: do not calculate derivative in first iteration | Thomas Gubler | 2014-06-01 | 1 | -0/+1 |
| | | | |||||
| * | | mtecs publish state | Thomas Gubler | 2014-05-30 | 1 | -4/+4 |
| | | | |||||
| * | | fw pos control: set takeoff min pitch for mtecs | Thomas Gubler | 2014-05-28 | 1 | -1/+10 |
| | | | |||||
* | | | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-06 | 1 | -6/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | Remove unused loiter radius parameter. Fixes #1042 | Lorenz Meier | 2014-06-06 | 1 | -6/+0 |
| | | | |||||
* | | | Merge branch 'mtecs' into navigator_rewrite | Julian Oes | 2014-06-03 | 1 | -77/+160 |
|\ \ \ | | |/ | |/| | |||||
| * | | fw pos control: landing: continue horizontally instead of climbing if just ↵ | Thomas Gubler | 2014-05-27 | 1 | -3/+4 |
| | | | | | | | | | | | | below slope | ||||
| * | | fw: resolve an issue when the aircraft was climbing before landing | Thomas Gubler | 2014-05-25 | 1 | -4/+7 |
| | | | |||||
| * | | Merge branch 'fwattrobustify' into mtecs | Thomas Gubler | 2014-05-21 | 1 | -1/+1 |
| |\| | |||||
| * | | fw pos control: landing: fix argument order | Thomas Gubler | 2014-05-17 | 1 | -8/+22 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into mtecs | Thomas Gubler | 2014-05-13 | 1 | -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 Gubler | 2014-05-01 | 1 | -14/+8 |
| | | | | | | | | | | | | | | | | the landing | ||||
| * | | | mtecs: first rough version of takeoff mode | Thomas Gubler | 2014-03-27 | 1 | -2/+9 |
| | | | | |||||
| * | | | mtecs | Thomas Gubler | 2014-03-23 | 1 | -32/+69 |
| | | | | |||||
| * | | | fw pos ctrl: add wrapper function for tecs | Thomas Gubler | 2014-03-23 | 1 | -43/+53 |
| | | | | |||||
* | | | | navigator: mission class added (WIP) | Julian Oes | 2014-06-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 1 | -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 fixes | Lorenz Meier | 2014-05-21 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'upstream/master' into manualcontrolrename | Thomas Gubler | 2014-05-13 | 1 | -17/+73 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_att_control/fw_att_control_main.cpp | ||||
| | * \ | Merge pull request #744 from thomasgubler/fw_landing_rangefinder | Thomas Gubler | 2014-05-12 | 1 | -17/+73 |
| | |\ \ | | | | | | | | | | | Fw landing rangefinder | ||||
| | | * | | fw landing: do not use relative altitudes in TECS | Thomas Gubler | 2014-03-15 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | integrate range finder into fw landing | Thomas Gubler | 2014-03-15 | 1 | -17/+73 |
| | | |/ | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into manualcontrolrename | Thomas Gubler | 2014-05-12 | 1 | -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 return | Lorenz Meier | 2014-05-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | Replaces poshold/althold with posctrl/altctrl | TickTock- | 2014-04-28 | 1 | -21/+21 |
| | | | | |||||
| | * | | renamed EASY to POSHOLD and SEATBELT to ALTHOLD | TickTock- | 2014-04-27 | 1 | -21/+21 |
| | |/ | |||||
| * / | fw pos control: use new manual control setpoint variable names | Thomas Gubler | 2014-05-12 | 1 | -10/+10 |
| |/ | |||||
* / | navigator: lot's of cleanup (WIP) | Julian Oes | 2014-04-21 | 1 | -6/+2 |
|/ | |||||
* | fw posctrl: change 2 functions that return nothing from int to void | Thomas Gubler | 2014-03-10 | 1 | -4/+4 |
| | |||||
* | launchdetection: better integration of Blocks class | Thomas Gubler | 2014-03-08 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into launchdetector | Thomas Gubler | 2014-03-06 | 1 | -76/+58 |
|\ | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| * | l1_pos_control: fix stupid 'if not' mistake | Julian Oes | 2014-02-24 | 1 | -1/+1 |
| | | |||||
| * | l1_pos_control: set gndspeed_undershoot to 0 in loiter | Julian Oes | 2014-02-24 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'px4/beta' into fix_mission_dive | Julian Oes | 2014-02-24 | 1 | -27/+11 |
| |\ | | | | | | | | | | | | | Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| | * | fw autoland: add very short comment | Thomas Gubler | 2014-02-19 | 1 | -0/+2 |
| | | | |||||
| | * | fw autoland: remove old comments | Thomas Gubler | 2014-02-19 | 1 | -4/+0 |
| | | | |||||
| | * | fw autoland: fix warning | Thomas Gubler | 2014-02-19 | 1 | -1/+1 |
| | | | |||||
| | * | fw autoland: completely remove the virtual wp between the last wp and the ↵ | Thomas Gubler | 2014-02-19 | 1 | -21/+11 |
| | | | | | | | | | | | | landing wp. autoland starts now from the last normal wp. |