aboutsummaryrefslogtreecommitdiff
path: root/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* fix incorrect argc < 1 check for no argumentsDaniel Agar2015-04-181-1/+2
| | | | -requiring arguments should be argc < 2
* FW pos control: Adjust stack size to real useLorenz Meier2015-03-081-1/+1
|
* propagate uorb contants change through all modules/driversThomas Gubler2015-01-281-9/+9
|
* Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-12-251-57/+69
|\ | | | | | | | | | | Conflicts: .gitignore src/lib/uavcan
| * Merge pull request #1493 from PX4/fwposcontrolmodeThomas Gubler2014-12-191-57/+69
| |\ | | | | | | Fw pos control: small mode cleanup
| | * fix comment style and typeThomas Gubler2014-12-131-3/+3
| | |
| | * fw pos ctrl: takeoff special case only in takeoffThomas Gubler2014-12-131-24/+27
| | |
| | * fw pos control: improve mode logic slightlyThomas Gubler2014-12-131-26/+36
| | |
| | * fw pos control: better check for control modeThomas Gubler2014-12-131-5/+4
| | |
* | | Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-12-181-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 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: make loop performance counter more meaningfulThomas Gubler2014-12-171-4/+2
| |/
* | Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcattThomas Gubler2014-12-161-1/+88
|\| | | | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk
| * fixed somereview commentsFriedemann Ludwig2014-11-301-5/+8
| |
| * Implemented altitude and velocity hold modeFriedemann Ludwig2014-11-281-1/+85
| |
* | vehicle cotnrol mode as msgThomas Gubler2014-12-081-0/+1
| |
* | move px4_defines fileThomas Gubler2014-12-021-1/+1
| |
* | make default apps compatible with autogenerated attitude and rc_channels messageThomas Gubler2014-12-021-1/+2
|/
* Merge remote-tracking branch 'upstream/master' into swissfangThomas Gubler2014-10-071-69/+63
|\
| * Merge pull request #1341 from PX4/fwlandingterrainThomas Gubler2014-10-071-69/+63
| |\ | | | | | | FW landing: use terrain estimate
| | * fw pos control: add param to enable/disable usage of terrain estimate during ↵Thomas Gubler2014-09-231-1/+5
| | | | | | | | | | | | landing
| | * inform in GCS when switching to laserThomas Gubler2014-09-231-1/+4
| | |
| | * Merge remote-tracking branch 'upstream/master' into fwlandingterrainThomas Gubler2014-09-231-6/+27
| | |\
| | * | flare pitch limit: apply at throttle lim altitudeThomas Gubler2014-09-211-1/+1
| | | |
| | * | make flare pitch angle a paramThomas Gubler2014-09-041-3/+11
| | | |
| | * | fw landing: horiz flare check: fix wp distanceThomas Gubler2014-09-041-3/+11
| | | | | | | | | | | | | | | | better calculation of wp distance when behind wp
| | * | Merge branch 'flarehorizontallimit' into fwlandingterrainThomas Gubler2014-09-031-2/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| | | * | fw landing: impose horizontal limit for start of flareThomas Gubler2014-09-031-1/+5
| | | | |
| | * | | Merge remote-tracking branch 'upstream/master' into fwlandingterrainThomas Gubler2014-09-031-42/+59
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| | * | | remove warnxThomas Gubler2014-09-031-3/+0
| | | | |
| | * | | fw landing: if using terrain estimate, don't switch back during landingThomas Gubler2014-09-031-9/+14
| | | | |
| | * | | fw landing: use terrain estimate from global posThomas Gubler2014-09-011-58/+24
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into HEADThomas Gubler2014-09-281-7/+29
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | 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_mastersjwilks2014-09-111-6/+22
| | |\ \ \ | | | | | | | | | | | | FW: additional upper pitch limit during launch
| | * | | | add heightrate ff for tecsThomas Gubler2014-09-061-0/+5
| | | |_|/ | | |/| |
| * | | | fix typo in commentThomas Gubler2014-09-221-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'private_swissfang/stable' into obcfailsafeThomas Gubler2014-09-131-6/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| * \ \ \ \ Merge branch 'launchpitchlimit' into launchpitchlimit_swissfangThomas Gubler2014-09-081-5/+15
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | launch pitch limit: add mtecs interfaceThomas Gubler2014-09-081-5/+15
| | | | | |
| * | | | | Merge remote-tracking branch 'private_swissfang/master' into ↵Thomas Gubler2014-09-081-0/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | launchpitchlimit_swissfang
| * | | | | additional upper pitch limit during launchThomas Gubler2014-09-081-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 commentThomas Gubler2014-09-071-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'private_swissfang/master' into obcfailsafeThomas Gubler2014-09-071-0/+5
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | add heightrate ff for tecsThomas Gubler2014-09-041-0/+5
| |/ /
* | | Merge remote-tracking branch 'upstream/master' into obcfailsafeThomas Gubler2014-09-031-44/+62
|\| | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| * | Merge pull request #1303 from PX4/launchdetectionstatesThomas Gubler2014-09-031-42/+59
| |\ \ | | |/ | |/| Launchdetection improvements
| | * fw pos control: set pitch sp correctly while waiting for launchThomas Gubler2014-08-251-2/+8
| | |
| | * fw pos control: launchdetection logic cleanupThomas Gubler2014-08-231-26/+18
| | |
| | * fw pos control: set default roll, pitch while waiting for launchThomas Gubler2014-08-231-1/+7
| | |
| | * fw pos control: use new lauchdetector statesThomas Gubler2014-08-231-30/+43
| | |
* | | Merge remote-tracking branch 'upstream/master' into obcfailsafeThomas Gubler2014-09-021-1/+11
|\| | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp