Commit Graph

13526 Commits

Author SHA1 Message Date
Julian Oes 3a12cb4648 Merge remote-tracking branch 'px4/master' into navigator_cleanup 2014-04-26 12:56:18 +02:00
Julian Oes ea0142810a navigator: comments and whitespace 2014-04-26 12:55:27 +02:00
Julian Oes 9f857f86e4 navigator: corrected the RTL waypoint types 2014-04-26 12:24:52 +02:00
Lorenz Meier 4a949a9565 Merge pull request #749 from DonLakeFlyer/ArmDisarm
Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM
2014-04-26 12:24:42 +02:00
Lorenz Meier 5bd8e6f6b3 Merge pull request #845 from PX4/mag_decl_hotfix
Mag declination hotfix
2014-04-26 12:23:48 +02:00
Lorenz Meier eb520e7dcd Merge pull request #849 from PX4/compile_pedantic
Compile pedantic
2014-04-26 12:22:13 +02:00
Julian Oes db5266d3df Merge remote-tracking branch 'px4/master' into navigator_cleanup 2014-04-26 11:59:33 +02:00
Julian Oes 3411d58dfc Merge branch 'navigator_cleanup' of github.com:PX4/Firmware into navigator_cleanup 2014-04-26 11:44:09 +02:00
Julian Oes c0d4ecf2b6 navigator: some warnings and cleanup 2014-04-26 11:42:46 +02:00
TickTock- 31b5d0f5c8 Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged 2014-04-25 20:30:01 -07:00
Anton Babushkin 84943644d7 mc_pos_control: parameters comments minor fixes 2014-04-25 23:06:32 +02:00
Anton Babushkin a432ed4900 mc_pos_control: convert tilt_max to degrees 2014-04-25 22:53:48 +02:00
Anton Babushkin 2453b354fa Failsafe landing without position control fixed 2014-04-25 22:26:51 +02:00
Anton Babushkin 0c1de81785 Merge branch 'master' into mpc_rc 2014-04-25 21:39:59 +02:00
Lorenz Meier f0298e005a Merge pull request #852 from PX4/sensors_loop
sensors: Keep looping in sensors app even if gyros do not update any mor...
2014-04-25 16:52:53 +02:00
Thomas Gubler 35b0c29456 navigator: set reference for map projection only once 2014-04-25 15:09:11 +02:00
Thomas Gubler 06dd10cb01 commander: set home position valid flag 2014-04-25 15:08:38 +02:00
Thomas Gubler f7e18eaa58 uorb home position topic: add valid flag 2014-04-25 15:08:06 +02:00
Thomas Gubler 241a99fc28 position estimator mc: do not initialize map projection because this is now handled globally 2014-04-25 14:45:21 +02:00
Thomas Gubler 08bc777208 pos estimator inav: use map_projection_reference to set local pos reference lat lon 2014-04-25 13:57:06 +02:00
Thomas Gubler a467bd61c1 Merge remote-tracking branch 'upstream/mpc_rc' into geo 2014-04-25 13:31:31 +02:00
Thomas Gubler 5285eb2f99 fw att pos estimator: use map projection reference values for local pos 2014-04-25 09:44:40 +02:00
Thomas Gubler 7e1ea35571 mavlink receiver: in hil use map_projection_timestamp for hil_local_pos.ref_timestamp 2014-04-25 09:43:19 +02:00
Thomas Gubler f5d9023b10 navigator: set home_pos timestamp as map projection reference timestamp 2014-04-25 09:42:28 +02:00
Anton Babushkin 22aaae197b Merge branch 'rc_timeout' into mpc_rc 2014-04-24 22:40:46 +02:00
Anton Babushkin 63c50676f9 MISSION switch renamed to LOITER 2014-04-24 22:38:19 +02:00
Thomas Gubler 4e30784d6c rename map_projection_inited to map_projection_initialized 2014-04-24 17:16:20 +02:00
Thomas Gubler 618ac319e6 pos estimator inav: check if map projection is initialized 2014-04-24 17:06:10 +02:00
Thomas Gubler 9f2da53f08 mc pos control: map projection init not needed anymore 2014-04-24 17:05:30 +02:00
Thomas Gubler cfe346ddfa Merge remote-tracking branch 'upstream/master' into mtecs 2014-04-24 16:19:42 +02:00
Thomas Gubler be0824c207 Merge remote-tracking branch 'upstream/master' into geo 2014-04-24 16:17:16 +02:00
Thomas Gubler 8bb1b39399 mavlink receiver: hil: local pos reference lat lon from first data 2014-04-24 16:12:28 +02:00
Thomas Gubler fbcb248bc3 navigator: init map projection on home pos update 2014-04-24 15:59:49 +02:00
Thomas Gubler 3a898e54ad towards a global map projection instance, WIP: need to remove local updates of the reference and add a global map update 2014-04-24 14:30:29 +02:00
Anton Babushkin db474072a7 Merge branch 'rc_timeout' into mpc_rc 2014-04-23 19:03:03 +02:00
Anton Babushkin 56592ec77d commander: don't start RTL on failsafe if landed 2014-04-23 19:01:05 +02:00
Thomas Gubler d7d6a3d3b7 filter gps simulation hil gps message with sysid 2014-04-23 16:26:44 +02:00
Thomas Gubler a2940182ef add parameter to mavlink app to allow parsing of HIL GPS message even if not in HIL mode
Conflicts:
	src/modules/mavlink/mavlink_receiver.cpp
2014-04-23 15:53:48 +02:00
Anton Babushkin 34597599fc navigator: merging bug fixed 2014-04-23 15:26:24 +02:00
Anton Babushkin dc8a0b291a Merge branch 'mpc_local_pos' into mpc_rc 2014-04-23 15:25:13 +02:00
Anton Babushkin 320c97c498 navigator: check if mission reached on vehicle_status updates 2014-04-23 15:24:45 +02:00
Anton Babushkin 2998685a3a Merge branch 'mpc_local_pos' into mpc_rc 2014-04-23 14:22:52 +02:00
Anton Babushkin 60554c8a56 navigator: publish global_position_setpoint on vehicle_status updates 2014-04-23 14:15:59 +02:00
TickTock- 971e8fc4ff Made failsafe more intuitive. Default (0) maps to whatever channel is throttle. If a non-zero value is entered, a direct channel map is used so use 2014-04-22 23:19:04 -07:00
TickTock- 81c03154b9 Added ASSISTED, AUTO, EASY, RETURN, & LOITER programmable thresholds to enable various user mode switch configs (orig., 2x3, 1x6, etc). 2014-04-22 21:49:29 -07:00
TickTock- 831a7c4a83 Added RC_MAP_FAILSAFE parameter for customizing failsafe channel. Default to THROTTLE 2014-04-22 20:53:07 -07:00
TickTock- 7e621070ca renamed mission_switch to loiter_switch and assisted_switch to easy_switch 2014-04-22 18:23:27 -07:00
TickTock- d6e6ee3440 Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into rc_merged 2014-04-22 17:43:36 -07:00
Anton Babushkin a1cf8801bb sdlog2: add failsafe state logging 2014-04-22 11:36:25 +02:00
Anton Babushkin e4a4430f9f Merge branch 'master' into rc_timeout 2014-04-22 11:18:07 +02:00