Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | propagate uorb contants change through all modules/drivers | Thomas Gubler | 2015-01-28 | 1 | -9/+9 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-29 | 1 | -0/+2 |
|\ | | | | | | | | | Conflicts: .gitmodules | ||||
| * | turn on -Werror and fix resulting errors | Daniel Agar | 2014-12-22 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-25 | 1 | -57/+69 |
|\| | | | | | | | | | | | Conflicts: .gitignore src/lib/uavcan | ||||
| * | Merge pull request #1493 from PX4/fwposcontrolmode | Thomas Gubler | 2014-12-19 | 1 | -57/+69 |
| |\ | | | | | | | Fw pos control: small mode cleanup | ||||
| | * | fix comment style and type | Thomas Gubler | 2014-12-13 | 1 | -3/+3 |
| | | | |||||
| | * | fw pos ctrl: takeoff special case only in takeoff | Thomas Gubler | 2014-12-13 | 1 | -24/+27 |
| | | | |||||
| | * | fw pos control: improve mode logic slightly | Thomas Gubler | 2014-12-13 | 1 | -26/+36 |
| | | | |||||
| | * | fw pos control: better check for control mode | Thomas Gubler | 2014-12-13 | 1 | -5/+4 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-18 | 2 | -4/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | fw pos ctl: compile with -Os | Thomas Gubler | 2014-12-17 | 1 | -0/+2 |
| | | | |||||
| * | | fw pos ctl: make loop performance counter more meaningful | Thomas Gubler | 2014-12-17 | 1 | -4/+2 |
| |/ | |||||
* | | Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt | Thomas Gubler | 2014-12-16 | 1 | -1/+88 |
|\| | | | | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk | ||||
| * | fixed somereview comments | Friedemann Ludwig | 2014-11-30 | 1 | -5/+8 |
| | | |||||
| * | Implemented altitude and velocity hold mode | Friedemann Ludwig | 2014-11-28 | 1 | -1/+85 |
| | | |||||
* | | vehicle cotnrol mode as msg | Thomas Gubler | 2014-12-08 | 1 | -0/+1 |
| | | |||||
* | | 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 |
| | | |