Commit Graph

3022 Commits

Author SHA1 Message Date
Andrew Tridgell
a8dc1be4de Copter: fixed non-EKF copter build 2014-02-15 05:48:21 +11:00
Randy Mackay
20989fd5e9 Copter: allow ch6 tuning of EKF 2014-02-15 05:48:20 +11:00
Andrew Tridgell
86afd13f12 Copter: use GPS AIRBORNE_4G 2014-02-15 05:48:17 +11:00
Andrew Tridgell
a112694a50 Copter: added AUX switch option for enable/disable EKF 2014-02-15 05:48:17 +11:00
Andrew Tridgell
5606e2f4a7 Copter: enabled EKF and SIMSTATE flash logging 2014-02-15 05:48:16 +11:00
Andrew Tridgell
6a9189a6a5 Copter: enable AHRS2 mavlink message 2014-02-15 05:48:16 +11:00
Andrew Tridgell
99b3517a47 Copter: use AP_InertialNav_NavEKF when available 2014-02-15 05:48:15 +11:00
Andrew Tridgell
686d1b9124 Copter: changes set_home_position() to setup_home_position() for Inav 2014-02-15 05:48:15 +11:00
Andrew Tridgell
c6e25483b4 Copter: use a common home with AHRS 2014-02-15 05:48:15 +11:00
Andrew Tridgell
9cc00d20eb Copter: fixed for removed DCM blowup counts 2014-02-15 05:29:48 +11:00
Andrew Tridgell
79a29d12f2 Copter: fixed build for new AHRS API 2014-02-15 05:29:47 +11:00
Andrew Tridgell
af5a3dff93 Copter: enable use of AHRS_NavEKF 2014-02-15 05:29:47 +11:00
Andrew Tridgell
24f2ac20de Copter: removed HIL_MODE_ATTITUDE
this really can't work any more, as AHRS can't support it
2014-02-15 05:29:46 +11:00
Andrew Tridgell
644bf71f56 Copter: fixed build for InertialNav change 2014-02-15 05:29:46 +11:00
Randy Mackay
006cf58b2d Copter: fix merge error for g.angle_max 2014-02-15 05:27:51 +11:00
Randy Mackay
5e8fede19e Copter: comment fix to Attitude.pde 2014-02-15 05:27:50 +11:00
Randy Mackay
aa79e22ce0 Drift: bug fix for throttle 2014-02-15 05:27:50 +11:00
Randy Mackay
10a0303706 Copter: smooth throttle transition between flight modes 2014-02-15 05:27:50 +11:00
Randy Mackay
0df1dc267b Copter: integrate WPNav constructor change 2014-02-15 05:27:50 +11:00
Randy Mackay
1b8055aed9 Copter: remove unused t7 const
Saves 4 bytes
2014-02-15 05:27:49 +11:00
Randy Mackay
2b3995ccb5 Copter: integrate refs for RC_Channels in motor defs 2014-02-15 05:27:49 +11:00
Randy Mackay
9f78f65413 TradHeli: integrate leonard's control_acro fixes 2014-02-15 05:27:49 +11:00
Randy Mackay
bf6bb59cb4 Copter: Leonard's control_acro fixes
get_pilot_desired_angle_rates returns bf rate targets as floats
2014-02-15 05:27:49 +11:00
Randy Mackay
6380a39d3a Copter: remote update_trig from main code 2014-02-15 05:27:48 +11:00
Randy Mackay
75b20bde7c Copter: control_acro, drift use trig from ahrs 2014-02-15 05:27:48 +11:00
Randy Mackay
aa4c3eaffe Copter: resolve RTL state compiler warnings 2014-02-15 05:27:48 +11:00
Randy Mackay
12a4ce70fd Copter: remove control_roll, pitch, yaw variables 2014-02-15 05:27:47 +11:00
Randy Mackay
2c1ec9d0c0 Copter: remove control_roll, pitch, yaw from control files 2014-02-15 05:27:47 +11:00
Randy Mackay
e8c4e8a472 Copter: integrate get_angle_target_for_reporting
Used for logging and sending to GCS
2014-02-15 05:27:47 +11:00
Randy Mackay
d579325e2a Copter: add get_angle_targets_for_reporting
This returns the current earth frame roll, pitch and yaw targets which
can depend upon the flight mode
2014-02-15 05:27:47 +11:00
Randy Mackay
1acd33e290 Copter: do_yaw takes yaw target from AttControl 2014-02-15 05:27:47 +11:00
Randy Mackay
ea1158a9d5 Copter: remove unused config 2014-02-15 05:27:47 +11:00
Randy Mackay
9ef3fd850f Copter: remove use of SUPER_SIMPLE definition 2014-02-15 05:27:47 +11:00
Randy Mackay
b37b0c5061 TradHeli: remove use of throttle_mode 2014-02-15 05:27:47 +11:00
Randy Mackay
b0673d693b Copter: move set_mode, to flight_mode.pde 2014-02-15 05:27:47 +11:00
Randy Mackay
b8bb477731 Copter: add flight_mode.pde 2014-02-15 05:27:47 +11:00
Randy Mackay
38d5148b99 Copter: remove reset_I_all
Each controller should reset the I terms as needed
2014-02-15 05:27:47 +11:00
Randy Mackay
72a3f14561 Copter: move reset_optflow_I to control_ofloiter 2014-02-15 05:27:46 +11:00
Randy Mackay
7afa0a767c Copter: correct circle rate tuning to use circle_nav 2014-02-15 05:27:46 +11:00
Randy Mackay
3e399fd830 Copter: remove unused parameters 2014-02-15 05:27:46 +11:00
Randy Mackay
81c7df7678 Copter: comment fix 2014-02-15 05:27:46 +11:00
Randy Mackay
0e0d02cd6d Copter: remove unused init from sport mode 2014-02-15 05:27:46 +11:00
Randy Mackay
3d926a6943 Copter: GCS_Mavlink gets gyro direct from imu 2014-02-15 05:27:46 +11:00
Randy Mackay
f46ff2b44e Copter: remove unused defines 2014-02-15 05:27:46 +11:00
Randy Mackay
fe26af86de Copter: crash check works with flip flight mode 2014-02-15 05:27:46 +11:00
Randy Mackay
22280e1c57 Copter: integrate surface_tracking to control_althold 2014-02-15 05:27:46 +11:00
Randy Mackay
3824f528ea Copter: get angle_boost direct from pos_control 2014-02-15 05:27:46 +11:00
Randy Mackay
90c5fe4be4 Copter: surface_tracking takes current_alt_target param 2014-02-15 05:27:46 +11:00
Randy Mackay
989a03a643 Copter: remove unused flags and variables 2014-02-15 05:27:45 +11:00
Randy Mackay
174318a2a9 Copter: remove set_nav_mode 2014-02-15 05:27:45 +11:00
Randy Mackay
aedb4136de Copter: update_thr_cruise removed from control_stabilize 2014-02-15 05:27:45 +11:00
Randy Mackay
223c6fd4de Copter: remove deadwood, update_thr_cruise always runs 2014-02-15 05:27:45 +11:00
Randy Mackay
2870d043f8 Copter: remove unused drift.pde
moved to control_drift.pde
2014-02-15 05:27:45 +11:00
Randy Mackay
1cd678f684 Copter: compiler warning for control_autotune 2014-02-15 05:27:45 +11:00
Randy Mackay
d3a126d078 Copter: integrate slew_yaw into control_auto 2014-02-15 05:27:45 +11:00
Randy Mackay
364946cb7f Copter: AttControl param prefix shortened to ATC 2014-02-15 05:27:45 +11:00
Randy Mackay
814157324d Copter: APM_Config AUTOTUNE_ENABLED 2014-02-15 05:27:45 +11:00
Randy Mackay
89a50ed445 Copter: comment fix for control_stabilize 2014-02-15 05:27:45 +11:00
Randy Mackay
0107b2a95d Copter: remove unused auto_tune.pde 2014-02-15 05:27:44 +11:00
Randy Mackay
aec67cd3df Copter: integrate control_autotune 2014-02-15 05:27:44 +11:00
Randy Mackay
823485f763 Copter: add control_autotune.pde 2014-02-15 05:27:44 +11:00
Randy Mackay
b87852ee2e Copter: remove unused flip.pde 2014-02-15 05:27:44 +11:00
Randy Mackay
d90d3d8dca Copter: integrate control_flip 2014-02-15 05:27:44 +11:00
Randy Mackay
47deb795bd Copter: add control_flip 2014-02-15 05:27:44 +11:00
Randy Mackay
1648ecc6e5 Copter: bug fix for heli_control_acro throttle 2014-02-15 05:27:44 +11:00
Randy Mackay
c73c9f03a5 Copter: bug fix for control_acro throttle 2014-02-15 05:27:44 +11:00
Randy Mackay
164bd10ef0 TradHeli: init targets when entering acro 2014-02-15 05:27:44 +11:00
Randy Mackay
fdf41219ca Copter: init targets when entering acro 2014-02-15 05:27:44 +11:00
Randy Mackay
9f33873b2e Copter: typo in control_acro.pde 2014-02-15 05:27:44 +11:00
Randy Mackay
ec989c720c Copter: integrate heli_control_acro 2014-02-15 05:27:43 +11:00
Randy Mackay
5aaa01ab30 TradHeli: heli_control_acro 2014-02-15 05:27:43 +11:00
Randy Mackay
922dff0514 Copter: integrate heli_control_stabilize 2014-02-15 05:27:43 +11:00
Randy Mackay
41ab2547d7 Copter: control_stabilize remove takeoff_complete 2014-02-15 05:27:43 +11:00
Randy Mackay
bca309eb1e Copter: replace takeoff_complete with landed_complete 2014-02-15 05:27:43 +11:00
Randy Mackay
2940688301 TradHeli: heli_control_stabilize 2014-02-15 05:27:43 +11:00
Randy Mackay
91124bcf8b TradHeli: remove get_heli_rate_yaw from main code 2014-02-15 05:27:43 +11:00
Randy Mackay
3b0de0d23d Copter: integrate trad heli AttControl 2014-02-15 05:27:43 +11:00
Randy Mackay
ef666c73ab Copter: remove Position mode 2014-02-15 05:27:42 +11:00
Randy Mackay
c632211c8c Copter: get_of_roll, get_of_pitch moved to control_ofloiter 2014-02-15 05:27:42 +11:00
Randy Mackay
837061fd65 Copter: control_ofloiter added 2014-02-15 05:27:42 +11:00
Robert Lefebvre
c561d6bb9e Small comment change. 2014-02-15 05:27:42 +11:00
Randy Mackay
54be8402a2 Copter: integrate control_guided 2014-02-15 05:27:42 +11:00
Randy Mackay
798add0b5c Copter: remove guided from control_auto.pde 2014-02-15 05:27:42 +11:00
Randy Mackay
0e41b01ad0 Copter: control_guided added 2014-02-15 05:27:41 +11:00
Randy Mackay
245bcd7c2c Copter: removed althold, drift, sport from control_stabilize 2014-02-15 05:27:41 +11:00
Randy Mackay
d85c57999d Copter: althold moved to control_althold.pde 2014-02-15 05:27:41 +11:00
Randy Mackay
2e6327be06 Copter: sport moved to control_sport.pde 2014-02-15 05:27:41 +11:00
Randy Mackay
70c8b622e2 Copter: drift moved to control_drift 2014-02-15 05:27:41 +11:00
Randy Mackay
212ced63f6 Copter: bug fix for do_loiter_time alt target 2014-02-15 05:27:41 +11:00
Randy Mackay
37bde3406d Copter: remove comments 2014-02-15 05:27:41 +11:00
Randy Mackay
70d1e53b74 Copter: commands_logic to use auto_rtl 2014-02-15 05:27:41 +11:00
Randy Mackay
1457a9d31a Copter: auto_mode to global scope 2014-02-15 05:27:41 +11:00
Randy Mackay
7970d7112f Copter: add rtl to control_auto 2014-02-15 05:27:41 +11:00
Randy Mackay
1f07c2efe0 Copter: remove old circle 2014-02-15 05:27:41 +11:00
Randy Mackay
bae867712d Copter: integrate circle mission command 2014-02-15 05:27:41 +11:00
Randy Mackay
ff2b8ff6f2 Copter: add circle to control_auto 2014-02-15 05:27:40 +11:00
Randy Mackay
cbf6e6a945 Copter: mostly working circle flight mode 2014-02-15 05:27:40 +11:00
lthall
8268e27d49 Copter: ACRO further clean up 2014-02-15 05:27:40 +11:00
Randy Mackay
af890e0f8d Copter: add AC_Circle include 2014-02-15 05:27:40 +11:00
Randy Mackay
83a767f3db Copter: control_circle.pde added 2014-02-15 05:27:40 +11:00
Randy Mackay
3b9ae02966 Copter: add Circle parameter 2014-02-15 05:27:40 +11:00
lthall
e979263c56 Copter: ACRO clean up and mistake fixes 2014-02-15 05:27:40 +11:00
lthall
ed7dd58c01 this is a test 2014-02-15 05:27:40 +11:00
Randy Mackay
8b9eb7ab2b Copter: WPNav constructor change 2014-02-15 05:27:39 +11:00
Randy Mackay
b1449d59ee Copter: resolve conflict between control_auto, control_rtl states 2014-02-15 05:27:39 +11:00
Randy Mackay
055ce4e53e Copter: integrate control_rtl 2014-02-15 05:27:39 +11:00
Randy Mackay
689e92eb33 Copter: control_rtl 2014-02-15 05:27:39 +11:00
Randy Mackay
bd88ed8a53 Copter: LAND at stopping point instead of curr pos 2014-02-15 05:27:39 +11:00
Randy Mackay
cdc935b66d Copter: implement auto_land with Loiter controller 2014-02-15 05:27:39 +11:00
Randy Mackay
93d43f8ca5 Copter: remove unused var from acro 2014-02-15 05:27:39 +11:00
Randy Mackay
32b8f80510 Copter: Acro flight mode from Leonard 2014-02-15 05:27:38 +11:00
Randy Mackay
cdc0f8e414 Copter: use new control_auto takeoff and land 2014-02-15 05:27:38 +11:00
Randy Mackay
0dabc0c577 Copter: control_auto - takeoff, land 2014-02-15 05:27:38 +11:00
Randy Mackay
eec62cb16a Copter: control_loiter initialises alt target 2014-02-15 05:27:38 +11:00
Randy Mackay
6ba91369ff Copter: split control_land into gps and non-gps 2014-02-15 05:27:38 +11:00
Randy Mackay
011de6683e Copter: land_detector moved to control_land 2014-02-15 05:27:38 +11:00
Randy Mackay
96c61fcf28 Copter: removed get_throttle_land
Now in the control_land.pde
2014-02-15 05:27:38 +11:00
Randy Mackay
3b003ea3e6 Copter: remove setting of nav mode 2014-02-15 05:27:38 +11:00
Randy Mackay
924e2a66ce Copter: split control_auto into separate file 2014-02-15 05:27:38 +11:00
Randy Mackay
e27f4c1c13 Copter: split control_stabilize into land, rtl, loiter 2014-02-15 05:27:38 +11:00
Randy Mackay
d92e894af6 Copter: get_throttle_surface_tracking returns climb rate 2014-02-15 05:27:37 +11:00
Randy Mackay
c92de71212 Copter: control_stabilize, - integrate changes to get_throttle_surface_tracking 2014-02-15 05:27:37 +11:00
Randy Mackay
f3bcbb2ce4 Copter: remove setting roll, pitch yaw modes in set_mode 2014-02-15 05:27:37 +11:00
Randy Mackay
d70862e44b Copter: remove case that does nothing 2014-02-15 05:27:37 +11:00
Randy Mackay
65f7bf92f4 Copter: replace yaw_mode with auto_yaw_mode 2014-02-15 05:27:37 +11:00
Randy Mackay
1b714defcc Copter: move auto to control_auto.pde and fix yaw 2014-02-15 05:27:37 +11:00
Randy Mackay
8e40cbdd7f Copter: disable ch7/8 feature to point at armed yaw 2014-02-15 05:27:37 +11:00
Randy Mackay
4540fb3fef Copter: remove set roll-pitch, yaw, thr modes for ACRO, LOITER 2014-02-15 05:27:36 +11:00
Randy Mackay
dc6f622d48 Copter: move NTUN logging to 10hz loop 2014-02-15 05:27:36 +11:00
Randy Mackay
8e08a1f8ab Copter: remove debug 2014-02-15 05:27:36 +11:00
Randy Mackay
f5c305e960 Copter: control_stabilize rename wp_nav calls 2014-02-15 05:27:36 +11:00
Randy Mackay
b29a963fd6 Copter: remove unused Attitude.pde functions 2014-02-15 05:27:36 +11:00
Randy Mackay
0a2adbac1b Copter: renaming functions after moving xy control 2014-02-15 05:27:36 +11:00
Randy Mackay
9843e93308 Copter: control_stabilize - much renaming as xy pos controller moves 2014-02-15 05:27:36 +11:00
Randy Mackay
5fd9410ff5 Copter: much renaming as xy pos controller moves 2014-02-15 05:27:36 +11:00
Randy Mackay
f0c538f8fb Copter: control_stabilize comment update 2014-02-15 05:27:36 +11:00
Randy Mackay
d380e6b4d3 Copter: integrate add ref to AC_Pos_Control from WP_Nav 2014-02-15 05:27:35 +11:00
Randy Mackay
aaa62eeb28 Copter: integrated simpler init loiter from WP_Nav 2014-02-15 05:27:35 +11:00
Randy Mackay
49367c5a30 Copter: GCS.h include fix 2014-02-15 05:27:35 +11:00
Randy Mackay
eddb593ee2 Copter: althold uses high level angle controller 2014-02-15 05:27:35 +11:00
Randy Mackay
bdf95bd835 Copter: stabilize uses high level angle controller 2014-02-15 05:27:35 +11:00
Randy Mackay
a52e220724 Copter: add loiter controller to onion
Also add ignore_checks to flight mode initialisation
2014-02-15 05:27:35 +11:00
Randy Mackay
7e37b16ccb Copter: move update_flight_mode to fast loop 2014-02-15 05:27:35 +11:00
Randy Mackay
784f7385b5 Copter: add attitude and pos control params 2014-02-15 05:27:35 +11:00
Randy Mackay
b34664ea07 Copter: remove unused altitude error 2014-02-15 05:27:34 +11:00
Randy Mackay
e69eeea246 Copter: log alt target from PosControl 2014-02-15 05:27:34 +11:00
Randy Mackay
44e731ea40 Copter: control_stabilize reports alt target 2014-02-15 05:27:34 +11:00
Randy Mackay
abb42bcb41 Copter: remove unused run_rate_controllers 2014-02-15 05:27:34 +11:00
Randy Mackay
e1bf4af1b8 Copter: bug fix to set angle_boost in stab mode 2014-02-15 05:27:34 +11:00
Randy Mackay
77c38f4de4 Copter: integrate init take-off 2014-02-15 05:27:34 +11:00