From 9b6372b8a15b840caf3b956c1db8d0ee4e381724 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 29 Oct 2017 19:22:43 -0400 Subject: [PATCH 1/2] A3XX: Fix landing lights being int instead of double, causing broken --- A320-main.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 0b95a001..2431e920 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -567,9 +567,9 @@ 0 0 0 - 0 - 0 - 0 + 0 + 0 + 0 0 0 0 From 341700c36c9ba22aead2c2aa4d0d627b2a5f8814 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 29 Oct 2017 20:13:02 -0400 Subject: [PATCH 2/2] A32X: Overhaul flight control aerodynamics, retune FBW system --- A318-100-CFM.xml | 2 +- A319-100-CFM.xml | 2 +- A319-100-IAE.xml | 2 +- A320-100-CFM.xml | 2 +- A320-200-CFM.xml | 2 +- A320-200-IAE.xml | 2 +- A320neo-CFM.xml | 2 +- A320neo-PW.xml | 2 +- A321-200-CFM.xml | 2 +- A321-200-IAE.xml | 2 +- A321neo-CFM.xml | 2 +- A321neo-PW.xml | 2 +- Systems/a318-aerodynamics.xml | 12 ++++---- Systems/a319-aerodynamics.xml | 12 ++++---- Systems/a320-aerodynamics.xml | 12 ++++---- Systems/a321-aerodynamics.xml | 12 ++++---- Systems/it-fbw.xml | 58 +++++++++++++++++++++++++++++------ revision.txt | 2 +- 18 files changed, 85 insertions(+), 47 deletions(-) diff --git a/A318-100-CFM.xml b/A318-100-CFM.xml index c68df8ee..315c65a5 100644 --- a/A318-100-CFM.xml +++ b/A318-100-CFM.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml index c68df8ee..315c65a5 100644 --- a/A319-100-CFM.xml +++ b/A319-100-CFM.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml index 03df8631..951a1c78 100644 --- a/A319-100-IAE.xml +++ b/A319-100-IAE.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml index c68df8ee..315c65a5 100644 --- a/A320-100-CFM.xml +++ b/A320-100-CFM.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index c68df8ee..315c65a5 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index 03df8631..951a1c78 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index e9917700..67b0d36e 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A320neo-PW.xml b/A320neo-PW.xml index eddbe032..7d0375cf 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml index c68df8ee..315c65a5 100644 --- a/A321-200-CFM.xml +++ b/A321-200-CFM.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml index 03df8631..951a1c78 100644 --- a/A321-200-IAE.xml +++ b/A321-200-IAE.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A321neo-CFM.xml b/A321neo-CFM.xml index e9917700..67b0d36e 100644 --- a/A321neo-CFM.xml +++ b/A321neo-CFM.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/A321neo-PW.xml b/A321neo-PW.xml index eddbe032..7d0375cf 100644 --- a/A321neo-PW.xml +++ b/A321neo-PW.xml @@ -28,7 +28,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> 57.33 - 19.4974 + 19.3974 0 0.19249 diff --git a/Systems/a318-aerodynamics.xml b/Systems/a318-aerodynamics.xml index 6e801d21..6ff56784 100644 --- a/Systems/a318-aerodynamics.xml +++ b/Systems/a318-aerodynamics.xml @@ -262,7 +262,7 @@ metrics/bw-ft aero/bi2vel velocities/p-aero-rad_sec - -0.91 + -0.47 @@ -285,7 +285,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/roll-pos-rad - 0.11 + 0.10 @@ -296,7 +296,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - 0.003 + 0.01 @@ -322,7 +322,7 @@ metrics/Sw-sqft metrics/cbarw-ft fcs/pitch-pos-geared - -1.600 + -1.350 @@ -334,7 +334,7 @@ metrics/cbarw-ft aero/ci2vel velocities/q-aero-rad_sec - -136 + -37.4 @@ -384,7 +384,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - -0.075 + -0.1 diff --git a/Systems/a319-aerodynamics.xml b/Systems/a319-aerodynamics.xml index 6e801d21..6ff56784 100644 --- a/Systems/a319-aerodynamics.xml +++ b/Systems/a319-aerodynamics.xml @@ -262,7 +262,7 @@ metrics/bw-ft aero/bi2vel velocities/p-aero-rad_sec - -0.91 + -0.47 @@ -285,7 +285,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/roll-pos-rad - 0.11 + 0.10 @@ -296,7 +296,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - 0.003 + 0.01 @@ -322,7 +322,7 @@ metrics/Sw-sqft metrics/cbarw-ft fcs/pitch-pos-geared - -1.600 + -1.350 @@ -334,7 +334,7 @@ metrics/cbarw-ft aero/ci2vel velocities/q-aero-rad_sec - -136 + -37.4 @@ -384,7 +384,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - -0.075 + -0.1 diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml index 6e801d21..6ff56784 100644 --- a/Systems/a320-aerodynamics.xml +++ b/Systems/a320-aerodynamics.xml @@ -262,7 +262,7 @@ metrics/bw-ft aero/bi2vel velocities/p-aero-rad_sec - -0.91 + -0.47 @@ -285,7 +285,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/roll-pos-rad - 0.11 + 0.10 @@ -296,7 +296,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - 0.003 + 0.01 @@ -322,7 +322,7 @@ metrics/Sw-sqft metrics/cbarw-ft fcs/pitch-pos-geared - -1.600 + -1.350 @@ -334,7 +334,7 @@ metrics/cbarw-ft aero/ci2vel velocities/q-aero-rad_sec - -136 + -37.4 @@ -384,7 +384,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - -0.075 + -0.1 diff --git a/Systems/a321-aerodynamics.xml b/Systems/a321-aerodynamics.xml index 6e801d21..6ff56784 100644 --- a/Systems/a321-aerodynamics.xml +++ b/Systems/a321-aerodynamics.xml @@ -262,7 +262,7 @@ metrics/bw-ft aero/bi2vel velocities/p-aero-rad_sec - -0.91 + -0.47 @@ -285,7 +285,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/roll-pos-rad - 0.11 + 0.10 @@ -296,7 +296,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - 0.003 + 0.01 @@ -322,7 +322,7 @@ metrics/Sw-sqft metrics/cbarw-ft fcs/pitch-pos-geared - -1.600 + -1.350 @@ -334,7 +334,7 @@ metrics/cbarw-ft aero/ci2vel velocities/q-aero-rad_sec - -136 + -37.4 @@ -384,7 +384,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - -0.075 + -0.1 diff --git a/Systems/it-fbw.xml b/Systems/it-fbw.xml index 55bdf4a8..8572a9c4 100644 --- a/Systems/it-fbw.xml +++ b/Systems/it-fbw.xml @@ -117,7 +117,7 @@ /controls/flight/aileron-input - 2.0 + 1.5 @@ -314,7 +314,7 @@ /controls/flight/elevator-input - 2.0 + 1.5 @@ -446,7 +446,7 @@ /velocities/mach - 0.20.11 + 0.20.120.90.06
 @@ -454,6 +454,22 @@ /it-fbw/roll-kp + + IT-FBW: ROLL TI (I Time) + gain + 1 + + + + /velocities/mach + 0.20.75 + 0.90.65 +
+ + + /it-fbw/roll-ti + + IT-FBW: ROLL false @@ -491,8 +507,10 @@ 1 0.1 0 - 0.45 - 0.002 + + /it-fbw/roll-ti + + 0.005 -1 1 @@ -864,7 +882,7 @@ /velocities/mach - 0.2-0.20 + 0.2-0.260.9-0.13
 @@ -872,6 +890,22 @@ /it-fbw/pitch-kp + + IT-FBW: PITCH TI (I Time) + gain + 1 + + + + /velocities/mach + 0.20.75 + 0.90.55 +
+ + + /it-fbw/pitch-ti + + IT-FBW: PITCH false @@ -947,8 +981,10 @@ 1 0.1 0 - 0.45 - 0.002 + + /it-fbw/pitch-ti + + 0.005 -1 1 @@ -1032,8 +1068,10 @@ 1 0.1 0 - 0.45 - 0.02 + + /it-fbw/pitch-ti + + 0.03 -1 1 diff --git a/revision.txt b/revision.txt index b19e196a..a57db8f5 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -3028 \ No newline at end of file +3040 \ No newline at end of file