Commit Graph

842 Commits

Author SHA1 Message Date
Anton Babushkin 8c4b35cc23 Merge branch 'master' into offboard2 2014-05-16 12:12:43 +02:00
Lorenz Meier 1e13b5a02c commander: Reduce calibration count, minimally reduce stack sizes after careful inspection 2014-05-15 09:02:31 +02:00
Lorenz Meier 8dc0a21a7e mavlink, commander: Get back close to original stack sizes. Although tests came clean, we do not want to take any chances 2014-05-15 07:14:58 +02:00
Lorenz Meier 531ba79e55 Reduce commander stack size mildly 2014-05-14 19:34:37 +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 cde4c9addb commander: use new manual control setpoint variable names 2014-05-12 09:21:39 +02:00
Lorenz Meier dd04a70afa Reporting cleanup, use different variables for different state switching results to avoid being tripped on local / global name scope 2014-05-11 18:10:02 +02:00
Anton Babushkin 349809f535 sensors, commander: code style fixed 2014-05-11 13:36:51 +02:00
Anton Babushkin 88b18bbad1 ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL 2014-05-11 13:35:05 +02:00
Lorenz Meier e18bdfdf65 Merge pull request #858 from TickTock-/rc_merged
Rc merged
2014-05-08 23:21:22 -07:00
Julian Oes 26f5e550c4 Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params
Conflicts:
	src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp
2014-05-07 21:11:21 +02:00
Lorenz Meier 8dd0453edc Merge pull request #909 from PX4/failsafe_reporting
Much better failsafe reporting on failsafe state changes
2014-05-07 02:10:53 -07:00
Lorenz Meier 0c318f9ad7 commander: Fix the position failsafe to a) use proper logic to determine if eph / epv are good or not (the previous logic was in some states not initialized) and b) add a hysteresis time - because the check as it was before had zero hysteresis time for a bad eph / epv value 2014-05-07 08:42:57 +02:00
Lorenz Meier 32b84b9652 Much better failsafe reporting on failsafe state changes 2014-05-06 21:46:59 +02:00
Lorenz Meier 1d6b9fae03 Fix in-air restarts, protect against an external MAVLink sender exploiting the restart mechanism 2014-05-06 14:57:06 +02:00
Thomas Gubler 548c7f4aaf geo: introduce global/local coordinate frame converter which uses the map projection but also converts altitude 2014-05-06 14:56:47 +02:00
Thomas Gubler 596b06ff2e commander: init gps eph and epv to large values, safer map projection initialization 2014-05-06 11:24:43 +02:00
Thomas Gubler 7ab428976e fix wrong variable name 2014-05-05 16:49:21 +02:00
Thomas Gubler 6e0690fde1 init global map projection when gps is valid 2014-05-05 16:44:02 +02:00
Thomas Gubler 67e3c808d2 remove home position valid flag 2014-05-05 15:40:02 +02:00
Thomas Gubler 60ccbaa8bb init global map reference in commander and not in navigator 2014-05-05 15:37:53 +02:00
TickTock- 6c76e8ea50 shortened rc_assisted_th to rc_assist_th in case we add a dedicated switch mapping later 2014-04-29 20:51:04 -07:00
Thomas Gubler 775499321a Merge remote-tracking branch 'upstream/master' into geo 2014-04-29 15:42:07 +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
TickTock- 6a7b104c2b compiles 2014-04-27 13:12:28 -07:00
TickTock- 07c35010aa Merged in upstream master 2014-04-27 12:43:13 -07:00
Lorenz Meier e6d332aa7c Make commander less pedantic about position status 2014-04-27 15:50:53 +02:00
Lorenz Meier c74248c8b1 Merged mpc_rc with master 2014-04-27 15:45:33 +02:00
Julian Oes 03d87c2660 Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_home_init
Conflicts:
	src/drivers/gps/gps.cpp
2014-04-27 11:41:34 +02:00
Julian Oes 721c90291c commander: some HIL commands and land detector cleanup 2014-04-27 02:26:09 +02:00
Julian Oes e8531e8360 Merge remote-tracking branch 'px4/ekf_home_init' into navigator_cleanup_ekf_home_init
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/mc_pos_control/mc_pos_control_main.cpp
	src/modules/navigator/navigator_main.cpp
	src/modules/uORB/topics/vehicle_global_position.h
2014-04-26 23:08:11 +02:00
Lorenz Meier 6612cdab85 Let commander be less pedantic about positioning data 2014-04-26 18:36:09 +02:00
Lorenz Meier 13dfe0447c Send current local position estimate as well 2014-04-26 16:07:29 +02:00
Lorenz Meier 22d3bcdab6 Merged mpc_rc into ekf_params 2014-04-26 15:13:03 +02:00
Julian Oes 3a12cb4648 Merge remote-tracking branch 'px4/master' into navigator_cleanup 2014-04-26 12:56:18 +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
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 2453b354fa Failsafe landing without position control fixed 2014-04-25 22:26:51 +02:00
Thomas Gubler 06dd10cb01 commander: set home position valid flag 2014-04-25 15:08:38 +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
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
Anton Babushkin 2998685a3a Merge branch 'mpc_local_pos' into mpc_rc 2014-04-23 14:22:52 +02: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 e4a4430f9f Merge branch 'master' into rc_timeout 2014-04-22 11:18:07 +02:00
Anton Babushkin 302233a34f Merge branch 'master' into mpc_local_pos 2014-04-22 11:13:11 +02:00