From 96e3f5f80acf40232dc4c3ffdd1d6d435580de62 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 7 Nov 2018 23:44:13 -0500 Subject: [PATCH 1/5] Control: AP Stability Improved --- Systems/fmgc-pitch.xml | 6 +++--- revision.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml index 352f7eac..9be30bac 100644 --- a/Systems/fmgc-pitch.xml +++ b/Systems/fmgc-pitch.xml @@ -78,9 +78,9 @@ - /velocities/mach - 0.2120 - 0.9340 + /fdm/jsbsim/velocities/vc-kts + 140120 + 360340
diff --git a/revision.txt b/revision.txt index a0254cc8..45615031 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4693 \ No newline at end of file +4694 \ No newline at end of file From 31cad47c3cdd12dc347d6286c8e809d2d2851ccb Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 7 Nov 2018 23:45:08 -0500 Subject: [PATCH 2/5] Control: AP Stability Improved --- Systems/fmgc-roll-yaw.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml index 3ae2b94c..3bb81d99 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -53,7 +53,15 @@ 0 /it-autoflight/internal/target-roll-deg - -1.8 + + + + /fdm/jsbsim/velocities/vc-kts + 140-1.8 + 360-2.8 +
+
+
-0.000001 /it-autoflight/internal/bank-limit From 1ecd3897d091cc87dc378d13c7f1280bbae6c578 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Thu, 8 Nov 2018 14:05:14 -0500 Subject: [PATCH 3/5] Control: Bugfix in AP --- Systems/fmgc-drivers.xml | 12 ++++++++++-- revision.txt | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml index 64ca89e1..d90ebe56 100644 --- a/Systems/fmgc-drivers.xml +++ b/Systems/fmgc-drivers.xml @@ -691,7 +691,11 @@
/orientation/roll-deg - 1.8 + + /fdm/jsbsim/velocities/vc-kts + 1401.8 + 3602.8 +
/it-autoflight/internal/heading-deg
@@ -708,7 +712,11 @@
/orientation/roll-deg - 1.8 + + /fdm/jsbsim/velocities/vc-kts + 1401.8 + 3602.8 +
/it-autoflight/internal/track-deg
diff --git a/revision.txt b/revision.txt index 45615031..03525b00 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4694 \ No newline at end of file +4695 \ No newline at end of file From d028d44604e978a5bce4a877df64446f0d9df938 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Thu, 8 Nov 2018 15:08:30 -0500 Subject: [PATCH 4/5] Control: Refactor FBW Gains --- Systems/a320-fcs.xml | 86 +++++++++++++++++++------------------------- revision.txt | 2 +- 2 files changed, 37 insertions(+), 51 deletions(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 2d628ccf..c8bb06f2 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -24,7 +24,7 @@ fbw/pitch/d-gain fbw/yaw/yd-p-gain fbw/yaw/tc-p-gain - fbw/yaw/tc-i-gain + fbw/yaw/tc-d-gain fbw/fmgc/roll-cmd @@ -79,12 +79,12 @@ - velocities/mach + velocities/vc-ktsfbw/roll/gain-switch 0 1 - 0.2 -26.2 0.0 - 0.9 -15.5 0.0 + 140 -26.2 0.0 + 350 -9.5 0.0
@@ -93,12 +93,12 @@ - velocities/mach + velocities/vc-ktsfbw/roll/gain-switch 0 1 - 0.2 -45.5 0.0 - 0.9 -36.0 0.0 + 140 -45.5 0.0 + 350 -29.0 0.0
@@ -107,12 +107,12 @@ - velocities/mach + velocities/vc-ktsfbw/roll/gain-switch 0 1 - 0.2 -2.1 0.0 - 0.9 -1.1 0.0 + 140 -2.1 0.0 + 350 -0.8 0.0
@@ -121,12 +121,12 @@ - velocities/mach + velocities/vc-ktsfbw/pitch/gain-switch 0 1 - 0.2 28 0 - 0.9 23 0 + 140 28 0 + 350 23 0
@@ -135,12 +135,12 @@ - velocities/mach + velocities/vc-ktsfbw/pitch/gain-switch 0 1 - 0.2 61 0 - 0.9 45 0 + 140 61 0 + 350 45 0
@@ -149,12 +149,12 @@ - velocities/mach + velocities/vc-ktsfbw/pitch/gain-switch 0 1 - 0.2 2.9 0.0 - 0.9 1.3 0.0 + 140 2.4 0.0 + 350 0.6 0.0
@@ -163,12 +163,12 @@ - velocities/mach + velocities/vc-ktsfbw/yaw/gain-switch 0 1 - 0.2 -7.5 0.0 - 0.9 -1.5 0.0 + 140 -7.0 0.0 + 350 -1.2 0.0
@@ -177,26 +177,26 @@ - velocities/mach + velocities/vc-ktsfbw/yaw/gain-switch - 0 1 - 0.2 5.01 0.00 - 0.9 1.05 0.00 + 0 1 + 140 13 0 + 350 5 0
- + - velocities/mach + velocities/vc-ktsfbw/yaw/gain-switch - 0 1 - 0.2 1.03 0.00 - 0.9 0.79 0.00 + 0 1 + 140 16 0 + 350 9 0
@@ -520,12 +520,12 @@ - velocities/mach + velocities/vc-ktsposition/wow 0 1 - 0.2 0.5 1.0 - 0.9 0.1 1.0 + 140 0.5 1.0 + 350 0.1 1.0
@@ -1113,25 +1113,11 @@ - - - - fbw/yaw/gain-switch gt 0 - /position/gear-agl-ft lt 50 - fbw/yaw/autoland-switch eq 1 - - - fbw/yaw/tc-pid le -0.199 - fbw/yaw/tc-pid ge 0.199 - - - fbw/yaw/slip-skid fbw/yaw/tc-p-gain - fbw/yaw/tc-i-gain - 0.0 - fbw/yaw/trigger + 0.0 + fbw/yaw/tc-d-gain -0.2 0.2 diff --git a/revision.txt b/revision.txt index 03525b00..704c4158 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4695 \ No newline at end of file +4696 \ No newline at end of file From a0b7a26c33552dae136d85736363ade74b163e5e Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Thu, 8 Nov 2018 21:53:08 -0500 Subject: [PATCH 5/5] Aero: Fix wrong property in side due to rudder --- Systems/a320-aerodynamics.xml | 2 +- revision.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml index 52aa6654..e5bec7ba 100644 --- a/Systems/a320-aerodynamics.xml +++ b/Systems/a320-aerodynamics.xml @@ -406,7 +406,7 @@ aero/qbar-psf metrics/Sw-sqft - fcs/rudder-pos-rad + hydraulics/rudder/final-deg 0.2653 diff --git a/revision.txt b/revision.txt index 704c4158..222192ce 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4696 \ No newline at end of file +4697 \ No newline at end of file