Commit Graph

7792 Commits

Author SHA1 Message Date
Anton Babushkin 12be974bd6 navigator: whitespace fix 2014-06-29 13:07:38 +02:00
Anton Babushkin 8ddccb2dae Merge branch 'navigator_rewrite' into navigator_rewrite_drton 2014-06-28 00:54:58 +02:00
Anton Babushkin 456e628e12 navigator: NavigatorMode and MissionBlock API cleanup 2014-06-28 00:54:27 +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
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
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
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
Thomas Gubler 52d539d3cd extend integrator reset flags in uorb attitude setpoint topic to all axes 2014-06-24 17:39:48 +02:00
Lorenz Meier 68442e31ac Hotfix: Move channel count to right position 2014-06-23 14:56:48 +02:00
Lorenz Meier bf5061aa21 Fix error reporting in stream config, report if a stream was not found at all in stream list and return error 2014-06-23 13:52:09 +02:00
Lorenz Meier a9653fa10d Hotfix: Only orb_copy items in mavlink app if the timestamp changed 2014-06-23 13:51:05 +02:00
Lorenz Meier 87857cdd48 Hotfix: Fix message name typo 2014-06-23 13:45:20 +02:00
Lorenz Meier d58a992e91 Hotfix: Improve PX4IO monitor command 2014-06-23 13:44:36 +02:00
Lorenz Meier 59dfca8507 Merge pull request #1071 from PX4/percounterunit
perf_counter: write time unit for all fields
2014-06-23 12:45:24 +02:00
Thomas Gubler cfdbf2c5e9 perfcounter: write time unit for all fields 2014-06-23 11:15:27 +02:00
Julian Oes a43918de8d Merge pull request #1068 from PX4/phantomesc
phantom: silence ESC
2014-06-23 09:43:10 +02:00
Thomas Gubler 60e93deaa3 phantom: silence ESC 2014-06-23 07:44:30 +02:00
Lorenz Meier e0a6834606 Merge pull request #928 from PX4/ekf_auto_mag_decl
attitude_estimator_ekf: auto detect mag declination using GPS
2014-06-21 20:05:43 +02:00
Lorenz Meier 4164e0a0ca Merge pull request #969 from PX4/mavlink_stack
Mavlink stack usage improvements
2014-06-21 20:05:04 +02:00
Julian Oes e0c78e51e3 mavlink: only publish telemetry status from GCS 2014-06-19 14:14:24 +02:00
Julian Oes 5bab3b1bac Merge pull request #1057 from achambers16/navigator_rewrite_modes_list
Navigator rewrite: create list of navigation modes
2014-06-19 10:36:32 +02:00
Julian Oes 62faa2ee51 commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) 2014-06-19 10:26:56 +02:00
Julian Oes 94e004955d mavlink: publish telemtry status without radio status 2014-06-19 09:33:28 +02:00
Julian Oes e24925c743 commander: added some failsafe logic 2014-06-18 19:01:41 +02:00
Anton Babushkin 55e5f747de commander: modes display fixes, don't activate failsafe while disarmed 2014-06-17 13:19:50 +02:00
Anton Babushkin e0ed0625f8 commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions 2014-06-16 17:34:21 +02:00
Anton Babushkin 91f0b9eee4 mavlink: store last heartbeat time in telemetry_status topic 2014-06-16 17:32:58 +02:00