Commit Graph
271 Commits
Author SHA1 Message Date
Thomas Gubler 6f89514beb fix comment style and type 2014-12-13 17:20:53 +01:00
Thomas Gubler d0325f2b12 fw pos ctrl: takeoff special case only in takeoff 2014-12-13 17:20:42 +01:00
Thomas Gubler 5cd2ee8342 fw pos control: improve mode logic slightly 2014-12-13 12:36:33 +01:00
Thomas Gubler 59ec2401b6 fw pos control: better check for control mode 2014-12-13 00:48:27 +01:00
Friedemann Ludwig 6efc63d709 fixed somereview comments 2014-11-30 20:51:01 +01:00
Friedemann Ludwig 8e8b622f4f Implemented altitude and velocity hold mode 2014-11-28 04:11:39 +01:00
Thomas Gubler b64e675d53 Merge remote-tracking branch 'upstream/master' into swissfang 2014-10-07 10:02:01 +02:00
Thomas Gubler 5d52978bc7 Merge pull request #1341 from PX4/fwlandingterrain
FW landing: use terrain estimate
2014-10-07 10:01:16 +02:00
Thomas Gubler 3efffb68e7 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/geofence.cpp
	src/modules/navigator/mission.cpp
2014-09-28 12:36:26 +02:00
Thomas Gubler 852159d9ed fw pos control: add param to enable/disable usage of terrain estimate during landing 2014-09-23 09:37:28 +02:00
Thomas Gubler 32131a069e inform in GCS when switching to laser 2014-09-23 09:37:16 +02:00
Thomas Gubler ab2e93a5d0 Merge remote-tracking branch 'upstream/master' into fwlandingterrain 2014-09-23 09:36:10 +02:00
Thomas Gubler 1fb8e76f0a fix typo in comment 2014-09-22 10:54:18 +02:00
Thomas Gubler 3e41945cc6 flare pitch limit: apply at throttle lim altitude 2014-09-21 10:46:46 +02:00
Thomas Gubler 06ad49a690 Merge remote-tracking branch 'private_swissfang/stable' into obcfailsafe
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-09-13 15:50:51 +02:00
sjwilks 852b36661d Merge pull request #1356 from PX4/launchpitchlimit_master
FW: additional upper pitch limit during launch
2014-09-11 09:49:14 +02:00
Thomas Gubler 98d643fdf8 Merge branch 'launchpitchlimit' into launchpitchlimit_swissfang 2014-09-08 13:01:02 +02:00
Thomas Gubler df181455eb launch pitch limit: add mtecs interface 2014-09-08 13:00:26 +02:00
Thomas Gubler 33c0cd2e56 Merge remote-tracking branch 'private_swissfang/master' into launchpitchlimit_swissfang 2014-09-08 12:45:09 +02:00
Thomas Gubler daf1618420 additional upper pitch limit during launch
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.
2014-09-08 12:42:42 +02:00
Thomas Gubler 97f7c0088f fix typo in comment 2014-09-07 15:32:28 +02:00
Thomas Gubler 3d6fcfcf6b Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe 2014-09-07 15:25:54 +02:00
Thomas Gubler e056fbb703 add heightrate ff for tecs 2014-09-06 15:15:30 +02:00
Thomas Gubler 3684bf71d5 make flare pitch angle a param 2014-09-04 18:12:20 +02:00
Thomas Gubler bf3f8861dd fw landing: horiz flare check: fix wp distance
better calculation of wp distance when behind wp
2014-09-04 11:11:03 +02:00
Thomas Gubler dd1945bb76 add heightrate ff for tecs 2014-09-04 10:59:35 +02:00
Thomas Gubler 66c08c9b24 Merge branch 'flarehorizontallimit' into fwlandingterrain
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-09-03 19:22:14 +02:00
Thomas Gubler 082cd5f95d Merge remote-tracking branch 'upstream/master' into fwlandingterrain
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-09-03 19:19:36 +02:00
Thomas Gubler 139ca8c327 fw landing: impose horizontal limit for start of flare 2014-09-03 18:53:05 +02:00
Thomas Gubler 484f2864d1 remove warnx 2014-09-03 12:36:44 +02:00
Thomas Gubler e5650df321 Merge remote-tracking branch 'upstream/master' into obcfailsafe
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-09-03 09:20:06 +02:00
Thomas Gubler 7f0ba70b1e fw landing: if using terrain estimate, don't switch back during landing 2014-09-03 08:39:26 +02:00
Thomas Gubler 6188678f77 Merge pull request #1303 from PX4/launchdetectionstates
Launchdetection improvements
2014-09-03 00:29:33 +02:00
Thomas Gubler 18f0ee3f28 Merge remote-tracking branch 'upstream/master' into obcfailsafe
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-09-02 15:00:26 +02:00
Thomas Gubler 63e741824c fw landing: use terrain estimate from global pos 2014-09-01 11:27:28 +02:00
Lorenz Meier 22d2e26b9c Simply throttle limiting on approach - limit throttle still defaults to 1 2014-08-31 21:55:31 +02:00
Lorenz Meier 0e954b30c2 Rely on laser altitude once valid 2014-08-31 17:58:43 +02:00
Thomas Gubler ab022d5133 disable underspeed protection when landing also in tecs 2014-08-31 16:23:37 +02:00
Thomas Gubler c591444c1e fw pos control: set pitch sp correctly while waiting for launch 2014-08-25 12:48:14 +02:00
Thomas Gubler cfbbe60291 fw pos control: launchdetection logic cleanup 2014-08-23 12:41:48 +02:00
Thomas Gubler 9f5004be2d fw pos control: set default roll, pitch while waiting for launch 2014-08-23 12:13:30 +02:00
Thomas Gubler 40d47fb069 fw pos control: use new lauchdetector states 2014-08-23 11:45:20 +02:00
Thomas Gubler 64ca94412e engine fail: fw pos control limits pitch and sets 0 throttle 2014-08-19 07:31:55 +02:00
Lorenz Meier ff760d07b4 Add TECS logging 2014-08-03 13:19:10 +02:00
Lorenz Meier 020ac409be Remove airspeed and altitude raw data from TECS log, as we have these quantities already in the system log 2014-08-03 13:17:18 +02:00
Lorenz Meier 32e32d92bd Add throttle slew rate param 2014-08-01 14:39:24 +02:00
Lorenz Meier 2e4dff3fea removed debug statement from mTECS 2014-08-01 13:21:30 +02:00
Lorenz Meier 3b1c92e42f Make throttle time constant tunable separately, group TECS params correctly, make climbout alt configurable 2014-08-01 13:10:07 +02:00
Lorenz Meier 3969967002 Default to TECS 2014-07-31 12:16:11 +02:00
Lorenz Meier 39aa9112ba Fix threading in FW pos controller 2014-07-30 17:56:17 +02:00