diff --git a/A319-100-CFM-set.xml b/A319-100-CFM-set.xml index 0fc0185a..433dcd98 100644 --- a/A319-100-CFM-set.xml +++ b/A319-100-CFM-set.xml @@ -18,6 +18,24 @@ </livery> </model> + <!--previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a319-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a319-2.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a319-3.png</path> + </preview> + </previews!--> + <view> <name>Pilot View</name> <internal archive="y">true</internal> diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml index a915bfd2..6fc9538d 100644 --- a/A319-100-IAE-set.xml +++ b/A319-100-IAE-set.xml @@ -18,6 +18,24 @@ </livery> </model> + <!--previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a319-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a319-2.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a319-3.png</path> + </preview> + </previews!--> + <view> <name>Pilot View</name> <internal archive="y">true</internal> diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml index 59f7ea53..6f314325 100644 --- a/A320-100-CFM-set.xml +++ b/A320-100-CFM-set.xml @@ -17,6 +17,24 @@ <file>Airbus</file> </livery> </model> + + <previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-2.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-3.png</path> + </preview> + </previews> <view> <name>Pilot View</name> diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml index f9ba5e01..8f71a083 100644 --- a/A320-200-CFM-set.xml +++ b/A320-200-CFM-set.xml @@ -17,6 +17,24 @@ <file>Airbus</file> </livery> </model> + + <previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-2.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-3.png</path> + </preview> + </previews> <view> <name>Pilot View</name> diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index 37061f88..07e02228 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -17,6 +17,24 @@ <file>Airbus</file> </livery> </model> + + <previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-2.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320-3.png</path> + </preview> + </previews> <view> <name>Pilot View</name> diff --git a/A320-main.xml b/A320-main.xml index 8ef4b9cb..30f2db4f 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -24,19 +24,6 @@ </pushback> </model> - <previews> - <preview> - <type>exterior</type> - <splash type="bool">true</splash> - <path>Splash/splash1.png</path> - </preview> - <preview> - <type>exterior</type> - <splash type="bool">true</splash> - <path>Splash/splash2.png</path> - </preview> - </previews> - <startup> <splash-texture>Aircraft/A320Family/Splash/SplashOld.png</splash-texture> </startup> @@ -554,6 +541,7 @@ <sidestick-pos userarchive="y" type="bool">0</sidestick-pos> </pfd> <old-gpws type="bool">0</old-gpws> + <steep-ils type="bool">0</steep-ils> </options> <instrumentation n="0"> diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml index f95717f8..a7666151 100644 --- a/A320neo-CFM-set.xml +++ b/A320neo-CFM-set.xml @@ -18,6 +18,29 @@ </livery> </model> + <previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320n-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320n-2.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320n-3.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a320n-4.png</path> + </preview> + </previews> + <view> <name>Pilot View</name> <internal archive="y">true</internal> diff --git a/A321-200-CFM-set.xml b/A321-200-CFM-set.xml index 04738a86..b0f0108b 100644 --- a/A321-200-CFM-set.xml +++ b/A321-200-CFM-set.xml @@ -17,6 +17,19 @@ <file>Airbus</file> </livery> </model> + + <previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a321-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a321-2.png</path> + </preview> + </previews> <view> <name>Pilot View</name> diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml index 0b8d5595..d979df1d 100644 --- a/A321-200-IAE-set.xml +++ b/A321-200-IAE-set.xml @@ -17,6 +17,19 @@ <file>Airbus</file> </livery> </model> + + <previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a321-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a321-2.png</path> + </preview> + </previews> <view> <name>Pilot View</name> diff --git a/A321neo-CFM-set.xml b/A321neo-CFM-set.xml index d1e49c55..01d600fb 100644 --- a/A321neo-CFM-set.xml +++ b/A321neo-CFM-set.xml @@ -17,6 +17,24 @@ <file>Airbus</file> </livery> </model> + + <!--previews> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a321n-1.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a321n-2.png</path> + </preview> + <preview> + <type>exterior</type> + <splash type="bool">true</splash> + <path>Splash/a321n-3.png</path> + </preview> + </previews!--> <view> <name>Pilot View</name> diff --git a/Models/Instruments/ND/canvas/style.nas b/Models/Instruments/ND/canvas/style.nas index 027027e0..857a90b7 100644 --- a/Models/Instruments/ND/canvas/style.nas +++ b/Models/Instruments/ND/canvas/style.nas @@ -700,7 +700,7 @@ canvas.NDStyles["Airbus"] = { init: func(nd,symbol), predicate: func(nd) nd.aircraft_source.get_spd() > 100, is_true: func(nd) { - nd.symbols.tas.setText(sprintf("%3.0f",getprop("/fdm/jsbsim/velocities/vtrue-kts") )); + nd.symbols.tas.setText(sprintf("%3.0f",getprop("/instrumentation/airspeed-indicator/true-speed-kt") )); nd.symbols.tas.show(); }, is_false: func(nd) nd.symbols.tas.hide(), diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas index 27c38507..43a8f82d 100644 --- a/Nasal/FMGC-b.nas +++ b/Nasal/FMGC-b.nas @@ -20,7 +20,6 @@ var APinit = func { setprop("/it-autoflight/input/lat", 5); setprop("/it-autoflight/input/lat-arm", 0); setprop("/it-autoflight/input/vert", 7); - setprop("/it-autoflight/input/bank-limit", 25); setprop("/it-autoflight/input/trk", 0); setprop("/it-autoflight/input/toga", 0); setprop("/it-autoflight/input/spd-managed", 0); diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index e3a93f77..1aaaa344 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -211,6 +211,15 @@ var librariesLoop = maketimer(0.1, func { } else { setprop("/systems/shake/effect", 0); } + + var trueSpeedKts = getprop("/instrumentation/airspeed-indicator/true-speed-kt"); + if(trueSpeedKts > 370) { + setprop("/it-autoflight/internal/bank-limit", 15); + } else if(trueSpeedKts > 300) { + setprop("/it-autoflight/internal/bank-limit", 20); + } else { + setprop("/it-autoflight/internal/bank-limit", 25); + } }); var variousReset = func { diff --git a/Splash/a320-1.png b/Splash/a320-1.png new file mode 100644 index 00000000..de937ab2 Binary files /dev/null and b/Splash/a320-1.png differ diff --git a/Splash/a320-2.png b/Splash/a320-2.png new file mode 100644 index 00000000..6bbf9f2e Binary files /dev/null and b/Splash/a320-2.png differ diff --git a/Splash/a320-3.png b/Splash/a320-3.png new file mode 100644 index 00000000..7592b199 Binary files /dev/null and b/Splash/a320-3.png differ diff --git a/Splash/a320n-1.png b/Splash/a320n-1.png new file mode 100644 index 00000000..86d02e75 Binary files /dev/null and b/Splash/a320n-1.png differ diff --git a/Splash/a320n-2.png b/Splash/a320n-2.png new file mode 100644 index 00000000..348e3ef6 Binary files /dev/null and b/Splash/a320n-2.png differ diff --git a/Splash/a320n-3.png b/Splash/a320n-3.png new file mode 100644 index 00000000..fa38980a Binary files /dev/null and b/Splash/a320n-3.png differ diff --git a/Splash/a320n-4.png b/Splash/a320n-4.png new file mode 100644 index 00000000..f070a56f Binary files /dev/null and b/Splash/a320n-4.png differ diff --git a/Splash/a321-1.png b/Splash/a321-1.png new file mode 100644 index 00000000..fda7e546 Binary files /dev/null and b/Splash/a321-1.png differ diff --git a/Splash/a321-2.png b/Splash/a321-2.png new file mode 100644 index 00000000..e2f9d0ed Binary files /dev/null and b/Splash/a321-2.png differ diff --git a/Splash/splash1.png b/Splash/splash1.png deleted file mode 100644 index bf1c194a..00000000 Binary files a/Splash/splash1.png and /dev/null differ diff --git a/Splash/splash2.png b/Splash/splash2.png deleted file mode 100644 index 754f34fc..00000000 Binary files a/Splash/splash2.png and /dev/null differ diff --git a/Systems/fmgc-b.xml b/Systems/fmgc-b.xml index c5e0c5f9..811dc415 100644 --- a/Systems/fmgc-b.xml +++ b/Systems/fmgc-b.xml @@ -516,7 +516,24 @@ <input>/instrumentation/nav[0]/gs-rate-of-climb-fpm</input> <output>/it-autoflight/internal/nav1-rate-of-climb-fpm</output> <gain>1.0</gain> - <min>-1500</min> + <min> + <condition> + <equals> + <property>/options/steep-ils</property> + <value>0</value> + </equals> + </condition> + <value>-1500</value> + </min> + <min> + <condition> + <equals> + <property>/options/steep-ils</property> + <value>1</value> + </equals> + </condition> + <value>-2200</value> + </min> <max>0</max> </filter> diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml index e223aafb..50545188 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -63,41 +63,11 @@ </Kp> <Ki>0.0</Ki> <min> - <condition> - <not-equals> - <property>/it-autoflight/output/lat</property> - <value>1</value> - </not-equals> - </condition> - <property>/it-autoflight/input/bank-limit</property> + <property>/it-autoflight/internal/bank-limit</property> <scale>-1</scale> </min> - <min> - <condition> - <equals> - <property>/it-autoflight/output/lat</property> - <value>1</value> - </equals> - </condition> - <value>-25</value> - </min> <max> - <condition> - <not-equals> - <property>/it-autoflight/output/lat</property> - <value>1</value> - </not-equals> - </condition> - <property>/it-autoflight/input/bank-limit</property> - </max> - <max> - <condition> - <equals> - <property>/it-autoflight/output/lat</property> - <value>1</value> - </equals> - </condition> - <value>25</value> + <property>/it-autoflight/internal/bank-limit</property> </max> </config> </pi-simple-controller> @@ -166,8 +136,13 @@ <gamma>0.0</gamma> <Ti>10.0</Ti> <Td>0.00001</Td> - <u_min>-25</u_min> - <u_max>25</u_max> + <u_min> + <property>/it-autoflight/internal/bank-limit</property> + <scale>-1</scale> + </u_min> + <u_max> + <property>/it-autoflight/internal/bank-limit</property> + </u_max> </config> </pid-controller> @@ -200,8 +175,13 @@ </enable> <input>/orientation/roll-deg</input> <output>/it-autoflight/internal/target-roll-deg</output> - <min>-25</min> - <max>25</max> + <min> + <property>/it-autoflight/internal/bank-limit</property> + <scale>-1</scale> + </min> + <max> + <property>/it-autoflight/internal/bank-limit</property> + </max> </filter> <filter>