Commit Graph

7880 Commits

Author SHA1 Message Date
Thomas Gubler f0a21c4f5f Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator
Conflicts:
	src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
2014-06-28 17:22:24 +02:00
Thomas Gubler 045ee8c7c7 Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite 2014-06-28 17:20:44 +02:00
Thomas Gubler 7b15a424f0 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-28 16:52:27 +02:00
Thomas Gubler 09fd154723 Merge pull request #1084 from PX4/mtecs_pure
Remove old TECS implementation - we can really only decently flight-test...
2014-06-28 16:51:58 +02:00
Thomas Gubler cd28679257 Merge pull request #1085 from PX4/geo_flashefficiency
geo lookup lib: Moved to separate module and compiling with -Os to save ...
2014-06-28 16:49:40 +02:00
Lorenz Meier e78d496e92 Enable new lookup lib 2014-06-28 12:51:22 +02:00
Lorenz Meier 13f9ce9ddd Comment fix in perf counter header, no code changes. 2014-06-28 12:38:31 +02:00
Lorenz Meier 2bd5511d09 geo lookup lib: Moved to separate module and compiling with -Os to save some precious flash 2014-06-28 12:37:26 +02:00
Lorenz Meier 503ded0539 Remove old TECS implementation - we can really only decently flight-test and support one. 2014-06-28 12:35:04 +02:00
Lorenz Meier 196edd8a4f estimator: Fix minor reporting issues 2014-06-28 12:12:08 +02:00
Thomas Gubler d45cc69d1d mtecs/wind: store wind variance 2014-06-27 21:44:56 +02:00
Lorenz Meier 12c2802fa3 estimator: Use the right perf counters to measure the quantities we are interested in 2014-06-27 16:23:53 +02:00
Lorenz Meier 8525ca4d24 Merge branch 'navigator_rewrite_estimator' of github.com:PX4/Firmware into navigator_rewrite_estimator 2014-06-27 15:05:09 +02:00
Lorenz Meier efb20d50bd estimator: Use improved error reporting API 2014-06-27 15:01:19 +02:00
Lorenz Meier 6951e1c95e estimator lib: Improve error reporting 2014-06-27 15:00:48 +02:00
Julian Oes b8d07532a7 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 14:41:19 +02:00
Julian Oes cc8f7f4c97 Merge branch 'master' into navigator_rewrite
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.h
	src/modules/mavlink/mavlink_messages.cpp
2014-06-27 14:39:36 +02:00
Lorenz Meier dbd99b6494 Merge branch 'navigator_rewrite_estimator' of github.com:PX4/Firmware into navigator_rewrite_estimator 2014-06-27 13:37:15 +02:00
Julian Oes 049e448abf Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 13:36:33 +02:00
Lorenz Meier 3195eb1005 estimator: Remove bogus timeout flag, do not reset states not in need of a reset. Do not alter baro offset or GPS positions. 2014-06-27 13:35:23 +02:00
Lorenz Meier 615277d346 Better comments in estimator 2014-06-27 13:29:04 +02:00
Julian Oes 3aab37e0e0 Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite 2014-06-27 13:07:20 +02:00
Anton Babushkin affc312411 navigator: make MissionBlock subclass of NavigatorMode 2014-06-27 11:34:19 +02:00
Anton Babushkin 52eb49ba0b navigator: use common "acceptance radius" parameter for all modes 2014-06-27 11:09:49 +02:00
Julian Oes 19fad94a34 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 11:02:47 +02:00
Anton Babushkin 1bae18377a navigator: is_mission_item_reached() for LOITER items fixed 2014-06-27 00:29:00 +02:00
Anton Babushkin 9ae44291b1 navigator: added NAV_CMD_IDLE, added RTL_STATE_LOITER and RTL_STATE_LANDED instead of FINISHED 2014-06-27 00:27:08 +02:00
Anton Babushkin 8e8798a522 navigator: spaces/tabs fixed, old commented code removed 2014-06-26 23:39:17 +02:00
Thomas Gubler f3a77705a7 Merge pull request #1080 from PX4/hb_fix
mavlink: Always send heartbeat and do not require both topics to update
2014-06-26 16:37:49 +02:00
Lorenz Meier f76040e554 mavlink: Always send heartbeat and do not require both topics to update 2014-06-26 16:18:46 +02:00
Anton Babushkin 6e5aafb3a7 navigator: minor formatting fix 2014-06-26 13:44:41 +02:00
Thomas Gubler 3e76be0d69 Merge pull request #1077 from PX4/arming_feedback_fix
Arming feedback fix
2014-06-26 12:40:49 +02:00
Lorenz Meier 2eb3077f46 Merge pull request #1073 from PX4/launchdetectorreset
FW: reset attitude control integrals in launchdetection mode (when waiting for takeoff)
2014-06-26 12:21:20 +02:00
Anton Babushkin 63e14c73ba navigator: don't reset RTL state on loiter 2014-06-26 12:18:19 +02:00
Lorenz Meier 547f71d791 Add mavlink_fd to all commander arm transitions to provide user feedback why the arming command failed 2014-06-26 12:09:54 +02:00
Lorenz Meier 43c3559763 commander: Make mavlink_fd in arming command non-optional 2014-06-26 12:09:43 +02:00
Thomas Gubler 831a3d4ed1 mtecs: improve logic readability 2014-06-26 07:47:46 +02:00
Anton Babushkin c5a5604ae9 navigator: loiter fixes 2014-06-26 00:17:25 +02:00
Lorenz Meier 3e0c318311 Merge pull request #1076 from PX4/mavlinkrevert
Revert "Hotfix: Only orb_copy items in mavlink app if the timestamp changed"
2014-06-25 22:37:19 +02:00
Anton Babushkin 39454ca99d navigator: RTL return altitude fixed 2014-06-25 17:56:30 +02:00
Anton Babushkin bdf1b9274c commander: modes fallback and reject messages fixed 2014-06-25 17:56:11 +02:00
Anton Babushkin 9d3d5a30af navigator: move set_previous_pos_sp to MissionBlock class 2014-06-25 17:31:12 +02:00
Thomas Gubler f9d5cf332c Revert "Hotfix: Only orb_copy items in mavlink app if the timestamp changed"
This reverts commit a9653fa10d.
2014-06-25 17:05:20 +02:00
Thomas Gubler 4f560f729e fw pos ctrl: remove comments 2014-06-24 20:53:06 +02:00
Thomas Gubler 819812e112 fw pos ctrl: move setting of attitude integral reset flag 2014-06-24 20:52:24 +02:00
Lorenz Meier 7f41ec52f1 estimator: Introduce debug level to allow high-res bench debugging - set with ekf_att_pos_estimator debug <level, e.g. 100> 2014-06-24 20:48:18 +02:00
Lorenz Meier 32319722a6 Retry fusion sooner on failures 2014-06-24 20:47:22 +02:00
Thomas Gubler 9904ed878e Merge remote-tracking branch 'upstream/master' into launchdetectorreset 2014-06-24 20:45:48 +02:00
Thomas Gubler c6cdcfc263 fw pos control: set integrator reset flags in attitude setpoint topic, set them to true when launchdetection is running (while waiting for launch) 2014-06-24 17:42:21 +02:00
Thomas Gubler 9a911f7388 fw att control: reset integrators when requested via attitude setpoint topic 2014-06-24 17:40:56 +02:00