Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move px4_defines file | Thomas Gubler | 2014-12-02 | 1 | -1/+1 |
| | |||||
* | make default apps compatible with autogenerated attitude and rc_channels message | Thomas Gubler | 2014-12-02 | 1 | -1/+2 |
| | |||||
* | fix order of arguments (merge fix)uorbtinymerge | Thomas Gubler | 2014-11-25 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-10-07 | 2 | -74/+84 |
|\ | |||||
| * | Merge pull request #1341 from PX4/fwlandingterrain | Thomas Gubler | 2014-10-07 | 2 | -74/+84 |
| |\ | | | | | | | FW landing: use terrain estimate | ||||
| | * | fw pos control: add param to enable/disable usage of terrain estimate during ↵ | Thomas Gubler | 2014-09-23 | 2 | -6/+8 |
| | | | | | | | | | | | | landing | ||||
| | * | inform in GCS when switching to laser | Thomas Gubler | 2014-09-23 | 1 | -1/+4 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' into fwlandingterrain | Thomas Gubler | 2014-09-23 | 2 | -6/+34 |
| | |\ | |||||
| | * | | flare pitch limit: apply at throttle lim altitude | Thomas Gubler | 2014-09-21 | 2 | -1/+3 |
| | | | | |||||
| | * | | make flare pitch angle a param | Thomas Gubler | 2014-09-04 | 2 | -62/+86 |
| | | | | |||||
| | * | | fw landing: horiz flare check: fix wp distance | Thomas Gubler | 2014-09-04 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | better calculation of wp distance when behind wp | ||||
| | * | | Merge branch 'flarehorizontallimit' into fwlandingterrain | Thomas Gubler | 2014-09-03 | 1 | -2/+5 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| | | * | | fw landing: impose horizontal limit for start of flare | Thomas Gubler | 2014-09-03 | 1 | -1/+5 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' into fwlandingterrain | Thomas Gubler | 2014-09-03 | 1 | -42/+59 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| | * | | | remove warnx | Thomas Gubler | 2014-09-03 | 1 | -3/+0 |
| | | | | | |||||
| | * | | | fw landing: if using terrain estimate, don't switch back during landing | Thomas Gubler | 2014-09-03 | 1 | -9/+14 |
| | | | | | |||||
| | * | | | fw landing: use terrain estimate from global pos | Thomas Gubler | 2014-09-01 | 1 | -58/+24 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/master' into HEAD | Thomas Gubler | 2014-09-28 | 2 | -66/+95 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/navigator/geofence.cpp src/modules/navigator/mission.cpp | ||||
| | * | | | Merge pull request #1356 from PX4/launchpitchlimit_master | sjwilks | 2014-09-11 | 1 | -6/+22 |
| | |\ \ \ | | | | | | | | | | | | | FW: additional upper pitch limit during launch | ||||
| | * | | | | add heightrate ff for tecs | Thomas Gubler | 2014-09-06 | 2 | -59/+71 |
| | | |_|/ | | |/| | | |||||
| * | | | | fix typo in comment | Thomas Gubler | 2014-09-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'private_swissfang/stable' into obcfailsafe | Thomas Gubler | 2014-09-13 | 1 | -6/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| * \ \ \ \ | Merge branch 'launchpitchlimit' into launchpitchlimit_swissfang | Thomas Gubler | 2014-09-08 | 1 | -5/+15 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | launch pitch limit: add mtecs interface | Thomas Gubler | 2014-09-08 | 1 | -5/+15 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'private_swissfang/master' into ↵ | Thomas Gubler | 2014-09-08 | 2 | -59/+71 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | launchpitchlimit_swissfang | ||||
| * | | | | | additional upper pitch limit during launch | Thomas Gubler | 2014-09-08 | 1 | -3/+9 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | The pitch limit can be used by the laucnhdetector to limit pitch during critical phases of a launch. For example this can be used to limit pitch while attached to a bungee differently from the standard pitch limit. | ||||
* | | | | | fix typo in comment | Thomas Gubler | 2014-09-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe | Thomas Gubler | 2014-09-07 | 2 | -59/+71 |
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| * | | | add heightrate ff for tecs | Thomas Gubler | 2014-09-04 | 2 | -59/+71 |
| |/ / | |||||
* | | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-09-03 | 1 | -44/+62 |
|\| | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| * | | Merge pull request #1303 from PX4/launchdetectionstates | Thomas Gubler | 2014-09-03 | 1 | -42/+59 |
| |\ \ | | |/ | |/| | Launchdetection improvements | ||||
| | * | fw pos control: set pitch sp correctly while waiting for launch | Thomas Gubler | 2014-08-25 | 1 | -2/+8 |
| | | | |||||
| | * | fw pos control: launchdetection logic cleanup | Thomas Gubler | 2014-08-23 | 1 | -26/+18 |
| | | | |||||
| | * | fw pos control: set default roll, pitch while waiting for launch | Thomas Gubler | 2014-08-23 | 1 | -1/+7 |
| | | | |||||
| | * | fw pos control: use new lauchdetector states | Thomas Gubler | 2014-08-23 | 1 | -30/+43 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' into obcfailsafe | Thomas Gubler | 2014-09-02 | 2 | -5/+20 |
|\| | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| * | | Simply throttle limiting on approach - limit throttle still defaults to 1 | Lorenz Meier | 2014-08-31 | 2 | -4/+15 |
| | | | |||||
| * | | Rely on laser altitude once valid | Lorenz Meier | 2014-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | disable underspeed protection when landing also in tecs | Thomas Gubler | 2014-08-31 | 1 | -0/+3 |
| |/ | |||||
* / | engine fail: fw pos control limits pitch and sets 0 throttle | Thomas Gubler | 2014-08-19 | 1 | -13/+52 |
|/ | |||||
* | Add TECS logging | Lorenz Meier | 2014-08-03 | 1 | -0/+47 |
| | |||||
* | Remove airspeed and altitude raw data from TECS log, as we have these ↵ | Lorenz Meier | 2014-08-03 | 1 | -4/+2 |
| | | | | quantities already in the system log | ||||
* | Add throttle slew rate param | Lorenz Meier | 2014-08-01 | 2 | -0/+16 |
| | |||||
* | removed debug statement from mTECS | Lorenz Meier | 2014-08-01 | 1 | -1/+0 |
| | |||||
* | Make throttle time constant tunable separately, group TECS params correctly, ↵ | Lorenz Meier | 2014-08-01 | 2 | -14/+46 |
| | | | | make climbout alt configurable | ||||
* | Default to TECS | Lorenz Meier | 2014-07-31 | 1 | -1/+1 |
| | |||||
* | Fix threading in FW pos controller | Lorenz Meier | 2014-07-30 | 1 | -44/+43 |
| | |||||
* | Disable mTECS until runtime error is better understood | Lorenz Meier | 2014-07-30 | 2 | -28/+29 |
| | |||||
* | Re-add two params that fell off the truck before | Lorenz Meier | 2014-07-29 | 1 | -0/+4 |
| | |||||
* | Revert "Remove old TECS implementation - we can really only decently ↵ | Lorenz Meier | 2014-07-29 | 1 | -16/+58 |
| | | | | | | | | | | flight-test and support one." This reverts commit 503ded05394767d58359834e73bc63672b701dbe. Conflicts: mavlink/include/mavlink/v1.0 src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp |