From 4a13cad3661eb12a6058ef85f7c43a94854777b1 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 24 Apr 2018 11:41:59 -0400 Subject: [PATCH 01/13] Control: Move FBW System to JSBsim, and improve it --- A320-main.xml | 36 +- Systems/a320-aerodynamics.xml | 2 +- Systems/a320-fcs.xml | 1450 +++++++++++++++++++++++++++++---- Systems/fbw-drivers.xml | 363 --------- Systems/fbw-pitch.xml | 627 +------------- Systems/fbw-roll-yaw.xml | 747 ----------------- Systems/fmgc-pitch.xml | 16 +- Systems/fmgc-roll-yaw.xml | 32 +- Systems/v2500-sound.xml | 8 +- 9 files changed, 1310 insertions(+), 1971 deletions(-) delete mode 100644 Systems/fbw-drivers.xml delete mode 100644 Systems/fbw-roll-yaw.xml diff --git a/A320-main.xml b/A320-main.xml index 0420862a..96dc0c99 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -112,43 +112,39 @@ + Aircraft/IDG-A32X/Systems/hydraulics.xml - Aircraft/IDG-A32X/Systems/fbw-drivers.xml - - - Aircraft/IDG-A32X/Systems/fbw-roll-yaw.xml - - Aircraft/IDG-A32X/Systems/fbw-pitch.xml - + Aircraft/IDG-A32X/Systems/fmgc-drivers.xml - + Aircraft/IDG-A32X/Systems/fmgc-roll-yaw.xml - + Aircraft/IDG-A32X/Systems/fmgc-pitch.xml - + Aircraft/IDG-A32X/Systems/fmgc-thrust.xml - + Aircraft/IDG-A32X/Systems/libraries.xml - + Aircraft/IDG-A32X/Systems/upper-ecam.xml - + Aircraft/IDG-A32X/Systems/lower-ecam.xml - + + Aircraft/IDG-A32X/Systems/pfd.xml - + Aircraft/IDG-A32X/Systems/zoom-views.xml @@ -415,6 +411,8 @@ 0 0 + 0 + 0 0 @@ -429,6 +427,12 @@ 0 0 + 33 + 0 + + 0 + 0 + @@ -537,13 +541,11 @@ 0.5 -0.5 0 - 0 0.1 0.1 0.0 0 0 - 0 0.0 0.0 0.0 diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml index 53cf4218..d6314e6c 100644 --- a/Systems/a320-aerodynamics.xml +++ b/Systems/a320-aerodynamics.xml @@ -519,7 +519,7 @@ metrics/Sw-sqft metrics/bw-ft fcs/rudder-pos-rad - -0.053 + 0.053 diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index e48dfd38..ec5bd31f 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1,4 +1,5 @@ - + + - + + fbw/roll/pid + fbw/pitch/g-pi + fbw/pitch/pid + fbw/yaw/tc-pid + + + fbw/roll/p-gain + fbw/roll/i-gain + fbw/roll/d-gain + fbw/pitch/p-gain + fbw/pitch/i-gain + fbw/pitch/d-gain + fbw/yaw/yd-p-gain + fbw/yaw/tc-p-gain + fbw/yaw/tc-i-gain + + + fbw/fmgc/roll-cmd + fbw/fmgc/pitch-cmd + fbw/fmgc/yaw-cmd + + + + + + + gear/unit[0]/WOW eq 1 + gear/unit[1]/WOW eq 1 + gear/unit[2]/WOW eq 1 + + + + + + + position/wow eq 1 + /it-fbw/law ne 0 + + + + + + + position/wow eq 1 + /it-fbw/law eq 2 + /it-fbw/law eq 3 + + + + + + + position/wow eq 1 + /it-fbw/law eq 2 + /it-fbw/law eq 3 + + + + + + + /it-autoflight/output/ap1 eq 1 + /it-autoflight/output/ap2 eq 1 + + + + + + + velocities/mach + fbw/roll/gain-switch + + 0 1 + 0.2 -26.2 0.0 + 0.9 -15.5 0.0 + +
+ + + + + + + velocities/mach + fbw/roll/gain-switch + + 0 1 + 0.2 -45.5 0.0 + 0.9 -36.0 0.0 + +
+ + + + + + + velocities/mach + fbw/roll/gain-switch + + 0 1 + 0.2 -2.1 0.0 + 0.9 -1.1 0.0 + +
+ + + + + + + velocities/mach + fbw/pitch/gain-switch + + 0 1 + 0.2 28 0 + 0.9 23 0 + +
+ + + + + fbw/pitch/p-gain + + + 0 + + + + 50 + + + + + + + + + velocities/mach + fbw/pitch/gain-switch + + 0 1 + 0.2 61 0 + 0.9 45 0 + +
+ + + + + + + velocities/mach + fbw/pitch/gain-switch + + 0 1 + 0.2 2.9 0.0 + 0.9 1.3 0.0 + +
+ + + + + + + velocities/mach + fbw/yaw/gain-switch + + 0 1 + 0.2 -10.5 0.0 + 0.9 -2.5 0.0 + +
+ + + + + + + velocities/mach + fbw/yaw/gain-switch + + 0 1 + 0.2 -1.20 0.00 + 0.9 -0.07 0.00 + +
+ + + + + + + velocities/mach + fbw/yaw/gain-switch + + 0 1 + 0.2 -0.25 0.00 + 0.9 -0.19 0.00 + +
+ + + + + + + + + + + /it-autoflight/output/ap1 eq 1 + /it-autoflight/output/ap2 eq 1 + + + + + fbw/roll/a-i-f + + + -1 + + + + 1 + + + + /controls/flight/aileron-input-fast + + + + + + /controls/flight/aileron + + -1.00 -1 + -0.04 0 + 0.04 0 + 1.00 1 + +
+ + + + + + + position/wow eq 0 + fbw/fmgc/enabled eq 0 + + + position/wow eq 0 + fbw/fmgc/enabled eq 1 + + + + + fbw/roll/a-i-s + + + -1 + + + + 1 + + + + /controls/flight/aileron-input + + + + + + + fbw/roll/a-i + 0.261799 + + + attitude/roll-rad + fbw/roll/a-i + + -1 0 1 + -0.575959 0.261799 0.000000 0.000000 + -0.575958 0.000000 0.000000 0.000000 + 0.575958 0.000000 0.000000 0.000000 + 0.575959 0.000000 0.000000 -0.261799 + +
+ + attitude/roll-rad + + -0.750492 0.261799 + -0.575959 0.000000 + 0.575959 0.000000 + 0.750492 -0.261799 + +
+ + + + + + + + + fbw/roll/a-i + 0.261799 + + + attitude/roll-rad + fbw/roll/a-i + + -1 0 1 + -1.169370 0.261799 0.000000 0.000000 + -1.169369 0.000000 0.000000 0.000000 + 1.169369 0.000000 0.000000 0.000000 + 1.169370 0.000000 0.000000 -0.261799 + +
+ + attitude/roll-rad + + -1.343900 0.261799 + -1.169370 0.000000 + 1.169370 0.000000 + 1.343900 -0.261799 + +
+ + + + + + + + attitude/roll-rad + + -1.169370 0.436332 + -0.698132 0.174533 + -0.575959 0.000000 + 0.575959 0.000000 + 0.698132 -0.174533 + 1.169370 -0.436332 + +
+ + + + + + + + fbw/roll/a-i + 0.261799 + + + attitude/roll-rad + fbw/roll/a-i + + -1 0 1 + -0.698132 0.261799 0.000000 0.000000 + -0.698131 0.000000 0.000000 0.000000 + 0.698131 0.000000 0.000000 0.000000 + 0.698132 0.000000 0.000000 -0.261799 + +
+ + + + + + + + attitude/roll-rad + + -0.698132 0.436332 + -0.261799 0.174533 + 0.000000 0.000000 + 0.261799 -0.174533 + 0.698132 -0.436332 + +
+ + + + + + + /it-fbw/roll-lim eq 33 + /it-fbw/roll-back ne 1 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/roll-lim eq 67 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/roll-back eq 1 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/protections/overspeed eq 1 + /it-fbw/protections/overspeed-roll-back ne 1 + + + /it-fbw/protections/overspeed eq 1 + /it-fbw/protections/overspeed-roll-back eq 1 + + + + + fbw/roll/rate-demand + 10.1 + + + + + + /orientation/roll-rate-degps + + + + + + + + gear/unit[0]/WOW eq 1 + + + + + + + fbw/roll/p-r_s-s + fbw/roll/rate-demand-lag + + + + + + + + fbw/roll/gain-switch gt 0 + fbw/roll/pid le -0.999 + fbw/roll/pid ge 0.999 + + + + + fbw/roll/rate-error + fbw/roll/p-gain + fbw/roll/i-gain + fbw/roll/d-gain + fbw/roll/trigger + + -1.0 + 1.0 + + fbw/roll/pid + + + + fbw/fmgc/yaw-cmd + -0.5 + + + + + + position/wow eq 1 + /it-fbw/law eq 1 + /it-fbw/law eq 2 + + + + + + + position/wow eq 0 + /it-fbw/law eq 0 + + + fbw/fmgc/enabled eq 0 + fbw/roll/gear-law-switch eq 1 + + + fbw/fmgc/enabled eq 1 + position/wow eq 1 + /it-fbw/law eq 0 + + + /it-fbw/law eq 3 + + + + + + + + fbw/roll/a-i + + -1.0 -1.0 + -0.2 0.0 + 0.2 0.0 + 1.0 1.0 + +
+ + velocities/mach + + 0.2 0.5 + 0.9 0.1 + +
+ + + + + + + + /it-fbw/roll-back eq 0 + + + + + + + /it-fbw/law ne 3 + /systems/failures/aileron-left eq 0 + + + /it-fbw/law ne 3 + /systems/failures/aileron-left eq 1 + + /controls/flight/spoiler-left-fbw-cmd + + + + + + /it-fbw/law ne 3 + /systems/failures/aileron-right eq 0 + + + /it-fbw/law ne 3 + /systems/failures/aileron-right eq 1 + + /controls/flight/spoiler-right-fbw-cmd + + + + + + + + + + /it-autoflight/output/ap1 eq 1 + /it-autoflight/output/ap2 eq 1 + + + + + fbw/pitch/e-i-f + + + -1 + + + + 1 + + + + /controls/flight/elevator-input-fast + + + + + + /controls/flight/elevator + + -1.00 -1 + -0.04 0 + 0.04 0 + 1.00 1 + +
+ + + + + + + fbw/pitch/elevator-nul + + /position/gear-agl-ft + + 5 0.2 + 30 0.1 + +
+ + + + + + + + fbw/pitch/elevator-nul + -0.15 + + + + + + + + gear/unit[1]/WOW eq 1 + gear/unit[2]/WOW eq 1 + + + + + + + fbw/fmgc/enabled eq 0 + /position/gear-agl-ft le 30 + /controls/flight/flap-pos ge 4 + /controls/engines/engine[0]/throttle lt 0.65 + /controls/engines/engine[1]/throttle lt 0.65 + /FMGC/status/to-state eq 0 + /it-fbw/law eq 0 + position/wow eq 0 + + + fbw/fmgc/enabled eq 0 + /position/gear-agl-ft le 30 + /controls/flight/flap-pos ge 4 + /controls/engines/engine[0]/throttle lt 0.65 + /controls/engines/engine[1]/throttle lt 0.65 + /FMGC/status/to-state eq 0 + /it-fbw/law eq 0 + gear/unit[0]/WOW eq 0 + fbw/pitch/flare-gear-switch eq 1 + + + fbw/fmgc/enabled eq 1 + position/wow eq 0 + + + fbw/fmgc/enabled eq 1 + position/wow eq 1 + + + + + fbw/pitch/e-i-s + + + -1 + + + + 1 + + + + /controls/flight/elevator-input + + + + + + /controls/flight/flap-pos ne 0 + + + + + + + /controls/flight/flap-pos ne 0 + + + + + + + fbw/pitch/e-i + + -1.0 2.5 + 0.0 1.0 + 1.0 -0.5 + +
+ + + fbw/pitch/g-min + fbw/pitch/g-max + + + + + + + + + + velocities/q-rad_sec + velocities/u-fps + + + -1 + velocities/p-rad_sec + velocities/v-fps + + + 32.174 + + attitude/theta-rad + + + attitude/phi-rad + + + + -1 + accelerations/wdot-ft_sec2 + + + 32.174 + + 1 + + + + + + + + fbw/pitch/a-n lt 30 + fbw/pitch/a-n gt -30 + position/wow ne 1 + + + + + + + fbw/pitch/a-n-IaN + + -1 + + attitude/roll-rad + + + 2 + + + + + + + + fbw/pitch/g-computed + fbw/pitch/g-demand + + + + + + + + fbw/pitch/g-pi + -1.0 + + + + + + attitude/roll-rad lt -1.5708 + attitude/roll-rad gt 1.5708 + + + + + + + + + + fbw/pitch/g-pi-switched + -0.087266 + + + attitude/pitch-rad + fbw/pitch/g-pi-switched + + -1 0 1 + -0.261799 0.000000 0.000000 0.087266 + -0.261798 0.000000 0.000000 0.000000 + 0.523598 0.000000 0.000000 0.000000 + 0.523599 -0.087266 0.000000 0.000000 + +
+ + attitude/pitch-rad + + -0.436332 0.087266 + -0.261799 0.000000 + 0.523599 0.000000 + 0.698132 -0.087266 + +
+ + + + + + fbw/pitch/g-pi-switched + -0.087266 + + + + + + + fbw/pitch/g-pi-switched + + -1.0 0.087266 + 0.0 0.026180 + +
+ + attitude/pitch-rad + fbw/pitch/g-pi-switched + + -1 0 + 0.523598 -0.026180 0.000000 + 0.523599 -0.087266 0.000000 + +
+ + attitude/pitch-rad + + 0.523599 0.000000 + 0.698132 -0.087266 + +
+ + + + + + + + fbw/pitch/g-pi-switched + + -1.0 0.087266 + 0.0 0.026180 + 1.0 -0.061086 + +
+ + + + + + + /it-fbw/law eq 0 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/law ne 0 + /it-fbw/protections/overspeed ne 1 + + + /it-fbw/law eq 0 + /it-fbw/protections/overspeed eq 1 + + + /it-fbw/law ne 0 + /it-fbw/protections/overspeed eq 1 + + + + + fbw/pitch/rate-demand + 10.1 + + + + + + /orientation/pitch-rate-degps + + + + + + + + gear/unit[0]/WOW eq 1 + + + + + + + fbw/pitch/t-r_s-s + fbw/pitch/rate-demand-lag + + + + + + + + fbw/pitch/gain-switch gt 0 + fbw/pitch/pid le -0.999 + fbw/pitch/pid ge 0.999 + + + + + fbw/pitch/rate-error + fbw/pitch/p-gain-k + fbw/pitch/i-gain + fbw/pitch/d-gain + fbw/pitch/trigger + + -1.0 + 1.0 + + fbw/pitch/pid + + + + fbw/pitch/pid + -1.0 + + + + + + attitude/roll-rad lt -1.5708 + attitude/roll-rad gt 1.5708 + + + + + + + /it-fbw/law eq 0 + /it-fbw/law eq 1 + + + + + + + gear/unit[1]/WOW eq 1 + gear/unit[2]/WOW eq 1 + /it-fbw/law eq 2 + + + + + + + position/wow eq 0 + fbw/pitch/law-switch eq 1 + + + fbw/fmgc/enabled eq 0 + fbw/pitch/law-gear-switch eq 1 + + + fbw/fmgc/enabled eq 1 + position/wow eq 1 + + + /it-fbw/law eq 3 + + + + + + + fbw/fmgc/enabled eq 1 + + + + + + + fbw/pitch/gain-switch eq 0 + /position/gear-agl-ft ge fbw/pitch/autotrim-height + attitude/roll-rad lt 0.628319 + attitude/roll-rad gt -0.628319 + fbw/pitch/pid-switched ge 0.01 + forces/load-factor lt -0.5 + /it-fbw/protections/overspeed ne 1 + /controls/flight/elevator-trim le 0.32 + position/wow eq 0 + + + fbw/pitch/gain-switch eq 0 + /position/gear-agl-ft ge fbw/pitch/autotrim-height + attitude/roll-rad lt 0.628319 + attitude/roll-rad gt -0.628319 + fbw/pitch/pid-switched le -0.01 + forces/load-factor lt -0.5 + /it-fbw/protections/overspeed ne 1 + /controls/flight/elevator-trim ge -1.0 + position/wow eq 0 + + + + + + + + + fbw/pitch/autotrim-switch + 1 + + + fbw/pitch/pid-switched + + 0.05 0.00001 + 0.30 0.00015 + +
+ 0.0 + + + + fbw/pitch/autotrim-switch + 2 + + + fbw/pitch/pid-switched + + -0.30 -0.00015 + -0.05 -0.00001 + +
+ 0.0 + + + + + + + + + /controls/flight/elevator-trim + fbw/pitch/autotrim-offset + + + + -1.0 + 0.32 + + /controls/flight/elevator-trim + + + + + + + + + + /controls/flight/rudder + fbw/fmgc/enabled + + 0 1 + -1.00 -1 0 + -0.04 0 0 + 0.04 0 0 + 1.00 1 0 + +
+ + + + + + + fbw/fmgc/enabled eq 1 + /it-autoflight/output/lat eq 4 + + + + + + + position/wow eq 1 + fbw/yaw/rudder-nul gt 0 + fbw/yaw/rudder-nul lt 0 + /position/gear-agl-ft lt 50 + fbw/yaw/autoland-switch eq 1 + + + + + fbw/yaw/r-r_s-s + fbw/yaw/yd-p-gain + + -0.2 + 0.2 + + + + + + + position/wow eq 1 + fbw/yaw/rudder-nul gt 0 + fbw/yaw/rudder-nul lt 0 + + + + + + + fbw/yaw/gain-switch gt 0 + fbw/yaw/tc-pid le -0.199 + fbw/yaw/tc-pid ge 0.199 + /position/gear-agl-ft lt 50 + fbw/yaw/autoland-switch eq 1 + + + + + fbw/yaw/slip-skid + fbw/yaw/tc-p-gain + fbw/yaw/tc-i-gain + 0.0 + fbw/yaw/trigger + + -0.2 + 0.2 + + fbw/yaw/tc-pid + + + + + + position/wow eq 1 + fbw/yaw/rudder-nul gt 0 + fbw/yaw/rudder-nul lt 0 + + + + + + + fbw/yaw/autoland-switch eq 1 + + + + + fbw/yaw/yd-f + fbw/yaw/tc-pid-s + fbw/yaw/fmgc-cmd + + + + + + /it-fbw/law eq 0 + /it-fbw/law eq 1 + + + + + + + fbw/yaw/law-switch eq 1 + fbw/yaw/rudder-nul eq 0 + + /controls/flight/rudder-fbw + + + + @@ -44,7 +1243,7 @@ - /controls/flight/roll-fbw + fbw/aileron-output /controls/flight/aileron-trim -1 @@ -92,23 +1291,23 @@ - /systems/hydraulic/green-psi GE 1500 - /systems/hydraulic/blue-psi GE 1500 + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 - hydraulics/aileron-l/pressure-switch-or EQ 1 - /controls/flight/speedbrake-norm EQ 1 - /gear/gear[1]/wow EQ 1 - /gear/gear[2]/wow EQ 1 - /systems/failures/aileron-left EQ 0 + hydraulics/aileron-l/pressure-switch-or eq 1 + /controls/flight/speedbrake-norm eq 1 + /gear/gear[1]/wow eq 1 + /gear/gear[2]/wow eq 1 + /systems/failures/aileron-left eq 0 - hydraulics/aileron-l/pressure-switch-or EQ 1 - /systems/failures/aileron-left EQ 0 + hydraulics/aileron-l/pressure-switch-or eq 1 + /systems/failures/aileron-left eq 0 -0.5 @@ -116,20 +1315,11 @@ - + hydraulics/aileron-l/switch - - - -1.0 - - - - 1.0 - - - + 14.5 /controls/flight/aileron-left - + @@ -168,23 +1358,23 @@ - /systems/hydraulic/green-psi GE 1500 - /systems/hydraulic/blue-psi GE 1500 + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 - hydraulics/aileron-r/pressure-switch-or EQ 1 - /controls/flight/speedbrake-norm EQ 1 - /gear/gear[1]/wow EQ 1 - /gear/gear[2]/wow EQ 1 - /systems/failures/aileron-right EQ 0 + hydraulics/aileron-r/pressure-switch-or eq 1 + /controls/flight/speedbrake-norm eq 1 + /gear/gear[1]/wow eq 1 + /gear/gear[2]/wow eq 1 + /systems/failures/aileron-right eq 0 - hydraulics/aileron-r/pressure-switch-or EQ 1 - /systems/failures/aileron-right EQ 0 + hydraulics/aileron-r/pressure-switch-or eq 1 + /systems/failures/aileron-right eq 0 -0.5 @@ -192,20 +1382,11 @@ - + hydraulics/aileron-r/switch - - - -1.0 - - - - 1.0 - - - + 14.5 /controls/flight/aileron-right - + @@ -254,23 +1435,23 @@ - - /controls/flight/elevator-fbw + + fbw/elevator-output -0.6666666666666666666666666666666 1.0 - - - - /velocities/groundspeed-kt LT 75 + + + + /velocities/groundspeed-kt lt 75 - - hydraulics/elevator-fbw-switch + + hydraulics/elevator-output-switch 0.5 @@ -281,16 +1462,16 @@ - /systems/hydraulic/green-psi GE 1500 - /systems/hydraulic/blue-psi GE 1500 + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 - - hydraulics/elevator-l/pressure-switch-or EQ 1 - /systems/failures/elevator-left EQ 0 + + hydraulics/elevator-l/pressure-switch-or eq 1 + /systems/failures/elevator-left eq 0 -0.5 @@ -298,20 +1479,11 @@ - + hydraulics/elevator-l/switch - - - -1.0 - - - - 1.0 - - - + 14.5 /controls/flight/elevator-left - + @@ -320,16 +1492,16 @@ - /systems/hydraulic/yellow-psi GE 1500 - /systems/hydraulic/blue-psi GE 1500 + /systems/hydraulic/yellow-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 - - hydraulics/elevator-r/pressure-switch-or EQ 1 - /systems/failures/elevator-right EQ 0 + + hydraulics/elevator-r/pressure-switch-or eq 1 + /systems/failures/elevator-right eq 0 -0.5 @@ -337,20 +1509,11 @@ - + hydraulics/elevator-r/switch - - - -1.0 - - - - 1.0 - - - + 14.5 /controls/flight/elevator-right - + @@ -534,15 +1697,15 @@ - /systems/fctl/fac1 EQ 1 - /systems/fctl/fac2 EQ 1 - /gear/gear[1]/wow EQ 0 - /gear/gear[2]/wow EQ 0 + /systems/fctl/fac1 eq 1 + /systems/fctl/fac2 eq 1 + /gear/gear[1]/wow eq 0 + /gear/gear[2]/wow eq 0 - /controls/flight/slats EQ 0 - /gear/gear[1]/wow EQ 0 - /gear/gear[2]/wow EQ 0 + /controls/flight/slats eq 0 + /gear/gear[1]/wow eq 0 + /gear/gear[2]/wow eq 0 @@ -566,9 +1729,9 @@ - /systems/hydraulic/green-psi GE 1500 - /systems/hydraulic/blue-psi GE 1500 - /systems/hydraulic/yellow-psi GE 1500 + /systems/hydraulic/green-psi ge 1500 + /systems/hydraulic/blue-psi ge 1500 + /systems/hydraulic/yellow-psi ge 1500 @@ -593,7 +1756,7 @@ - /controls/flight/rudder-fbw + fbw/rudder-output hydraulics/rudder/trim-norm -1 @@ -604,94 +1767,27 @@ - hydraulics/rudder/pressure-switch-or EQ 1 - /systems/failures/rudder EQ 0 + hydraulics/rudder/pressure-switch-or eq 1 + /systems/failures/rudder eq 0 - - -1.0 - 1.0 - - - - - hydraulics/rudder/switch - - - -1.0 - - - - 1.0 - - - hydraulics/rudder/max-deg-scale-neg hydraulics/rudder/max-deg-scale + + + + hydraulics/rudder/switch + 13.5 /controls/flight/rudder-fdm - + - - hydraulics/rudder/final - -1.0 - - - - velocities/r-aero-rad_sec - - velocities/ve-kts - - 30 0.00 - 60 2.00 - -
- - -0.05 - 0.05 - - - - - fcs/yaw-damper-rate - - velocities/ve-kts - - 30 0.0 - 31 1.0 - -
- - - - - - /it-fbw/law == 0 - /gear/gear[1]/wow EQ 0 - /gear/gear[2]/wow EQ 0 - - - /it-fbw/law == 1 - /gear/gear[1]/wow EQ 0 - /gear/gear[2]/wow EQ 0 - - - - - hydraulics/rudder/gain - fcs/yaw-damper-switch - - -1 - 1 - - - - fcs/yaw-sum + hydraulics/rudder/final -0.436332 0.436332 @@ -799,7 +1895,7 @@ - /controls/flight/aileron-drives-tiller EQ 1 + /controls/flight/aileron-drives-tiller eq 1 @@ -839,7 +1935,7 @@ - /controls/autobrake/active EQ 1 + /controls/autobrake/active eq 1 fcs/left-brake-cmd-norm @@ -856,7 +1952,7 @@ - /controls/autobrake/active EQ 1 + /controls/autobrake/active eq 1 fcs/right-brake-cmd-norm diff --git a/Systems/fbw-drivers.xml b/Systems/fbw-drivers.xml deleted file mode 100644 index 9aa7c9e2..00000000 --- a/Systems/fbw-drivers.xml +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - - - - - - - - - false - noise-spike - - - - /systems/acconfig/mismatch-code - 0x000 - - - - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - 0 - - /controls/flight/aileron - /controls/flight/aileron-input-fast - 5 - - - - false - noise-spike - - - - /systems/acconfig/mismatch-code - 0x000 - - - - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - 0 - - /controls/flight/elevator - /controls/flight/elevator-input-fast - 5 - - - - false - noise-spike - - - - /systems/acconfig/mismatch-code - 0x000 - - - - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - /it-autoflight/internal/aileron-cmd - - - - - /controls/flight/aileron - -1.00-1 - -0.04 0 - 0.00 0 - 0.04 0 - 1.00 1 -
- - - /controls/flight/aileron-input - - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - - 1.0 - - 5 - - - - false - noise-spike - - - - /systems/acconfig/mismatch-code - 0x000 - - - - - - - - /it-autoflight/output/ap1 - 0 - - - /it-autoflight/output/ap2 - 0 - - - /position/gear-agl-ft - 30 - - - /controls/flight/flap-pos - 4 - - - /controls/engines/engine[0]/throttle - 0.65 - - - /controls/engines/engine[1]/throttle - 0.65 - - - /FMGC/status/to-state - 0 - - - /it-fbw/law - 0 - - - /gear/gear[0]/wow - 0 - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - - - - - /controls/flight/elevator - -1.00-1 - -0.04 0 - 0.00 0 - 0.04 0 - 1.00 1 -
- - /position/gear-agl-ft - 50.20 - 300.10 -
- - - - - - - - /it-autoflight/output/ap1 - 0 - - - /it-autoflight/output/ap2 - 0 - - - /position/gear-agl-ft - 30 - - - /controls/flight/flap-pos - 4 - - - /controls/engines/engine[0]/throttle - 0.65 - - - /controls/engines/engine[1]/throttle - 0.65 - - - /FMGC/status/to-state - 0 - - - /it-fbw/law - 0 - - - /gear/gear[0]/wow - 0 - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - - - - - /controls/flight/elevator - -1.00-1 - -0.04 0 - 0.00 0 - 0.04 0 - 1.00 1 -
- 0.15 - - - - - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - - /it-autoflight/internal/elevator-cmd - - - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - - 0.0 - - - - - /controls/flight/elevator - -1.00-1 - -0.04 0 - 0.00 0 - 0.04 0 - 1.00 1 -
- - - /controls/flight/elevator-input - - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - - 1.0 - - 5 - - - diff --git a/Systems/fbw-pitch.xml b/Systems/fbw-pitch.xml index 780f4c66..a0a4477e 100644 --- a/Systems/fbw-pitch.xml +++ b/Systems/fbw-pitch.xml @@ -6,107 +6,20 @@ ############################################## --> - + + - - - - - - IT-CONTROLLER: LOAD FACTOR CMD - gain - 1.0 - - - - - /controls/flight/elevator-input - 1-0.5 - 0 1.0 - -1 2.5 -
- - - - /it-fbw/g-target - - - - /controls/flight/flap-pos - 0 - - - 0.0 - - -1.0 - - - - /controls/flight/flap-pos - 0 - - - 2.0 - - 2.5 - - - - IT-CONTROLLER: COMPUTED G - gain - 1.0 - - - - /accelerations/pilot-gdamped -
- -1 - - - - /orientation/roll-deg - 0.965 - - - -
- 1 - - - - /it-fbw/g-computed - - - - IT-CONTROLLER: G ERROR - gain - -1.0 - - - - /it-fbw/g-target - /it-fbw/g-computed - - - - /it-fbw/g-error - - - IT-CONTROLLER: G ELEVATOR + FBW PITCH G PI false - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow + /fdm/jsbsim/position/wow 0 @@ -123,13 +36,13 @@ - /it-fbw/g-error + /fdm/jsbsim/fbw/pitch/g-error 0 - /it-fbw/g-elevator-cmd + /fdm/jsbsim/fbw/pitch/g-pi -1.5 @@ -137,544 +50,24 @@ - /controls/flight/elevator-input + /fdm/jsbsim/fbw/pitch/e-i 0 - /controls/flight/elevator-input + /fdm/jsbsim/fbw/pitch/e-i 0.0 - /controls/flight/elevator-input + /fdm/jsbsim/fbw/pitch/e-i 0 - /controls/flight/elevator-input + /fdm/jsbsim/fbw/pitch/e-i 0.0 - - - IT-CONTROLLER: G ELEVATOR INVERT - gain - 1.0 - - - - - /orientation/roll-deg - 90 - - - /orientation/roll-deg - -90 - - - - /it-fbw/g-elevator-cmd - - - /it-fbw/g-elevator-cmd - -1.0 - - /it-fbw/g-elevator - - - - IT-CONTROLLER: PITCH RATE CMD - gain - 1.0 - - - - - /it-fbw/law - 0 - - - /it-fbw/protections/overspeed - 1 - - - - - - - /it-fbw/g-elevator - 1-5.0 - 0 0.0 - -1 5.0 -
- - - /orientation/pitch-deg - -15.000001 - -14.999990 -
- - /it-fbw/g-elevator - 15.0 - 00.0 -
- - - - /orientation/pitch-deg - 29.999990 - 30.000001 -
- - /it-fbw/g-elevator - 0 0.0 - -1-5.0 -
- - - /orientation/pitch-deg - -18 5 - -15 0 - 30 0 - 33-5 -
- - - - - - - - /it-fbw/law - 0 - - - /it-fbw/protections/overspeed - 1 - - - - - - - /it-fbw/g-elevator - 1-5.0 - 0 0.0 - -1 5.0 -
- - - - - - - - /it-fbw/law - 0 - - - /it-fbw/protections/overspeed - 1 - - - - - - - /it-fbw/g-elevator - 0.0 1.5 - -1.0 5.0 -
- - - /orientation/pitch-deg - 29.999990 - 30.000001 -
- - /it-fbw/g-elevator - 0-1.5 - -1-5.0 -
- - - /orientation/pitch-deg - 30 0 - 33-5 -
- - - - - - - - /it-fbw/law - 0 - - - /it-fbw/protections/overspeed - 1 - - - - - - - /it-fbw/g-elevator - 1.0-3.5 - 0.0 1.5 - -1.0 5.0 -
- - - /orientation/pitch-deg - -15.000001 - -14.999990 -
- - /it-fbw/g-elevator - 1 3.5 - 0-1.5 -
- - - - /orientation/pitch-deg - 29.999990 - 30.000001 -
- - /it-fbw/g-elevator - 0-1.5 - -1-5.0 -
- - - /orientation/pitch-deg - -18 5 - -15 0 - 30 0 - 33-5 -
- - - - /it-fbw/pitch-rate - - - - IT-CONTROLLER: PITCH KP (P Gain) - gain - 1.0 - - - - /velocities/mach - 0.2-0.31 - 0.9-0.15 -
- - - /it-fbw/pitch-kp - - - - IT-CONTROLLER: PITCH TI (I Time) - gain - 1.0 - - - - /velocities/mach - 0.20.75 - 0.90.55 -
- - - /it-fbw/pitch-ti - - - - IT-CONTROLLER: PITCH - false - - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - - /it-fbw/law - 0 - - - /it-fbw/law - 1 - - - - - - - /orientation/pitch-rate-degps - - - /it-fbw/pitch-rate - - - /controls/flight/elevator-fbw-pid - - - - /it-fbw/pitch-kp - - 1 - 0.1 - 0 - - /it-fbw/pitch-ti - - 0.005 - -1 - 1 - - - - - IT-CONTROLLER: ELEVATOR INVERT - gain - 1.0 - - - - - /orientation/roll-deg - 90 - - - /orientation/roll-deg - -90 - - - - /controls/flight/elevator-fbw-pid - - - /controls/flight/elevator-fbw-pid - -1.0 - - /controls/flight/elevator-fbw-cmd - - - - IT-CONTROLLER: PITCH OPTION - false - gain - 1.0 - true - output - - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - - /it-fbw/law - 0 - - - /it-fbw/law - 1 - - - - - /controls/flight/elevator-fbw-cmd - - - - - - /it-autoflight/output/ap1 - 0 - - - /it-autoflight/output/ap2 - 0 - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - /it-fbw/law - 2 - - - - - /controls/flight/elevator-input-fast - - - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - - 0.1 - - - - - /it-fbw/law - 3 - - - 0 - - /controls/flight/elevator-fbw - - - - IT-CONTROLLER: PITCH TRIM - false - output - noise-spike - - - - - - /it-fbw/law - 0 - - - /it-fbw/law - 1 - - - - - - /position/gear-agl-ft - 100 - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - - - /position/gear-agl-ft - 50 - - - /it-autoflight/output/ap1 - 0 - - - /it-autoflight/output/ap2 - 0 - - - - - /orientation/roll-deg - 40 - - - /orientation/roll-deg - -40 - - - - /controls/flight/elevator-fbw - 0.01 - - - /controls/flight/elevator-fbw - -0.01 - - - - /fdm/jsbsim/forces/load-factor - -0.5 - - - /it-fbw/protections/overspeed - 1 - - - - - - - - /controls/flight/elevator-fbw - 0.01 - - - 1 - - - - - /controls/flight/elevator-fbw - -0.01 - - - -1 - - /controls/flight/elevator-trim - -1.0 - 0.32 - 0.01 - diff --git a/Systems/fbw-roll-yaw.xml b/Systems/fbw-roll-yaw.xml deleted file mode 100644 index b4ce1183..00000000 --- a/Systems/fbw-roll-yaw.xml +++ /dev/null @@ -1,747 +0,0 @@ - - - - - - - - - - - - - - - IT-CONTROLLER: ROLL - gain - 1.0 - - - - - /it-fbw/roll-lim - 33 - - - /it-fbw/roll-back - 1 - - - /it-fbw/protections/overspeed - 1 - - - - - - - /controls/flight/aileron-input - -1-15.0 - 0 0.0 - 1 15.0 -
- - - /orientation/roll-deg - -33.000001 - -32.999990 -
- - /controls/flight/aileron-input - -115.0 - 0 0.0 -
- - - - /orientation/roll-deg - 32.999990 - 33.000001 -
- - /controls/flight/aileron-input - 0 0.0 - 1-15.0 -
- - - - - - - - - /it-fbw/roll-lim - 67 - - - /it-fbw/protections/overspeed - 1 - - - - - - - /controls/flight/aileron-input - -1-15.0 - 0 0.0 - 1 15.0 -
- - - /orientation/roll-deg - -67.000001 - -66.999990 -
- - /controls/flight/aileron-input - -115.0 - 0 0.0 -
- - - - /orientation/roll-deg - 66.999990 - 67.000001 -
- - /controls/flight/aileron-input - 0 0.0 - 1-15.0 -
- - - - - - - - - /it-fbw/roll-back - 1 - - - /it-fbw/protections/overspeed - 1 - - - - - - /orientation/roll-deg - -67 25.0 - -40 10.0 - -33 0.0 - 33 0.0 - 40-10.0 - 67-25.0 -
- - - - - - - /it-fbw/protections/overspeed - 1 - - - /it-fbw/protections/overspeed-roll-back - 1 - - - - - - - /controls/flight/aileron-input - -1-15.0 - 0 0.0 - 1 15.0 -
- - - /orientation/roll-deg - -40.000001 - -39.999990 -
- - /controls/flight/aileron-input - -115.0 - 0 0.0 -
- - - - /orientation/roll-deg - 39.999990 - 40.000001 -
- - /controls/flight/aileron-input - 0 0.0 - 1-15.0 -
- - - - - - - - - /it-fbw/protections/overspeed - 1 - - - /it-fbw/protections/overspeed-roll-back - 1 - - - - - - /orientation/roll-deg - -40 25.0 - -15 10.0 - 0 0.0 - 15-10.0 - 40-25.0 -
- - - /it-fbw/roll-rate - - - - IT-CONTROLLER: ROLL KP (P Gain) - gain - 1.0 - - - - /velocities/mach - 0.20.13 - 0.90.06 -
- - - /it-fbw/roll-kp - - - - IT-CONTROLLER: ROLL TI (I Time) - gain - 1.0 - - - - /velocities/mach - 0.20.75 - 0.90.65 -
- - - /it-fbw/roll-ti - - - - IT-CONTROLLER: ROLL - false - - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - /it-fbw/law - 0 - - - - - - /orientation/roll-rate-degps - - - /it-fbw/roll-rate - - - /controls/flight/aileron-fbw-cmd - - - - /it-fbw/roll-kp - - 1 - 0.1 - 0 - - /it-fbw/roll-ti - - 0.005 - -1 - 1 - - - - - IT-CONTROLLER: ROLL OPTION - false - gain - 1.0 - true - output - - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - - - /it-fbw/law - 0 - - - - /controls/flight/aileron-fbw-cmd - - - - - - /it-autoflight/output/ap1 - 0 - - - /it-autoflight/output/ap2 - 0 - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - /it-fbw/law - 1 - - - /it-fbw/law - 2 - - - - - /controls/flight/aileron-input-fast - - - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - - /it-fbw/law - 0 - - - - /controls/flight/rudder - -1 - - - - - /it-fbw/law - 3 - - - 0 - - /controls/flight/roll-fbw - - - - IT-CONTROLLER: SPOILER - gain - 1.0 - - - - /it-fbw/roll-back - 0 - - - - - /controls/flight/aileron-input - - /instrumentation/airspeed-indicator/indicated-mach - 0.21.00 - 0.90.25 -
- - - - - - - /it-fbw/roll-back - 1 - - - 0 - - /controls/flight/spoiler-input - - - - IT-CONTROLLER: LEFT SPOILER - gain - 1.0 - - - - - /systems/failures/aileron-left - 0 - - - /it-fbw/law - 3 - - - - - - /controls/flight/spoiler-input - -1.0-1.0 - -0.2 0.0 - 0.0 0.0 - 0.2 0.0 - 1.0 1.0 -
- - - - - - - /systems/failures/aileron-left - 1 - - - /it-fbw/law - 3 - - - - - - /controls/flight/roll-fbw - -1.0-1.0 - 0.0 0.0 - 1.0 1.0 -
- - - 0 - /controls/flight/spoiler-left-fbw-cmd - -1 - 1 - - - - IT-CONTROLLER: RIGHT SPOILER - gain - 1.0 - - - - - /systems/failures/aileron-right - 0 - - - /it-fbw/law - 3 - - - - - - /controls/flight/spoiler-input - -1.0-1.0 - -0.2 0.0 - 0.0 0.0 - 0.2 0.0 - 1.0 1.0 -
- - - - - - - /systems/failures/aileron-right - 1 - - - /it-fbw/law - 3 - - - - - - /controls/flight/roll-fbw - -1.0-1.0 - 0.0 0.0 - 1.0 1.0 -
- - - 0 - /controls/flight/spoiler-right-fbw-cmd - -1 - 1 - - - - - - - - IT-CONTROLLER: YAW DAMPER/TURN COORDINATOR FEEDBACK IF DISABLED - - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - /it-fbw/law - 0 - - - /controls/flight/rudder - 0.1 - - - /controls/flight/rudder - -0.1 - - - /position/gear-agl-ft - 50 - - - /it-autoflight/output/lat - 4 - - - - - gain - 1.0 - 0 - /controls/flight/rudder-fbw-cmd - -0.2 - 0.2 - - - - IT-CONTROLLER: YAW DAMPER/TURN COORDINATOR - false - - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - /it-fbw/law - 0 - - - /position/gear-agl-ft - 50 - - - /it-autoflight/output/lat - 4 - - - /controls/flight/rudder - 0.1 - - - /controls/flight/rudder - -0.1 - - - - - - /instrumentation/slip-skid-ball/indicated-slip-skid - - - 0 - - - /controls/flight/rudder-fbw-cmd - - - 0.025 - 1 - 0.1 - 0 - 3.0 - 0.00001 - -0.2 - 0.2 - - - - - IT-CONTROLLER: RUDDER OPTION - false - true - output - - - - - /gear/gear[1]/wow - 0 - - - /gear/gear[2]/wow - 0 - - - /it-fbw/law - 0 - - - /controls/flight/rudder - 0.1 - - - /controls/flight/rudder - -0.1 - - - /position/gear-agl-ft - 50 - - - /it-autoflight/output/lat - 4 - - - - /controls/flight/rudder-fbw-cmd - - - - - - /gear/gear[1]/wow - 1 - - - /gear/gear[2]/wow - 1 - - - /it-fbw/law - 0 - - - /controls/flight/rudder - 0.1 - - - /controls/flight/rudder - -0.1 - - - /position/gear-agl-ft - 50 - - - /it-autoflight/output/lat - 4 - - - - /controls/flight/rudder - - /controls/flight/rudder-fbw - noise-spike - 2.5 - - - diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml index 061194d6..9548e096 100644 --- a/Systems/fmgc-pitch.xml +++ b/Systems/fmgc-pitch.xml @@ -657,20 +657,6 @@ false gain 0.15 - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - /orientation/pitch-deg @@ -678,7 +664,7 @@ /it-autoflight/internal/target-pitch-deg - /it-autoflight/internal/elevator-cmd + /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 507a6c9c..94d47db9 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -197,20 +197,6 @@ false gain -0.1 - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - /orientation/roll-deg @@ -245,7 +231,7 @@ 0 - /it-autoflight/internal/aileron-cmd + /fdm/jsbsim/fbw/fmgc/roll-cmd -0.32 0.32 @@ -315,20 +301,6 @@ false true output - - - - - /it-autoflight/output/ap1 - 1 - - - /it-autoflight/output/ap2 - 1 - - - - @@ -347,7 +319,7 @@ /it-autoflight/internal/rudder-cmd - /controls/flight/rudder + /fdm/jsbsim/fbw/fmgc/yaw-cmd noise-spike 0.6 diff --git a/Systems/v2500-sound.xml b/Systems/v2500-sound.xml index 8e983c4e..c1cd7f46 100644 --- a/Systems/v2500-sound.xml +++ b/Systems/v2500-sound.xml @@ -276,8 +276,8 @@ /engines/engine[0]/n1-actual0.01 - 0.15 0.40 - 0.22 0.85 + 0.15 0.50 + 0.22 1.000.50 1.30
 @@ -296,8 +296,8 @@ /engines/engine[1]/n1-actual0.01 - 0.15 0.40 - 0.22 0.85 + 0.15 0.50 + 0.22 1.000.50 1.30
 From 5902ac3b0306d38189dde6b58480632a78547896 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 24 Apr 2018 12:38:04 -0400 Subject: [PATCH 02/13] Control: Revise Roll C1 response --- Systems/a320-fcs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index ec5bd31f..208af58c 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -425,7 +425,7 @@ fbw/roll/rate-demand - 10.1 + 16.4 From e61e65b7a7053f3eb840b8f8d6542bb78aad3021 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 24 Apr 2018 13:10:45 -0400 Subject: [PATCH 03/13] Control: Fix Yaw typo --- Systems/a320-fcs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 208af58c..63d0ba59 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1153,7 +1153,7 @@ - + fbw/yaw/slip-skid fbw/yaw/tc-p-gain fbw/yaw/tc-i-gain From 9b00cba2ac14846be5141cafd2e66f2eab55ed97 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 29 Apr 2018 09:21:54 -0400 Subject: [PATCH 04/13] System: Useless commit --- Systems/autopilot-dlg.xml | 158 +++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/Systems/autopilot-dlg.xml b/Systems/autopilot-dlg.xml index f2256759..c95bd24f 100644 --- a/Systems/autopilot-dlg.xml +++ b/Systems/autopilot-dlg.xml @@ -13,33 +13,33 @@ autopilot vbox - 260 + 260 - - hbox - - left - - - - + + hbox + + left + + + + - + hbox @@ -357,6 +372,29 @@ true + + + left + + /systems/acconfig/extra-stuff + + /options/system/laptop-mode + + property-toggle + /options/system/laptop-mode + + + dialog-apply + + + nasal + + + true + + left diff --git a/AircraftConfig/welcome.xml b/AircraftConfig/welcome.xml index 19de2518..7b303da6 100644 --- a/AircraftConfig/welcome.xml +++ b/AircraftConfig/welcome.xml @@ -19,6 +19,21 @@ left + 1 +