From 568fa31d8b69b025578cb31f248808f9308a2467 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 19 Oct 2018 17:45:13 -0400 Subject: [PATCH] Control: Rework AP, fix lots of stuff --- Systems/fmgc-drivers.xml | 220 ++++++++++++++------------------------ Systems/fmgc-pitch.xml | 54 +++------- Systems/fmgc-roll-yaw.xml | 151 +++++++++++--------------- Systems/fmgc-thrust.xml | 138 ++++++------------------ revision.txt | 2 +- 5 files changed, 190 insertions(+), 375 deletions(-) diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml index 5df5e0e7..8e360728 100644 --- a/Systems/fmgc-drivers.xml +++ b/Systems/fmgc-drivers.xml @@ -9,11 +9,9 @@ - - - - - + + + IAS 5 SECOND PREDICTOR false @@ -22,7 +20,7 @@ 5.0 0.0 - + IAS 10 SECOND PREDICTOR false @@ -49,7 +47,7 @@ 5.0 0.0 - + MACH 10 SECOND PREDICTOR false @@ -67,16 +65,13 @@ 15.0 0.0 - - - - - + + + AUTOLAND FD FPM gain 1.0 - 0.05 @@ -89,12 +84,11 @@ /it-autoflight/internal/target-fpm-c2 - + AUTOLAND FPM gain 1.0 - 0.05
@@ -111,12 +105,11 @@ /it-autoflight/internal/target-fpm-c - + FMGC MNG SPD gain 1.0 - 0.05 @@ -138,7 +131,6 @@ FMGC MNG MACH gain 1.0 - 0.05 @@ -164,7 +156,6 @@ FMGC Target IAS PFD gain 1.0 - 0.1 @@ -193,10 +184,11 @@ /FMGC/internal/target-ias-pfd - + KTS INPUT FILTER false + noise-spike true output @@ -218,32 +210,6 @@ /it-autoflight/settings/togaspd /it-autoflight/internal/flch-kts - noise-spike - - - - - - /it-autoflight/output/vert - 4 - - - /it-autoflight/output/vert - 7 - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 100 - @@ -257,6 +223,10 @@ 7 + + /it-autoflight/input/kts-mach + 0 + /gear/gear[1]/wow 0 @@ -269,43 +239,33 @@ 5 + 100 MACH INPUT FILTER false + noise-spike true output - - /it-autoflight/input/spd-mach - + /it-autoflight/input/spd-mach /it-autoflight/internal/flch-mach - noise-spike - - - - - /it-autoflight/output/vert - 4 - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 1 - + + + /it-autoflight/output/vert + 4 + + + /it-autoflight/output/vert + 7 + + - /it-autoflight/output/vert - 4 + /it-autoflight/input/kts-mach + 1 /gear/gear[1]/wow @@ -319,8 +279,9 @@ 0.05 + 1 - + IAS SYNC gain @@ -333,7 +294,6 @@ - 0.5 /instrumentation/airspeed-indicator/indicated-speed-kt /it-autoflight/input/spd-kts @@ -350,7 +310,6 @@ - 0.5/instrumentation/airspeed-indicator/indicated-mach/it-autoflight/input/spd-mach @@ -365,9 +324,7 @@ /orientation/heading-deg - - /orientation/heading-magnetic-deg - + /orientation/heading-magnetic-deg0/it-autoflight/internal/heading-deg/instrumentation/pfd/heading-deg @@ -522,7 +479,10 @@ - /it-autoflight/internal/vert-speed-fpm + + /it-autoflight/internal/vert-speed-fpm + 0.5 + @@ -532,31 +492,18 @@ VERT SPEED FILTER false + noise-spike true output - - /it-autoflight/input/vs - + /it-autoflight/input/vs /it-autoflight/internal/vs - noise-spike - - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 2000 - + + /it-autoflight/output/vert + 1 + /gear/gear[1]/wow 0 @@ -569,8 +516,9 @@ 300 + 2000 - + NAV ERROR DEG false @@ -589,7 +537,7 @@ 180 - + INTERNAL VERTICAL SPEED COMPUTER false @@ -830,49 +778,13 @@ /it-autoflight/internal/fpa - - - - - + + + IT-CONTROLLER: TARGET ROLL CMD false - true - output - - /it-autoflight/internal/target-roll-deg - - /it-autoflight/internal/target-roll-fd noise-spike - 15 - - - - FD: ROLL - false - gain - 1.0 - - - - - /it-autoflight/output/lat - 4 - - - /it-autoflight/output/lat - 5 - - - - - - /it-autoflight/internal/target-roll-fd - /orientation/roll-deg - - - @@ -886,9 +798,37 @@ + 0 + + /it-autoflight/internal/target-roll-deg + /it-autoflight/internal/target-roll-fd + + + + + /it-autoflight/output/fd1 + 1 + + + /it-autoflight/output/fd1 + 1 + + + + 50 + + 15 + + + + FD: ROLL + false + gain + 1.0 + - 0 + /it-autoflight/internal/target-roll-fd /orientation/roll-deg @@ -897,7 +837,7 @@ -30 30 - + FD: PITCH false diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml index ed8a1e6e..117cb06c 100644 --- a/Systems/fmgc-pitch.xml +++ b/Systems/fmgc-pitch.xml @@ -45,15 +45,9 @@ /it-autoflight/internal/mng-alt - - /it-autoflight/internal/target-fpm - - - /it-autoflight/internal/min-vs - - - /it-autoflight/internal/max-vs - + /it-autoflight/internal/target-fpm + /it-autoflight/internal/min-vs + /it-autoflight/internal/max-vs @@ -87,15 +81,9 @@ - - /it-autoflight/internal/fpa - - - /it-autoflight/input/fpa - - - /it-autoflight/internal/target-fpm-d - + /it-autoflight/internal/fpa + /it-autoflight/input/fpa + /it-autoflight/internal/target-fpm-d @@ -106,9 +94,6 @@
- 1.0 - 0.1 - 0.0 2.0 0.002 @@ -215,9 +200,7 @@ /it-autoflight/internal/flch-mach 1000.0 - - /it-autoflight/internal/target-fpm-b - + /it-autoflight/internal/target-fpm-b @@ -237,9 +220,6 @@ -60 - 1.0 - 0.1 - 0.0 2.5 0.001 @@ -505,9 +485,7 @@ - - /it-autoflight/internal/vert-speed-fpm - + /it-autoflight/internal/vert-speed-fpm @@ -590,9 +568,7 @@ /it-autoflight/internal/nav1-rate-of-climb-fpm - - /it-autoflight/internal/target-pitch-deg - + /it-autoflight/internal/target-pitch-deg @@ -717,15 +693,9 @@ false gain 0.15 - - /orientation/pitch-deg - - - /it-autoflight/internal/target-pitch-deg - - - /fdm/jsbsim/fbw/fmgc/pitch-cmd - + /orientation/pitch-deg + /it-autoflight/internal/target-pitch-deg + /fdm/jsbsim/fbw/fmgc/pitch-cmd -0.3 0.3
diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml index 662a5d59..78719d0b 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -51,15 +51,9 @@ - - /it-autoflight/internal/heading-error-deg - - - 0 - - - /it-autoflight/internal/target-roll-deg - + /it-autoflight/internal/heading-error-deg + 0 + /it-autoflight/internal/target-roll-deg -1.8 -0.000001 @@ -67,9 +61,7 @@ /it-autoflight/internal/bank-limit -1 - - /it-autoflight/internal/bank-limit - + /it-autoflight/internal/bank-limit @@ -104,30 +96,9 @@ - - - - /it-autoflight/settings/use-backcourse - 0 - - - /it-autoflight/internal/nav-heading-error-deg - - - - - /it-autoflight/settings/use-backcourse - 1 - - - /it-autoflight/internal/nav-bc-heading-error-deg - - - 0.0 - - - /it-autoflight/internal/target-roll-deg - + /it-autoflight/internal/nav-heading-error-deg + 0 + /it-autoflight/internal/target-roll-deg -2.8 -0.0001 @@ -135,9 +106,7 @@ /it-autoflight/internal/bank-limit -1 - - /it-autoflight/internal/bank-limit - + /it-autoflight/internal/bank-limit @@ -174,48 +143,14 @@ /it-autoflight/internal/bank-limit -1 - - /it-autoflight/internal/bank-limit - + /it-autoflight/internal/bank-limit IT-CONTROLLER: TARGET ROLL CMD false - true - output - - /it-autoflight/internal/target-roll-deg - - /it-autoflight/internal/target-roll noise-spike - 6 - - - - System Command: Roll Rate - false - gain - -0.1 - /orientation/roll-deg - - - - - - /it-autoflight/output/lat - 4 - - - /it-autoflight/output/lat - 5 - - - - /it-autoflight/internal/target-roll - - @@ -229,10 +164,58 @@ 0 - - - /fdm/jsbsim/fbw/fmgc/roll-cmd - + + /it-autoflight/internal/target-roll-deg + /it-autoflight/internal/target-roll + + + + + /it-autoflight/output/ap1 + 1 + + + /it-autoflight/output/ap2 + 1 + + + /it-autoflight/output/fd1 + 1 + + + /it-autoflight/output/fd2 + 1 + + + + 50 + + + + + + /it-autoflight/output/ap1 + 1 + + + /it-autoflight/output/ap2 + 1 + + + + 15 + + 8 + + + + System Command: Roll Rate + false + gain + -0.1 + /orientation/roll-deg + /it-autoflight/internal/target-roll + /fdm/jsbsim/fbw/fmgc/roll-cmd -0.32 0.32 @@ -252,12 +235,8 @@ - - /it-autoflight/internal/nav-heading-error-deg - - - 0 - + /it-autoflight/internal/nav-heading-error-deg + 0 /it-autoflight/internal/rudder-cmd @@ -299,6 +278,7 @@ IT-CONTROLLER: RUDDER CMD false + noise-spike true output @@ -319,8 +299,7 @@ /it-autoflight/internal/rudder-cmd - /fdm/jsbsim/fbw/fmgc/yaw-cmd - noise-spike + /fdm/jsbsim/fbw/fmgc/yaw-cmd 0.6 diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml index 4bb11f75..0c13a4c2 100644 --- a/Systems/fmgc-thrust.xml +++ b/Systems/fmgc-thrust.xml @@ -7,44 +7,17 @@ --> - - - - - + + + KTS INPUT FILTER false + noise-spike true output - - /it-autoflight/input/spd-kts - + /it-autoflight/input/spd-kts /it-autoflight/internal/kts - noise-spike - - - - - /it-autoflight/output/thr-mode - 0 - - - /it-autoflight/output/athr - 0 - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 200 - @@ -56,6 +29,10 @@ /it-autoflight/output/athr 1 + + /it-autoflight/input/kts-mach + 0 + /gear/gear[1]/wow 0 @@ -68,41 +45,17 @@ 10 + 200 MACH INPUT FILTER false + noise-spike true output - - /it-autoflight/input/spd-mach - + /it-autoflight/input/spd-mach /it-autoflight/internal/mach - noise-spike - - - - - /it-autoflight/output/thr-mode - 0 - - - /it-autoflight/output/athr - 0 - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - 2 - @@ -114,6 +67,10 @@ /it-autoflight/output/athr 1 + + /it-autoflight/input/kts-mach + 1 + /gear/gear[1]/wow 0 @@ -126,6 +83,7 @@ 0.1 + 2 @@ -250,28 +208,15 @@ - - /instrumentation/airspeed-indicator/indicated-speed-kt - - - /it-autoflight/internal/kts - - - /controls/engines/throttle-cmd-pid - + /instrumentation/airspeed-indicator/indicated-speed-kt + /it-autoflight/internal/kts + /controls/engines/throttle-cmd-pid 0.055 - 1.0 - 0.1 - 0.0 9.0 0.00001 - - /controls/engines/idle-limit - - - /controls/engines/throttle-pid-max - + /controls/engines/idle-limit + /controls/engines/throttle-pid-max @@ -390,22 +335,13 @@ /it-autoflight/internal/mach 1000.0 - - /controls/engines/throttle-cmd-pid - + /controls/engines/throttle-cmd-pid 0.055 - 1.0 - 0.1 - 0.0 9.0 0.00001 - - /controls/engines/idle-limit - - - /controls/engines/throttle-pid-max - + /controls/engines/idle-limit + /controls/engines/throttle-pid-max @@ -512,12 +448,8 @@ - - 0.0 - - - /controls/engines/throttle-cmd-pid - + 0.0 + /controls/engines/throttle-cmd-pid @@ -623,12 +555,8 @@ - - 1.0 - - - /controls/engines/throttle-cmd-pid - + 1.0 + /controls/engines/throttle-cmd-pid @@ -725,12 +653,10 @@ - 1 + 1.0 - 0 - - /controls/engines/throttle-cmd-pid - + 0.0 + /controls/engines/throttle-cmd-pid diff --git a/revision.txt b/revision.txt index cdc309eb..8eb54da3 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4678 \ No newline at end of file +4679 \ No newline at end of file