diff --git a/A320-main.xml b/A320-main.xml
index d3a5c7e2..dca15758 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -493,6 +493,7 @@
+ 0
@@ -950,7 +951,10 @@
- 0
+ 0
+
+ 0
+
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index c4ce93ab..70658b7a 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -86,6 +86,7 @@ setprop("/systems/acconfig/options/allow-oil-consumption", 0);
setprop("/systems/acconfig/options/welcome-skip", 0);
setprop("/systems/acconfig/options/no-rendering-warn", 0);
setprop("/systems/acconfig/options/save-state", 0);
+setprop("/systems/acconfig/options/seperate-tiller-axis", 0);
setprop("/systems/acconfig/options/pfd-rate", 1);
setprop("/systems/acconfig/options/nd-rate", 1);
setprop("/systems/acconfig/options/uecam-rate", 1);
diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
index 2bc5e745..0c230669 100644
--- a/AircraftConfig/main.xml
+++ b/AircraftConfig/main.xml
@@ -466,10 +466,30 @@
true
+
+
+ Use Seperate Tiller Axis
+ left
+ /systems/acconfig/options/seperate-tiller-axis
+
+ property-toggle
+ /systems/acconfig/options/seperate-tiller-axis
+
+
+ dialog-apply
+
+
+ nasal
+
+
+ true
+
- Save states between sessions
+ Save States Between Sessions
left
/systems/acconfig/options/save-state
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index baffe01c..db494f12 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -1073,8 +1073,6 @@
vs-text-test
wpt_led
wpt_led.001
- terr_on_nd_label
-
systems/electrical/bus/dc-ess
@@ -6596,8 +6594,8 @@
rotate
tiller
- fdm/jsbsim/fbw/rudder-pedal
- -70
+ fdm/jsbsim/fbw/tiller-handle
+ -75
tiller.axis
@@ -6605,8 +6603,8 @@
rotate
tillerFo
- fdm/jsbsim/fbw/rudder-pedal
- -70
+ fdm/jsbsim/fbw/tiller-handle
+ -75
tillerFo.axis
diff --git a/Models/Instruments/PFD/res/pfd.svg b/Models/Instruments/PFD/res/pfd.svg
index 5fe50384..214a1acd 100644
--- a/Models/Instruments/PFD/res/pfd.svg
+++ b/Models/Instruments/PFD/res/pfd.svg
@@ -7,13 +7,13 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1024pt"
- height="1024pt"
- viewBox="0 0 1024 1024"
- version="1.1"
+ sodipodi:docname="pfd.svg"
+ inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
id="svg2"
- inkscape:version="0.91 r13725"
- sodipodi:docname="pfd.svg">
+ version="1.1"
+ viewBox="0 0 1024 1024"
+ height="1024pt"
+ width="1024pt">
@@ -29,58 +29,50 @@
+ fit-margin-right="0"
+ fit-margin-left="0"
+ fit-margin-top="0"
+ units="pt"
+ inkscape:snap-global="false"
+ showguides="true"
+ inkscape:current-layer="svg2"
+ inkscape:window-maximized="1"
+ inkscape:window-y="23"
+ inkscape:window-x="0"
+ inkscape:cy="886.5494"
+ inkscape:cx="916.44902"
+ inkscape:zoom="2.1546825"
+ showgrid="true"
+ id="namedview371"
+ inkscape:window-height="1035"
+ inkscape:window-width="1920"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="1"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="20"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#000000">
+ id="grid5153"
+ type="xygrid" />
-
+
+ inkscape:label="#g4891"
+ id="AI_group">
+ inkscape:label="#g5497">
+ inkscape:label="#g5492"
+ id="AI_background">
+
+
-
-
+ x="-195.39726"
+ height="1102.3193"
+ width="1287.3096"
+ id="AI_sky"
+ style="opacity:1;fill:#368acd;fill-opacity:1;stroke:none;stroke-width:2.58922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ inkscape:label="#g5341"
+ id="AI_scale">
+ id="AI_sky_scale"
+ inkscape:label="#g4851">
+ id="path4684"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,521.5684 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
+ id="path5071"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,462.4348 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path5075"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="M 393.624,373.7344 H 502.88512"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,314.60083 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path5119"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,285.034 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
+ id="path5133"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,225.9004 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path5137"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="M 393.624,137.2 H 502.88512"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,78.066427 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path5151"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,48.499597 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
+ id="path5165"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,-10.634 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path5169"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="M 393.624,-99.334403 H 502.88512"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,-158.46797 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path5183"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,-188.0348 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
+ id="path5197"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,-247.1684 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path5201"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="M 393.624,-335.8688 H 502.88512"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,-395.00237 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path5215"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,-424.5692 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
+ id="path4505"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ id="AI_ground_scale"
+ inkscape:label="#g4813">
+ d="m 433.99987,639.8352 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,669.402 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4509"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="M 393.624,728.5356 H 502.88512"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 433.99987,758.1028 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
-
+
+ id="path4527"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,876.37 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,905.9368 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4533"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="M 393.624,965.0704 H 502.88512"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 433.99987,994.63724 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,1024.204 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4569"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="M 393.624,1083.3376 H 502.88512"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
+ id="path4575"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,1172.038 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4579"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,1231.1716 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,1260.7384 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4601"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="M 393.624,1319.872 H 502.88512"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
+ id="path4607"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,1408.5724 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4611"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 433.99987,1467.706 h 28.50952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 420.6008,1497.2728 h 55.30952"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4633"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
-
-
+
+
+ id="AI_scale_num"
+ inkscape:label="#g4737">
- 10
+ inkscape:label="#g4699"
+ id="AI_sky_num">
10
- 20
10
+ 20
- 30
20
+ 30
- 40
30
+ 40
- 50
40
+ 50
- 60
50
+ 60
- 70
60
+ 70
- 80
70
+ 80
- 90
80
+ 90
+ 90
- 10
+ inkscape:label="#g4661"
+ id="AI_ground_num">
10
- 20
10
+ 20
- 30
20
+ 30
- 40
30
+ 40
- 50
40
+ 50
- 60
50
+ 60
- 70
60
+ 70
- 80
70
+ 80
- 90
80
+ 90
+ 90
+ id="AI_pitch_lim">
+ d="m 370.5312,154.3476 h 21.6616"
+ style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ id="g4951"
+ transform="translate(133.78495)">
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 370.53103,162.42242 h 21.66136"
+ style="fill:none;fill-opacity:1;stroke:#0dc04b;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="g4964"
+ transform="matrix(0.9999956,0,0,0.9999865,26.97857,532.2047)">
-
-
-
-
+
+
+
+
- X
+ id="AI_pitch_lim_X">
X
- X
X
+ X
+ X
+ inkscape:label="#g4918">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ id="AI_bankindex"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc"
+ inkscape:label="#rect902" />
+ height="12.775722"
+ width="12.257594"
+ id="rect4756"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.73024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+
-
+ x="509.36719"
+ height="263.53848"
+ width="7.5999999"
+ id="FD_pitch"
+ style="fill:#0dc04b;fill-opacity:1;stroke:none;stroke-width:2.8775;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ transform="rotate(90)" />
+ transform="translate(-0.38165298)">
+ d="m 452.50015,509.31081 h 29.04648"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ transform="matrix(-1,0,0,1,897.27706,0)"
+ id="g4806">
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 452.49998,480.26394 v 29.04648"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ transform="matrix(1,0,0,-1,0,1026.344)"
+ id="g4812">
-
-
-
-
+
+
+
+
+ width="15.997281"
+ height="16.491779"
+ x="440.25876"
+ y="504.91953"
+ inkscape:label="#rect4741" />
-
-
-
-
-
+ id="g4844"
+ transform="matrix(1.0666667,0,0,1.066636,4.919636,-0.50381959)">
-
+
+
+
+
+
+
+ id="path894"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ inkscape:transform-center-y="-246.1722">
-
+
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="AI_slipskid"
+ d="m 418.32961,292.18309 59.8472,-3e-5 -8.6432,-14.52797 h -42.5608 z"
+ style="fill:none;fill-opacity:1;stroke:#c9cc15;stroke-width:3.99994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+
-
+ d="m 288.584,252.95092 13.8416,-7.96852"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
+
+ id="g4374"
+ transform="matrix(-1,0,0,1,896.78566,0)">
+
-
+ id="path4380"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ transform="translate(0,0.59999999)">
-
+ transform="translate(0,19.596045)"
+ id="g4545">
+
-
+ transform="matrix(-1,0,0,1,896.51521,20.196045)"
+ id="g4876">
+
+ id="path4880"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ inkscape:label="#g4886"
+ id="AI_bank_lim_X">
X
+ X
- X
+ id="tspan4884"
+ sodipodi:role="line">X
+ id="g3954"
+ transform="matrix(-1,0,0,1,896.72324,0)">
+
-
+ d="m 354.9152,234.0368 -14.5632,5.4816"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="g3968"
+ transform="rotate(10.25,446.41327,507.51354)">
-
+
+ transform="matrix(-0.98404072,0.17794355,0.17794355,0.98404072,799.64735,-71.336811)"
+ id="g3978">
+ d="m 340.35189,239.5184 5.62182,14.20878"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path3984"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 354.9152,234.0368 -14.5632,5.4816"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ inkscape:label="#g4612"
+ transform="translate(0,-1.4)">
0000
+ x="511.25748"
+ y="680.72845"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:45px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.657577">0000
+ transform="translate(2.8403413,1.952603)">
+ transform="translate(0.97071068)"
+ id="g4630">
-
-
-
-
-
-
-
-
+ id="g4634"
+ transform="matrix(-1,0,0,1,894.37964,0)">
+
+
+
+
+
+
+
+
+ width="18.850618"
+ height="552.00073"
+ x="857.09143"
+ y="237.03366"
+ inkscape:label="#rect9211" />
+ x="103.0126"
+ height="552.00079"
+ width="70.653656"
+ id="FS_targets_clip"
+ style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-
-
+
+
+
-
+ width="603.362"
+ height="54.440548"
+ x="146.66983"
+ y="890.56866"
+ inkscape:label="#rect9211" />
-
-
+ inkscape:label="#g4848"
+ id="HDG_frame">
+
+
-
-
-
+
+
+
+
+
-
+ d="m 952.19,178.46607 30.52166,-1.3e-4 31.97194,102.24587 0,464.27063 -31.97194,102.24587 -30.52166,1.5e-4 z"
+ style="fill:#4c4c4c;fill-opacity:1;stroke:none;stroke-width:4.17444229;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ inkscape:label="#g4759"
+ id="VS_group">
- 1
+ id="g5112"
+ transform="matrix(1.0666667,0,0,1.066636,0.28284271,-0.50381959)">
2
+ y="569.32635"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.7717px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.657577">1
6
-
-
-
-
-
-
-
-
-
-
- 6
- 2
1
+ id="tspan5102"
+ x="1019.0017"
+ y="687.27924"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.7717px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#cecdce;fill-opacity:1;stroke-width:0.657577">6
+ id="g5092"
+ transform="matrix(1.0666667,0,0,-1.066636,0.28284271,1026.1924)">
+
+ 6
+ 2
+ 1
+
+
+
+
+
+
+
+
+
+
-
+ id="VS_pointer"
+ width="6.5950012"
+ height="361.44022"
+ x="509.69724"
+ y="-1060.3188"
+ inkscape:label="#rect4954"
+ inkscape:transform-center-x="170.07916" />
+ transform="translate(0,65.936427)">
+ height="45.6008"
+ width="45.6008"
+ id="rect4626"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
00
+ x="1147.7107"
+ y="405.05588"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#0dc04b;fill-opacity:1;stroke-width:0.657577">00
-
-
+
+
+ id="ALT_scale">
+ id="path4911"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
000
+ x="1604.5295"
+ id="tspan4915"
+ sodipodi:role="line">000
+ d="m 1479.2996,1007.4057 9.3792,-7.97457 -9.3788,-7.9742"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ d="m 1579.3052,512.65602 h -11.3041"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
000
+ x="1604.5295"
+ y="501.10501"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.75">000
+ id="path4943"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccc" />
+ d="m 1579.3052,950.77126 h -11.3041"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4947"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 1579.3052,853.43414 h -11.3041"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4951"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 1579.3052,756.09702 h -11.3041"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4955"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 1579.3052,658.7599 h -11.3041"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="path4959"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cc" />
+ d="m 1579.3052,561.42278 h -11.3041"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
- 000
-
-
-
-
-
-
-
-
-
-
- 000
-
000
+
+
+
+
+
+
+
+
+
+ 000
+
+ 000
+
- TOGA
+ x="59.092628"
+ height="84.381813"
+ width="102.47213"
+ id="FMA_man_box"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.39996576;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
MAN
-
+ y="74.429817"
+ x="125.31013"
+ id="tspan4307"
+ sodipodi:role="line">TOGA
MAN PITCH TRIM ONLY
+ style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.657577"
+ x="125.84993"
+ y="33.759209"
+ id="FMA_man"
+ transform="scale(0.87678236,1.1405339)">MAN
ALT
- G/S
- CLB
+ id="tspan4614"
+ x="505.48523"
+ y="115.0584"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:0.657577">MAN PITCH TRIM ONLY
+
LOC
+ y="34.986706"
+ x="370.20218"
+ id="tspan4244"
+ sodipodi:role="line">ALT
G/S
+ CLB
+ LOC
+ NAV
+ x="629.22266"
+ y="74.709473"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.657577">NAV
-
-
+
+
+ id="LOC_scale">
+ height="41.291069"
+ width="7.7972813"
+ id="rect4858"
+ style="fill:#c9d121;fill-opacity:1;stroke:none;stroke-width:3.91477;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-
+
+ id="circle4876"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzzz" />
+ id="g4527"
+ transform="translate(1.8616028)">
-
+
+ id="circle4880"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzzz" />
+ y="1019.8428"
+ x="-517.64343"
+ height="33.21196"
+ width="33.21196"
+ id="LOC_pointer"
+ style="fill:none;fill-opacity:1;stroke:#b055be;stroke-width:4.0350337;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ width="16.287683"
+ height="2088.8245"
+ x="857.0014"
+ y="512.75592"
+ inkscape:label="ground_ref" />
+ inkscape:label="#g4828"
+ id="ALT_group2">
+ width="7.7970567"
+ height="49.153526"
+ x="509.50464"
+ y="-747.05353"
+ transform="rotate(90)" />
STD
+
+
+
+
+
+ 000
+
+ FL 000
+ FL 000
+
+ QNH
+ STD
-
-
-
-
-
- 000
-
- FL 000
- FL 000
-
- QNH
- 1013
+ id="tspan977"
+ sodipodi:role="line">1013
+ id="GS_scale">
+ x="509.50464"
+ height="49.153526"
+ width="7.7970567"
+ id="rect4898"
+ style="fill:#c9d121;fill-opacity:1;stroke:none;stroke-width:4.48063;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ id="g4531"
+ transform="translate(0,-1.0792028)">
-
+
+ id="circle4929"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzzz" />
-
+
+ id="circle4933"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzzz" />
+ width="33.211578"
+ height="33.211578"
+ x="949.0885"
+ y="-368.9328"
+ transform="matrix(0.54714118,0.83704034,-0.54714118,0.83704034,0,0)"
+ inkscape:label="#rect4872" />
+ x="768.71039"
+ height="59.519768"
+ width="89.289597"
+ id="ALT_mask"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ x="858.00543"
+ height="90.122147"
+ width="48.851151"
+ id="ALT_tens_clip"
+ style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ inkscape:label="#g5167"
+ id="ALT_frame">
-
+ id="path4984"
+ d="M 856.91323,236.93596 V 478.84635"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+
+ inkscape:label="#g5379"
+ id="ALT_group">
+ inkscape:label="#g5173"
+ id="ALT_box">
-
+ d="m 856.4002,481.90842 2.2e-4,-15.92813 h 52.07464 v 93.34657 h -52.07457 v -15.26583"
+ style="fill:#000000;fill-opacity:1;stroke:#ffff00;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+
40 40 20 20 00 00 80 80 60 60 40 40 20 20 00 00 80 80 60
+ x="898.703"
+ sodipodi:role="line"
+ id="tspan4302">60
00
+ x="890.99316"
+ y="506.23941"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.8348px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#0dc04b;fill-opacity:1;stroke-width:0.75">00
-
-
+
+
AP 1+2
- 1 FD 2
- A/THR
- CAT 3
+ x="1080.6229"
+ id="tspan4268"
+ sodipodi:role="line">AP 1+2
DUAL
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce;fill-opacity:1;stroke-width:0.657577">1 FD 2
A/THR
+ CAT 3
+ DUAL
+ NO RADIO
+ x="874.48682"
+ y="115.05846"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#cecdce;fill-opacity:1;stroke-width:0.657577">NO RADIO
-
+
-
+
+ SPEED
+
+
SPEED
+ x="505.48523"
+ id="tspan4354"
+ sodipodi:role="line">FLARE
-
- FLARE
-
- RADIO
RADIO
+ 0250
+ x="934.0097"
+ y="115.05846"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#179ab7;fill-opacity:1;stroke-width:0.657577">0250
+ inkscape:label="#g4375"
+ id="ALPHA_bars">
+ width="11.001064"
+ height="2089.313"
+ x="125.00137"
+ y="512.43707"
+ inkscape:label="VLS_min" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id="ALPHA_PROT">
+ id="rect4788-9"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4794-8"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4799-5"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4805-5"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4809-5"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4811-1"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4815-6"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4821-3"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4825-7"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4827-9"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4831-0"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4837-8"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4848-4"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4855-0"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4859-0"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4861-7"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4865-8"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4871-9"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4875-3"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4877-8"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4881-1"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4887-8"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4891-4"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4893-7"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4899-6"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4901-1"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4905-9"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4911-2"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4915-4"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4917-4"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4921-8"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4928-3"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4932-4"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4934-3"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4938-8"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4944-8"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4946-3"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4952-9"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4956-1"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4958-7"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4962-9"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4968-0"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4972-3"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4974-4"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4978-9"
+ style="fill:#bb6100;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+ id="rect4984-9"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bb6100;stroke-width:1.19994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+
+
+
+
+
+
+
+ +40
+ LVR CLB
+
+
+
+ 00
+
+ 00
+
+
+
+
+ 00
+ 00
+ 00
+
+
+
+
+
+ 00
+
+
+ 00
+
+
+
+
+
+
+
+
+
+
+ 000
+ 000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- +40
- LVR CLB
-
-
+ id="ASI_scale"
+ inkscape:label="#g3847"
+ transform="translate(0.69023445)">
+
+ 140
+ 160
+ 120
+ 100
+ 080
+ 060
+ 040
+ 180
+ 200
+ 220
+ 240
+ 260
+ 280
+ 300
+ 320
+ 340
+ 360
+ 380
+ 400
+ 420
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 00
-
- 00
-
-
-
-
- 00
- 00
- 00
-
-
-
-
-
- 00
-
-
- 00
-
-
-
-
-
-
-
- 000
- 000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 140
- 160
- 120
- 100
- 080
- 060
- 040
- 180
- 200
- 220
- 240
- 260
- 280
- 300
- 320
- 340
- 360
- 380
- 400
- 420
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="ASI_index"
+ inkscape:label="#g949"
+ transform="matrix(1.0666667,0,0,1.066636,0.69023445,-0.50381959)">
-
-
-
+ id="path930"
+ d="M 92.069682,481.26097 H 134.83566"
+ style="fill:none;fill-opacity:1;stroke:#c9d121;stroke-width:4.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+
-
-
-
-
-
-
-
+ id="ASI_trend_up">
- 000
+
+
+
+
+
.
- 000
- 000
+ .
.
+ x="95.148567"
+ id="tspan4686"
+ sodipodi:role="line">000
000
+ .
-
-
SPD
-
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75"
+ y="220.32645"
+ x="80.506668"
+ id="tspan4696"
+ sodipodi:role="line">.
+ inkscape:label="#g4779"
+ id="ASI_error">
+ SPD
+
+
+
+
-
+ d="M 13.167811,790.62913 H 154.46853"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.19995;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
- ATT
- ALT
V ATT
+ / S
+ id="tspan4386-4-0"
+ x="851.70166"
+ y="505.93329"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ff0000;fill-opacity:1;stroke-width:0.75">ALT
V / S
+ HDG
+ x="522.40784"
+ y="950.08264"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:end;text-anchor:end;fill:#ff0000;fill-opacity:1;stroke-width:0.75">HDG
MACH
- ILS
- ILS
- 000.00
- 0.0
- NM
-
-
- 000
-
-
-
- 000
-
+ id="tspan1605"
+ sodipodi:role="line">MACH
MM
+ y="856.17841"
+ x="663.17761"
+ id="tspan773"
+ sodipodi:role="line">ILS
ILS
+ 000.00
+ 0.0
+ OM
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#179ab7;fill-opacity:1;stroke-width:0.75"
+ y="1014.0706"
+ x="116.45473"
+ id="tspan780-3"
+ sodipodi:role="line">NM
+
+
+ 000
+
+
+
+ 000
+
MM
+ OM
+ IM
+ x="680.1095"
+ id="tspan773-9-9"
+ sodipodi:role="line">IM
+ inkscape:label="#g5173"
+ id="ALT_box_flash">
-
+ d="m 856.4002,481.90842 2.2e-4,-15.92813 h 52.07464 v 93.34657 h -52.07457 v -15.26583"
+ style="fill:none;fill-opacity:1;stroke:#ffff00;stroke-width:6;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-
- 000
-
+
+ 000
+
+
1
+ x="155.31981"
+ y="378.22144"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:start;text-anchor:start;fill:#179ab7;fill-opacity:1;stroke-width:0.75">1
+ id="vr_speed"
+ d="m 130.43188,519.13081 c -3.51657,0 -6.36731,-2.85066 -6.36731,-6.36712 0,-3.51646 2.85073,-6.36713 6.36731,-6.36713 3.51658,0 6.36732,2.85066 6.36732,6.36713 0,3.51648 -2.85075,6.36712 -6.36732,6.36712 z"
+ style="fill:none;fill-opacity:1;stroke:#179ab7;stroke-width:2.39997;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ inkscape:label="#g4579"
+ id="FS_targets">
+ transform="translate(-110.76039,-61.624594)"
+ id="S_target">
+
+ S
+
+
S
-
-
-
- F
+ x="337.87274"
+ id="tspan4690-5-6-6-8"
+ sodipodi:role="line">F
-
+
+ id="clean_speed"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzzz" />
+ inkscape:label="#ALT_box_amber">
+ id="alt-box-group"
+ inkscape:label="alt-box-group">
-
+ d="m 856.4002,481.90842 2.2e-4,-15.92813 h 52.07464 v 93.34657 h -52.07457 v -15.26583"
+ style="fill:none;fill-opacity:1;stroke:#bb6100;stroke-width:3.20031;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
+
FLX
+ x="61.095329"
+ y="74.429939"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.9995px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.657577">FLX
diff --git a/Nasal/FMGC/flightplan.nas b/Nasal/FMGC/flightplan.nas
index 00bfeb3e..8cd23e7c 100644
--- a/Nasal/FMGC/flightplan.nas
+++ b/Nasal/FMGC/flightplan.nas
@@ -320,7 +320,6 @@ var flightPlanController = {
# we want to delete the intermediate waypoints up to but not including the waypoint. Leave index 0, we delete it later.
# example - waypoint dirto is index 5, we want to delete indexes 1 -> 4. 5 - 1 = 4.
# so four individual deletions. Delete index 1 four times.
- # Add one extra for the TP, so while > 2
var timesToDelete = me.flightplans[plan].indexOfWP(waypointGhost);
while (timesToDelete > 1) {
@@ -330,9 +329,9 @@ var flightPlanController = {
# Add TP afterwards, this is essential
me.insertTP(plan, 1);
}
- me.deleteWP(0, plan);
var curAircraftPosDirTo = geo.aircraft_position();
- canvas_mcdu.myDirTo[plan].updateDist(me.flightplans[plan].getWP(1).courseAndDistanceFrom(curAircraftPosDirTo)[1]);
+ canvas_mcdu.myDirTo[plan].updateDist(me.flightplans[plan].getWP(2).courseAndDistanceFrom(curAircraftPosDirTo)[1]);
+ me.deleteWP(0, plan);
me.flightPlanChanged(plan);
},
diff --git a/Nasal/Libraries/zoom-views.nas b/Nasal/Libraries/zoom-views.nas
index 67316fa6..861e2388 100644
--- a/Nasal/Libraries/zoom-views.nas
+++ b/Nasal/Libraries/zoom-views.nas
@@ -6,8 +6,8 @@ var distance = 0;
var min_dist = 0;
var max_dist = 0;
var canChangeZOffset = 0;
-var decStep = -0.5;
-var incStep = 0.5;
+var decStep = -1;
+var incStep = 1;
var viewName = "XX";
var fovZoom = func(d) {
diff --git a/Nasal/MCDU/DIRTO.nas b/Nasal/MCDU/DIRTO.nas
index 50bc54aa..4d803bb3 100644
--- a/Nasal/MCDU/DIRTO.nas
+++ b/Nasal/MCDU/DIRTO.nas
@@ -148,6 +148,7 @@ var dirTo = {
fieldL1: func(text, override = 0, overrideIndex = -1) {
me.makeTmpy();
me.L1[0] = text;
+ me.fontMatrix = [[0, 0, 0, 0, 0, 0], [0, 0, 0, 1, 1, 0]];
if (size(text) == 16) {
# lat lon
var lat = split("/", text)[0];
@@ -236,8 +237,9 @@ var dirTo = {
},
leftFieldBtn: func(index) {
me.makeTmpy();
- me.L1[0] = me.vector[index + me.scroll - 2].wp_name;
- fmgc.flightPlanController.directTo(me.vector[index + me.scroll - 2], me.computer);
+ me.L1[0] = me.vector[index - 2].wp_name;
+ me.fontMatrix = [[0, 0, 0, 0, 0, 0], [0, 0, 0, 1, 1, 0]];
+ fmgc.flightPlanController.directTo(me.vector[index - 2], me.computer);
me.arrowsMatrix[0][1] = 0;
# FIGURE OUT HOW TO MAKE IT SO IT DOESN'T DELETE THE WAYPOINTS ON DIR TO BUT DOES IN FLIGHTPLAN
#for (var i = 2; i != 6; i = i + 1) {
@@ -256,6 +258,7 @@ var dirTo = {
notAllowed(me.computer);
}
me.L1 = [" [ ]", " WAYPOINT", "blu"];
+ me.fontMatrix = [[1, 0, 0, 0, 0, 0], [0, 0, 0, 1, 1, 0]];
me.R1 = ["---- --- ", "UTC DIST ", "wht"];
},
fieldR6: func() {
@@ -266,6 +269,7 @@ var dirTo = {
notAllowed(me.computer);
}
me.L1 = [" [ ]", " WAYPOINT", "blu"];
+ me.fontMatrix = [[1, 0, 0, 0, 0, 0], [0, 0, 0, 1, 1, 0]];
me.R1 = ["---- --- ", "UTC DIST ", "wht"];
setprop("MCDU[" ~ me.computer ~ "]/page", "F-PLNA"); # todo - remember horizontal srcoll of f-plna?
},
diff --git a/Nasal/MCDU/PERFAPPR.nas b/Nasal/MCDU/PERFAPPR.nas
index 06479715..115709f9 100644
--- a/Nasal/MCDU/PERFAPPR.nas
+++ b/Nasal/MCDU/PERFAPPR.nas
@@ -84,7 +84,7 @@ var perfAPPRInput = func(key, i) {
mcdu.clearScratchpad(i);
} else if (int(scratchpad) != nil and scratchpad >= 100 and scratchpad <= 350) {
setprop("/FMGC/internal/vapp-speed-set", 1);
- setprop("/FMGC/internal/computed-speeds/vapp_appr", scratchpad);
+ setprop("/FMGC/internal/computed-speeds/vapp", scratchpad);
mcdu.clearScratchpad(i);
} else {
notAllowed(i);
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-buzz.wav b/Sounds/SASA/CFM56B/cockpit/cfm-buzz.wav
index 1c836cd3..2d730640 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-buzz.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-buzz.wav differ
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-comb-full.wav b/Sounds/SASA/CFM56B/cockpit/cfm-comb-full.wav
index db53d78c..fed29a35 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-comb-full.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-comb-full.wav differ
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-comb.wav b/Sounds/SASA/CFM56B/cockpit/cfm-comb.wav
index e30b5acb..8d85fac6 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-comb.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-comb.wav differ
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-hum.wav b/Sounds/SASA/CFM56B/cockpit/cfm-hum.wav
index 8d46856d..265692a9 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-hum.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-hum.wav differ
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-idle.wav b/Sounds/SASA/CFM56B/cockpit/cfm-idle.wav
index 4f3c53ed..c7119224 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-idle.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-idle.wav differ
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-idle2.wav b/Sounds/SASA/CFM56B/cockpit/cfm-idle2.wav
index a1df84b3..c1f5bcca 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-idle2.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-idle2.wav differ
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-lowspool.wav b/Sounds/SASA/CFM56B/cockpit/cfm-lowspool.wav
index 8aaa6429..f39ed603 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-lowspool.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-lowspool.wav differ
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-reverse.wav b/Sounds/SASA/CFM56B/cockpit/cfm-reverse.wav
index 6bd5d7f3..d85409a3 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-reverse.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-reverse.wav differ
diff --git a/Sounds/SASA/CFM56B/cockpit/cfm-spool.wav b/Sounds/SASA/CFM56B/cockpit/cfm-spool.wav
index 14b23374..d8406b9a 100644
Binary files a/Sounds/SASA/CFM56B/cockpit/cfm-spool.wav and b/Sounds/SASA/CFM56B/cockpit/cfm-spool.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-buzz.wav b/Sounds/SASA/V2500/cockpit/v2500-buzz.wav
index f94e4b79..b091bc45 100644
Binary files a/Sounds/SASA/V2500/cockpit/v2500-buzz.wav and b/Sounds/SASA/V2500/cockpit/v2500-buzz.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-comb.wav b/Sounds/SASA/V2500/cockpit/v2500-comb.wav
index db53d78c..3cdf8951 100644
Binary files a/Sounds/SASA/V2500/cockpit/v2500-comb.wav and b/Sounds/SASA/V2500/cockpit/v2500-comb.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-idle.wav b/Sounds/SASA/V2500/cockpit/v2500-idle.wav
index 256546d9..e3d9d43f 100644
Binary files a/Sounds/SASA/V2500/cockpit/v2500-idle.wav and b/Sounds/SASA/V2500/cockpit/v2500-idle.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav b/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav
index 2561e5f4..47bee8f4 100644
Binary files a/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav and b/Sounds/SASA/V2500/cockpit/v2500-lowspool.wav differ
diff --git a/Sounds/SASA/V2500/cockpit/v2500-reverse.wav b/Sounds/SASA/V2500/cockpit/v2500-reverse.wav
index ca4b986a..bdf23788 100644
Binary files a/Sounds/SASA/V2500/cockpit/v2500-reverse.wav and b/Sounds/SASA/V2500/cockpit/v2500-reverse.wav differ
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 34e06ce3..a3ddad8d 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -719,15 +719,157 @@
-
+
-
- fbw/fmgc/enabled eq 0
+
+ /gear/gear[0]/wow ne 1
+
+
+ /systems/acconfig/options/seperate-tiller-axis eq 1
+
+
/controls/flight/aileron-drives-tiller eq 1
-
+
+
+
+ /controls/gear/steering-switched
+
+ /velocities/groundspeed-kt
+ /systems/acconfig/options/seperate-tiller-axis
+
+ 0 1
+ 0.5 0 0
+ 1.0 1 1
+ 20.0 1 1
+ 70.0 0 1
+
+
+
+
+
+ fbw/tiller-handle-scheduled
+ 20
+
+
+
+ /controls/gear/steering
+ 75
+
+
+
+ hydraulics/tiller/autopush-cmd
+ 75
+
+
+
+ fbw/fmgc/yaw-cmd
+
+ /velocities/groundspeed-kt
+
+ 0.5 0
+ 1.0 6
+ 40.0 6
+ 130.0 0
+
+
+
+
+
+
+
+ /controls/flight/aileron-drives-tiller eq 1
+
+
+
+
+ hydraulics/tiller/rudder-cmd-input
+ 75
+
+
+
+
+
+ zero
+ hydraulics/tiller/rudder-cmd-input-deg
+ /velocities/groundspeed-kt
+
+ -75 -66 -40 -20 -1 1 20 40 66 75
+ 0 0 0 0 0 0 0 0 0 0 0
+ 1 0 0 0 0 0 0 0 0 0 0
+
+
+ -75 -66 -40 -20 -1 1 20 40 66 75
+ 0 -75 -45 -15 -4 0 0 4 15 45 75
+ 1 -75 -45 -15 -4 0 0 4 15 45 75
+
+
+ -75 -66 -40 -20 -1 1 20 40 66 75
+ 0 -75 -45 -15 -4 0 0 4 15 45 75
+ 1 -75 -45 -15 -4 0 0 4 15 45 75
+
+
+ -75 0 75
+ 0 -6 0 6
+ 1 -6 0 6
+
+
+ -75 0 75
+ 0 0 0 0
+ 1 0 0 0
+
+
+
+
+
+
+
+
+
+ /velocities/groundspeed-kt
+ /controls/gear/steering-deg
+
+ -75 -66 -40 -20 -1 1 20 40 66 75
+ 0.5 0 0 0 0 0 0 0 0 0 0
+ 1.0 -75 -45 -15 -4 0 0 4 15 45 75
+ 20.0 -75 -45 -15 -4 0 0 4 15 45 75
+ 70.0 0 0 0 0 0 0 0 0 0 0
+
+
+
+ hydraulics/tiller/rudder-cmd-input
+
+ /velocities/groundspeed-kt
+
+ 0.5 0
+ 1.0 6
+ 40.0 6
+ 130.0 0
+
+
+
+
+
+
+
+
+
+
+ /gear/gear[0]/wow ne 1
+
+
+ /sim/model/autopush/connected eq 1
+
+
fbw/fmgc/enabled eq 1
+
+ /systems/acconfig/options/seperate-tiller-axis eq 1
+
+
+ -75
+ 75
+
@@ -755,33 +897,6 @@
-
-
-
-
- /sim/model/autopush/connected
- 1
-
-
- hydraulics/tiller/autopush-cmd
- 75
-
-
- /velocities/groundspeed-kt
- hydraulics/tiller/switch
-
- -1 0 1
- 0.500 0 0 0
- 1.000 -75 0 75
- 30.000 -47 0 47
- 30.001 -6 0 6
- 135.000 0 0 0
-
-
-
-
-
-
@@ -794,7 +909,7 @@
- hydraulics/tiller/function
+ hydraulics/tiller/cmd-deg
fcs/steer-rate
fcs/steer-pos-deg[0]
diff --git a/revision.txt b/revision.txt
index 3e932fe8..dce6588c 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-34
\ No newline at end of file
+36
\ No newline at end of file