Commit Graph
161 Commits
Author SHA1 Message Date
Julian Oes 34731a4f4e Merge branch 'mtecs' into navigator_rewrite 2014-06-03 16:29:32 +02:00
Julian Oes 854bb7fe08 navigator: mission class added (WIP) 2014-06-03 16:01:28 +02:00
Thomas Gubler 10e2a66969 fw pos control: landing: continue horizontally instead of climbing if just below slope 2014-05-27 08:37:59 +02:00
Julian Oes 063caba36b Merge branch 'master' into navigator_rewrite
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
2014-05-26 20:19:11 +02:00
Thomas Gubler 77f0e8950f mtecs: rename variable 2014-05-25 15:45:20 +02:00
Thomas Gubler 0cddae02ab fw: resolve an issue when the aircraft was climbing before landing 2014-05-25 15:45:01 +02:00
Thomas Gubler 48d884ec8f mtecs: publish tecs status uorb message and small variable rename 2014-05-24 18:05:31 +02:00
Thomas Gubler 2a354c2d10 mtecs: fix usage of outputLimiter.limit 2014-05-24 14:07:51 +02:00
Thomas Gubler 8db5c932f9 Merge branch 'fwattrobustify' into mtecs 2014-05-21 21:53:26 +02:00
Lorenz Meier 328fc04d29 apps: Compile warning fixes 2014-05-21 14:22:01 +02:00
Thomas Gubler a28a38005c mtecs fix integrator 2014-05-19 08:49:25 +02:00
Thomas Gubler 885efa2cfe fw pos control: landing: fix argument order 2014-05-17 20:58:27 +02:00
Thomas Gubler 5d04bb74cb mtecs: check if input arguments are finite 2014-05-14 21:54:59 +02:00
Thomas Gubler 4d7cb184db mtecs: change main functions to int and add some comments 2014-05-14 18:19:07 +02:00
Thomas Gubler 5aea635a89 Merge remote-tracking branch 'upstream/master' into mtecs
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-05-13 21:25:08 +02:00
Thomas Gubler 8f6cd3a3ae Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
	src/modules/fw_att_control/fw_att_control_main.cpp
2014-05-13 09:28:46 +02:00
Thomas Gubler 47d21f0c57 Merge pull request #744 from thomasgubler/fw_landing_rangefinder
Fw landing rangefinder
2014-05-12 14:52:33 +02:00
Thomas Gubler 7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename
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
2014-05-12 09:39:52 +02:00
Thomas Gubler 1795d7d6e1 fw pos control: use new manual control setpoint variable names 2014-05-12 09:22:20 +02:00
Lorenz Meier 88194c5971 Remove noreturn attribute from all apps that actually can return 2014-05-09 09:20:08 +02:00
Thomas Gubler dd8bfc2a0b mtecs: landing mode which limits pitch and as well throttle at the end of the landing 2014-05-01 13:53:47 +02:00
TickTock- 31089a290b Replaces poshold/althold with posctrl/altctrl 2014-04-28 21:47:45 -07:00
TickTock- 269800b48c renamed EASY to POSHOLD and SEATBELT to ALTHOLD 2014-04-27 14:06:00 -07:00
Lorenz Meier 96ddea0826 Introduce debug option for mTECS and silence it as default 2014-04-27 12:45:02 +02:00
Julian Oes c3c0328e8b navigator: lot's of cleanup (WIP) 2014-04-21 17:36:59 +02:00
Thomas Gubler 671c7a115a simple underspeed protection for mtecs 2014-04-21 16:20:20 +02:00
Thomas Gubler 8fcdff15a4 mtecs: add comment about setting the standard limits 2014-04-06 14:58:31 +02:00
Thomas Gubler 1b3975c068 Merge branch 'mtecs' into mtecs_takeoff 2014-04-06 11:12:27 +02:00
Thomas Gubler 45cef9eed4 mtecs: better (but not final) default parameters for mtecs 2014-04-06 11:11:58 +02:00
Thomas Gubler 3e9dfcb6f7 mtecs: first rough version of takeoff mode 2014-03-27 22:57:29 +01:00
Thomas Gubler d3ca12f136 mtecs: BlockPDLimited: make sure dt > 0 2014-03-27 22:34:23 +01:00
Thomas Gubler d102afba8b mtecs: make sure dt is calculated before any control calculations 2014-03-27 22:12:01 +01:00
Thomas Gubler 0d526bddca fw_pos_control: whitespace in module.mk 2014-03-27 21:47:34 +01:00
Thomas Gubler 4824484497 mtecs: add FPA D gain 2014-03-27 21:22:22 +01:00
Thomas Gubler d8eeec6cdb mtecs: comment out debug code 2014-03-25 23:03:17 +01:00
Thomas Gubler f949395edf mtecs: correct a very wrong default param value 2014-03-25 22:25:16 +01:00
Julian Oes c81aefc756 mtecs: commented out warnx 2014-03-25 21:24:20 +01:00
Julian Oes b61e6f2706 mtecs: don't flow the stdout too much 2014-03-25 21:23:48 +01:00
Thomas Gubler 9c751fe9c5 mtecs 2014-03-23 09:15:04 +01:00
Thomas Gubler 50d3fe2a1a fw pos ctrl: add wrapper function for tecs 2014-03-23 09:10:18 +01:00
Lorenz Meier 6b610dc1f8 Hotfix for comment: Removed syntax-breaking symbol 2014-03-22 10:44:14 +01:00
Thomas Gubler 3074bced56 fix comment for FW_LND_RFRALT 2014-03-15 16:59:20 +01:00
Thomas Gubler 5894d72aa8 fw landing: do not use relative altitudes in TECS 2014-03-15 16:39:18 +01:00
Thomas Gubler 37d2cff83d set range finder to disabled as default 2014-03-15 16:03:26 +01:00
Thomas Gubler 3317259e79 integrate range finder into fw landing 2014-03-15 12:02:14 +01:00
Thomas Gubler e0cf0e3f41 fw posctrl: change 2 functions that return nothing from int to void 2014-03-10 22:47:22 +01:00
Thomas Gubler 935362b7a3 launchdetection: better integration of Blocks class 2014-03-08 19:00:49 +01:00
Thomas Gubler b086bdf21e Merge remote-tracking branch 'upstream/master' into launchdetector
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-03-06 21:53:51 +01:00
Thomas Gubler f2b46389ee fw: reset landing and takeoff state if switched to manual 2014-02-28 21:42:41 +01:00
Julian Oes 909e138182 l1_pos_control: fix stupid 'if not' mistake 2014-02-24 14:27:24 +01:00