diff --git a/A319-200-IAE-set.xml b/A319-100-IAE-set.xml similarity index 91% rename from A319-200-IAE-set.xml rename to A319-100-IAE-set.xml index 4b931297..f5baa275 100644 --- a/A319-200-IAE-set.xml +++ b/A319-100-IAE-set.xml @@ -8,12 +8,12 @@ <path>Aircraft/A320Family/Sounds/v2500-sound.xml</path> </sound> - <description>Airbus A319 (IAE V2500)</description> + <description>Airbus A319-133 (IAE V2500)</description> <status>Flyable</status> <flight-model>jsb</flight-model> - <aero>A319-200-IAE</aero> + <aero>A319-100-IAE</aero> <model> - <path>Aircraft/A320Family/Models/A319-200-IAE.xml</path> + <path>Aircraft/A320Family/Models/A319-100-IAE.xml</path> <livery> <file>USAirwaysStar</file> </livery> @@ -60,7 +60,7 @@ <menubar> <default> <menu n="100"> - <label>Airbus A319-200</label> + <label>Airbus A319-100</label> </menu> </default> </menubar> @@ -83,6 +83,9 @@ <itaf> <file>Aircraft/A320Family/Nasal/it-autoflight.nas</file> </itaf> + <lgciu> + <file>Aircraft/A320Family/Nasal/LGCIU.nas</file> + </lgciu> <thrust> <file>Aircraft/A320Family/Nasal/thrust.nas</file> </thrust> diff --git a/A319-200-IAE.xml b/A319-100-IAE.xml similarity index 99% rename from A319-200-IAE.xml rename to A319-100-IAE.xml index 9d039825..ee7ba4f3 100644 --- a/A319-200-IAE.xml +++ b/A319-100-IAE.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> <email> bicyus@gmail.com </email> <filecreationdate> 2012-02-15 </filecreationdate> <version> 0.99 </version> - <description> Airbus A319-200 with IAE V2500 Engines </description> + <description> Airbus A319-133 with IAE V2500 Engines </description> <note> Revised and fixed by Peter Brendt (jwocky) and Joshua Davidson (it0uchpods). Fork from the A320-Family aircraft project (Thanks to all authors) </note> <limitation></limitation> </fileheader> diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index 6eec6d2d..dfa20138 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -8,7 +8,7 @@ <path>Aircraft/A320Family/Sounds/v2500-sound.xml</path> </sound> - <description>Airbus A320 (IAE V2500)</description> + <description>Airbus A320-232 (IAE V2500)</description> <status>Flyable</status> <flight-model>jsb</flight-model> <aero>A320-200-IAE</aero> @@ -79,6 +79,7 @@ <file>Aircraft/A320Family/Nasal/efis.nas</file> <file>Aircraft/A320Family/Nasal/PFD_FMA.nas</file> <file>Aircraft/A320Family/Nasal/fctl.nas</file> + <file>Aircraft/A320Family/Nasal/LGCIU.nas</file> </A320> <itaf> <file>Aircraft/A320Family/Nasal/it-autoflight.nas</file> diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index f4b29d9c..5ce8a1cf 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> <email> bicyus@gmail.com </email> <filecreationdate> 2012-02-15 </filecreationdate> <version> 0.99 </version> - <description> Airbus A320-200 with IAE V2500 Engines </description> + <description> Airbus A320-232 with IAE V2500 Engines </description> <note> Revised and fixed by Peter Brendt (jwocky) and Joshua Davidson (it0uchpods). Fork from the A320-Family aircraft project (Thanks to all authors) </note> <limitation></limitation> </fileheader> diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml index f8e6173f..00399409 100644 --- a/A321-200-IAE-set.xml +++ b/A321-200-IAE-set.xml @@ -8,7 +8,7 @@ <path>Aircraft/A320Family/Sounds/v2500-sound.xml</path> </sound> - <description>Airbus A321 (IAE V2500)</description> + <description>Airbus A321-231 (IAE V2500)</description> <status>Flyable</status> <flight-model>jsb</flight-model> <aero>A321-200-IAE</aero> @@ -83,6 +83,9 @@ <itaf> <file>Aircraft/A320Family/Nasal/it-autoflight.nas</file> </itaf> + <lgciu> + <file>Aircraft/A320Family/Nasal/LGCIU.nas</file> + </lgciu> <thrust> <file>Aircraft/A320Family/Nasal/thrust.nas</file> </thrust> diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml index a59bcf61..0bfd54d5 100644 --- a/A321-200-IAE.xml +++ b/A321-200-IAE.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> <email> bicyus@gmail.com </email> <filecreationdate> 2012-02-15 </filecreationdate> <version> 0.99 </version> - <description> Airbus A321-200 with IAE V2500 Engines </description> + <description> Airbus A321-231 with IAE V2500 Engines </description> <note> Revised and fixed by Peter Brendt (jwocky) and Joshua Davidson (it0uchpods). Fork from the A320-Family aircraft project (Thanks to all authors) </note> <limitation></limitation> </fileheader> @@ -409,7 +409,7 @@ YAW MOI_________3950000______23089847_______24848934 <propulsion> - <engine file="v2527_a5"> + <engine file="v2533_a5"> <location unit="IN"> <x> 620.0683 </x> <y> -226.575 </y> @@ -437,7 +437,7 @@ YAW MOI_________3950000______23089847_______24848934 </thruster> </engine> - <engine file="v2527_a5"> + <engine file="v2533_a5"> <location unit="IN"> <x> 620.00683 </x> <y> 226.575 </y> diff --git a/ACJ-IAE-set.xml b/ACJ-IAE-set.xml index 514228a2..018ffb2f 100644 --- a/ACJ-IAE-set.xml +++ b/ACJ-IAE-set.xml @@ -13,7 +13,7 @@ <flight-model>jsb</flight-model> <aero>ACJ-IAE</aero> <model> - <path>Aircraft/A320Family/Models/A319-200-IAE.xml</path> + <path>Aircraft/A320Family/Models/A319-100-IAE.xml</path> <livery> <file>USAirwaysStar</file> </livery> @@ -83,6 +83,9 @@ <itaf> <file>Aircraft/A320Family/Nasal/it-autoflight.nas</file> </itaf> + <lgciu> + <file>Aircraft/A320Family/Nasal/LGCIU.nas</file> + </lgciu> <thrust> <file>Aircraft/A320Family/Nasal/thrust.nas</file> </thrust> diff --git a/Models/A319-200-IAE.xml b/Models/A319-100-IAE.xml similarity index 99% rename from Models/A319-200-IAE.xml rename to Models/A319-100-IAE.xml index 8a574061..f93dfd94 100644 --- a/Models/A319-200-IAE.xml +++ b/Models/A319-100-IAE.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <PropertyList> - <name>A319-200</name> + <name>A319-100</name> <path>empty.ac</path> <!-- Livery system on MP multimodel --> <offsets> diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index d66103b4..4fb97469 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -2239,6 +2239,19 @@ <z>0.0</z> </axis> </animation> + + <!--<animation> + <type>pick</type> + <object-name>sidestick_button1</object-name> + <action> + <button>0</button> + <binding> + <command>property-toggle</command> + <property>/it-autoflight/input/ap1</property> + <property>/it-autoflight/input/ap2</property> + </binding> + </action> + </animation>--> <animation> <type>rotate</type> @@ -2405,7 +2418,20 @@ <z>0.0</z> </axis> </animation> - + + <!--<animation> + <type>pick</type> + <object-name>sidestick_apdiscor</object-name> + <action> + <button>0</button> + <binding> + <command>property-toggle</command> + <property>/it-autoflight/input/ap1</property> + <property>/it-autoflight/input/ap2</property> + </binding> + </action> + </animation>--> + <animation> <type>rotate</type> <object-name>sidestick_2</object-name> diff --git a/Models/Instruments/ECAM/page-wheel.xml b/Models/Instruments/ECAM/page-wheel.xml index 27e4feb2..f1a40993 100644 --- a/Models/Instruments/ECAM/page-wheel.xml +++ b/Models/Instruments/ECAM/page-wheel.xml @@ -23,6 +23,77 @@ <emissive>true</emissive> </layer> + <layer> + <name>greentriangle1</name> + <w>50</w> + <h>25</h> + <texture> + <path>Aircraft/A320Family/Models/Instruments/ECAM/res/wheel-green-triangle.png</path> + <x1>0.0</x1> + <y1>0.0</y1> + <x2>1</x2> + <y2>1</y2> + </texture> + <emissive>true</emissive> + <transformations> + <transformation> + <type>y-shift</type> + <offset>80</offset> + </transformation> + <transformation> + <type>x-shift</type> + <offset>0</offset> + </transformation> + </transformations> + <condition> + <and> + <equals> + <property>gear/gear[1]/position-norm</property> + <value>1</value> + </equals> + <equals> + <property>controls/lgciu[1]/nlg/isdownlock</property> + <value>1</value> + </equals> + </and> + </condition> + </layer> + + <layer> + <name>redtriangle1</name> + <w>50</w> + <h>25</h> + <texture> + <path>Aircraft/A320Family/Models/Instruments/ECAM/res/wheel-red-triangle.png</path> + <x1>0.0</x1> + <y1>0.0</y1> + <x2>1</x2> + <y2>1</y2> + </texture> + <emissive>true</emissive> + <transformations> + <transformation> + <type>y-shift</type> + <offset>80</offset> + </transformation> + <transformation> + <type>x-shift</type> + <offset>0</offset> + </transformation> + </transformations> + <condition> + <and> + <less-than> + <property>/controls/lgciu[0]/nlgpos</property> + <value>0.99</value> + </less-than> + <greater-than> + <property>/controls/lgciu[0]/nlgpos</property> + <value>0.01</value> + </greater-than> + </and> + </condition> + </layer> <!-- ################################## Bottom #################################--> <layer> diff --git a/Models/Instruments/ECAM/res/page-wheel.png b/Models/Instruments/ECAM/res/page-wheel.png index 3e2cb629..9e6c871c 100644 Binary files a/Models/Instruments/ECAM/res/page-wheel.png and b/Models/Instruments/ECAM/res/page-wheel.png differ diff --git a/Models/Instruments/ECAM/res/page-wheelold.png b/Models/Instruments/ECAM/res/page-wheelold.png new file mode 100644 index 00000000..3e2cb629 Binary files /dev/null and b/Models/Instruments/ECAM/res/page-wheelold.png differ diff --git a/Models/Instruments/ECAM/res/wheel-green-triangle.png b/Models/Instruments/ECAM/res/wheel-green-triangle.png new file mode 100644 index 00000000..738f9a53 Binary files /dev/null and b/Models/Instruments/ECAM/res/wheel-green-triangle.png differ diff --git a/Models/Instruments/ECAM/res/wheel-red-triangle.png b/Models/Instruments/ECAM/res/wheel-red-triangle.png new file mode 100644 index 00000000..9582c2ed Binary files /dev/null and b/Models/Instruments/ECAM/res/wheel-red-triangle.png differ diff --git a/Models/Instruments/Upper-ECAM/resIAE/flaps.png b/Models/Instruments/Upper-ECAM/resIAE/flaps.png new file mode 100644 index 00000000..3b5e5e53 Binary files /dev/null and b/Models/Instruments/Upper-ECAM/resIAE/flaps.png differ diff --git a/Models/Liveries/A319/AAL.png b/Models/Liveries/A319/AAL.png new file mode 100644 index 00000000..0be8e994 Binary files /dev/null and b/Models/Liveries/A319/AAL.png differ diff --git a/Models/Liveries/A319/AAL.xml b/Models/Liveries/A319/AAL.xml new file mode 100644 index 00000000..636bbf4b --- /dev/null +++ b/Models/Liveries/A319/AAL.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>American Airlines (N840AW)</name> + <texture>Liveries/A319/AAL.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/ADR.png b/Models/Liveries/A319/ADR.png new file mode 100644 index 00000000..eec9e1cc Binary files /dev/null and b/Models/Liveries/A319/ADR.png differ diff --git a/Models/Liveries/A319/ADR.xml b/Models/Liveries/A319/ADR.xml new file mode 100644 index 00000000..7eeb648e --- /dev/null +++ b/Models/Liveries/A319/ADR.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>Adria Airways (S5-AAP)</name> + <texture>Liveries/A319/ADR.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/AEE.png b/Models/Liveries/A319/AEE.png new file mode 100644 index 00000000..0dcf2ad3 Binary files /dev/null and b/Models/Liveries/A319/AEE.png differ diff --git a/Models/Liveries/A319/AEE.xml b/Models/Liveries/A319/AEE.xml new file mode 100644 index 00000000..294d92b3 --- /dev/null +++ b/Models/Liveries/A319/AEE.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>Aegean Airlines (SX-DGF)</name> + <texture>Liveries/A319/AEE.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/AMU.png b/Models/Liveries/A319/AMU.png new file mode 100644 index 00000000..2bf41c47 Binary files /dev/null and b/Models/Liveries/A319/AMU.png differ diff --git a/Models/Liveries/A319/AMU.xml b/Models/Liveries/A319/AMU.xml new file mode 100644 index 00000000..933cbae9 --- /dev/null +++ b/Models/Liveries/A319/AMU.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>Air Macau (B-MAO)</name> + <texture>Liveries/A319/AMU.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/ASL.png b/Models/Liveries/A319/ASL.png new file mode 100644 index 00000000..97455bb7 Binary files /dev/null and b/Models/Liveries/A319/ASL.png differ diff --git a/Models/Liveries/A319/ASL.xml b/Models/Liveries/A319/ASL.xml new file mode 100644 index 00000000..bd221144 --- /dev/null +++ b/Models/Liveries/A319/ASL.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>Air Serbia (YU-APF)</name> + <texture>Liveries/A319/ASL.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/AVA.png b/Models/Liveries/A319/AVA.png new file mode 100644 index 00000000..9af43786 Binary files /dev/null and b/Models/Liveries/A319/AVA.png differ diff --git a/Models/Liveries/A319/AVA.xml b/Models/Liveries/A319/AVA.xml new file mode 100644 index 00000000..2874b6c4 --- /dev/null +++ b/Models/Liveries/A319/AVA.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>Avianca (N730AV)</name> + <texture>Liveries/A319/AVA.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/BAW.png b/Models/Liveries/A319/BAW.png new file mode 100644 index 00000000..4802a73d Binary files /dev/null and b/Models/Liveries/A319/BAW.png differ diff --git a/Models/Liveries/A319/BAW.xml b/Models/Liveries/A319/BAW.xml new file mode 100644 index 00000000..7ae213c2 --- /dev/null +++ b/Models/Liveries/A319/BAW.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>British Airways (G-DBCK)</name> + <texture>Liveries/A319/BAW.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/CBJ.png b/Models/Liveries/A319/CBJ.png new file mode 100644 index 00000000..a81308f9 Binary files /dev/null and b/Models/Liveries/A319/CBJ.png differ diff --git a/Models/Liveries/A319/CBJ.xml b/Models/Liveries/A319/CBJ.xml new file mode 100644 index 00000000..b1f93a96 --- /dev/null +++ b/Models/Liveries/A319/CBJ.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>Beijing Capital Airlines (B-6416)</name> + <texture>Liveries/A319/CBJ.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/CCA.png b/Models/Liveries/A319/CCA.png new file mode 100644 index 00000000..b6215675 Binary files /dev/null and b/Models/Liveries/A319/CCA.png differ diff --git a/Models/Liveries/A319/CCA.xml b/Models/Liveries/A319/CCA.xml new file mode 100644 index 00000000..91200ce1 --- /dev/null +++ b/Models/Liveries/A319/CCA.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>Air China (B-2616)</name> + <texture>Liveries/A319/CCA.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Models/Liveries/A319/KZR.png b/Models/Liveries/A319/KZR.png new file mode 100644 index 00000000..4fc9cc14 Binary files /dev/null and b/Models/Liveries/A319/KZR.png differ diff --git a/Models/Liveries/A319/KZR.xml b/Models/Liveries/A319/KZR.xml new file mode 100644 index 00000000..0a344360 --- /dev/null +++ b/Models/Liveries/A319/KZR.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<PropertyList> + <sim> + <model> + <livery> + <name>Air Astana (P4-YAS)</name> + <texture>Liveries/A319/KZR.png</texture> + </livery> + </model> + </sim> +</PropertyList> diff --git a/Nasal/LGCIU.nas b/Nasal/LGCIU.nas new file mode 100644 index 00000000..d871c76a --- /dev/null +++ b/Nasal/LGCIU.nas @@ -0,0 +1,207 @@ +#### A320 Landing Gear System #### +#### Jonathan Redpath #### +#### v.0.2 #### + +var lgciu_one_init = func { + print("LGCIU No 1: Initializing"); + setprop("controls/lgciu[0]/mlgleftpos",1); #0 = retracted, 1 = extended + setprop("controls/lgciu[0]/mlgrightpos",1); #0 = retracted, 1 = extended + setprop("controls/lgciu[0]/nlgpos",1); #0 = retracted, 1 = extended + setprop("/controls/lgciu[0]/doors/mlgleft",0); #0 = closed, 1 = open + setprop("controls/lgciu[0]/doors/mlgright",0); #0 = closed, 1 = open + setprop("controls/lgciu[0]/doors/nlg",0); #0 = closed, 1 = open + setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended + print("L/G SYS: Gears and Doors Set"); + setprop("/controls/lgciu[0]/mlgleft/isdownlock",1); #0 = no, 1 = yes + setprop("/controls/lgciu[0]/mlgright/isdownlock",1); #0 = no, 1 = yes + setprop("/controls/lgciu[0]/nlg/isdownlock",1); #0 = no, 1 = yes + setprop("/controls/lgciu[0]/mlgleft/isuplock",0); #0 = no, 1 = yes + setprop("/controls/lgciu[0]/mlgright/isuplock",0); #0 = no, 1 = yes + setprop("/controls/lgciu[0]/nlg/isuplock",0); #0 = no, 1 = yes + print("L/G SYS: Uplock / Downlock System Enabled"); + setprop("/controls/lgciu[0]/hyd/greensupply",0); #0 = no, 1 = yes presently no supply as green pump is off + print("L/G SYS: Hydraulics Initialized"); + setprop("/controls/lgciu[0]/wow/isongroundl",1); #0 = no, 1 = yes + setprop("/controls/lgciu[0]/wow/isongroundn",1); #0 = no, 1 = yes + setprop("/controls/lgciu[0]/wow/isongroundr",1); #0 = no, 1 = yes + setprop("/controls/lgciu[0]/nws/nwsenabled",0); #0 = disabled 1 = enabled, must be disabled for push + setprop("/controls/lgciu[0]/inuse",1); #the LGCIUs switch between eachother on each gear cycle. eg if one LGCIU fails put the gear down and bring them up again to reset + setprop("/controls/lgciu[0]/hasbeenret",0); #has the gear been retracted with LGCIU1? + print("L/G SYS: System Settings Initialized"); + print("LGCIU No 1 Loaded!"); +} + +var lgciu_two_init = func { + print("LGCIU No 1: Initializing"); + setprop("controls/lgciu[1]/mlgleftpos",1); #0 = retracted, 1 = extended + setprop("controls/lgciu[1]/mlgrightpos",1); #0 = retracted, 1 = extended + setprop("controls/lgciu[1]/nlgpos",1); #0 = retracted, 1 = extended + setprop("/controls/lgciu[1]/doors/mlgleft",0); #0 = closed, 1 = open + setprop("controls/lgciu[1]/doors/mlgright",0); #0 = closed, 1 = open + setprop("controls/lgciu[1]/doors/nlg",0); #0 = closed, 1 = open + setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended + print("L/G SYS: Gears and Doors Set"); + setprop("/controls/lgciu[1]/mlgleft/isdownlock",1); #0 = no, 1 = yes + setprop("/controls/lgciu[1]/mlgright/isdownlock",1); #0 = no, 1 = yes + setprop("/controls/lgciu[1]/nlg/isdownlock",1); #0 = no, 1 = yes + setprop("/controls/lgciu[1]/mlgleft/isuplock",0); #0 = no, 1 = yes + setprop("/controls/lgciu[1]/mlgright/isuplock",0); #0 = no, 1 = yes + setprop("/controls/lgciu[1]/nlg/isuplock",0); #0 = no, 1 = yes + print("L/G SYS: Uplock / Downlock System Enabled"); + setprop("/controls/lgciu[1]/hyd/greensupply",0); #0 = no, 1 = yes presently no supply as green pump is off + print("L/G SYS: Hydraulics Initialized"); + setprop("/controls/lgciu[1]/wow/isongroundl",1); #0 = no, 1 = yes + setprop("/controls/lgciu[1]/wow/isongroundn",1); #0 = no, 1 = yes + setprop("/controls/lgciu[1]/wow/isongroundr",1); #0 = no, 1 = yes + setprop("/controls/lgciu[1]/nws/nwsenabled",0); #0 = disabled 1 = enabled, must be disabled for push + setprop("/controls/lgciu[1]/inuse",0); #the LGCIUs switch between eachother on each gear cycle. eg if one LGCIU fails put the gear down and bring them up again to reset + setprop("/controls/lgciu[1]/hasbeenret",0); #has the gear been retracted with LGCIU2? + print("L/G SYS: System Settings Initialized"); + print("LGCIU No 2: Loaded!"); +} + + +# Initialize Landing Gear Control and Indication Unit +setlistener("/sim/signals/fdm-initialized", func { + print("Landing Gear System: Initializing"); + lgciu_one_init(); + lgciu_two_init(); +}); + +### Left MLG compressor sensor to check if we are on the ground ### +setlistener("/gear/gear[0]/wow", func { + var wowmlgl = getprop("/gear/gear[0]/wow"); + if (wowmlgl == 0) { + setprop("/controls/lgciu[0]/wow/isongroundl",0); + setprop("/controls/lgciu[1]/wow/isongroundl",0); + } else if (wowmlgl == 1) { + setprop("/controls/lgciu[0]/wow/isongroundl",1); + setprop("/controls/lgciu[1]/wow/isongroundl",1); +} +}); + +### Nose MLG compressor sensor to check if we are on the ground ### +setlistener("/gear/gear[1]/wow", func { + var wowmlgn = getprop("/gear/gear[1]/wow"); + if (wowmlgn == 0) { + setprop("/controls/lgciu[0]/wow/isongroundn",0); + setprop("/controls/lgciu[1]/wow/isongroundn",0); + } else if (wowmlgn == 1) { + setprop("/controls/lgciu[0]/wow/isongroundn",1); + setprop("/controls/lgciu[1]/wow/isongroundn",1); +} +}); + +### Right MLG compressor sensor to check if we are on the ground ### +setlistener("/gear/gear[2]/wow", func { + var wowmlgr = getprop("/gear/gear[2]/wow"); + if (wowmlgr == 0) { + setprop("/controls/lgciu[0]/wow/isongroundr",0); + setprop("/controls/lgciu[1]/wow/isongroundr",0); + } else if (wowmlgr == 1) { + setprop("/controls/lgciu[0]/wow/isongroundr",1); + setprop("/controls/lgciu[1]/wow/isongroundr",1); +} +}); + +### Interpolate MLG and NLG so that they take 8 seconds to move positions ### +setlistener("/controls/gear/gear-down", func { +var gr = getprop("/controls/gear/gear-down"); +var mlgl = getprop("/controls/lgciu[0]/mlgleftpos"); +var mlgr = getprop("/controls/lgciu[0]/mlgrightpos"); +var mlgl2 = getprop("/controls/lgciu[1]/mlgleftpos"); +var mlgr2 = getprop("/controls/lgciu[1]/mlgrightpos"); +var nlg = getprop("/controls/lgciu[0]/nlgpos"); +var nlg2 = getprop("/controls/lgciu[1]/nlgpos"); +var inuseno1 = getprop("/controls/lgciu[0]/inuse"); +var inuseno2 = getprop("/controls/lgciu[1]/inuse"); +if ((gr == 1) and (inuseno1 == 1)) { + interpolate("/controls/lgciu[0]/mlgleftpos", 1, 10); + interpolate("/controls/lgciu[0]/mlgrightpos", 1, 10); + interpolate("/controls/lgciu[0]/nlgpos", 1, 10); + setprop("/controls/lgciu[1]/mlgleftpos",1); + setprop("/controls/lgciu[1]/mlgrightpos",1); + setprop("/controls/lgciu[1]/nlgpos",1); +} else if ((gr == 1) and (inuseno2 == 1)) { + interpolate("/controls/lgciu[1]/mlgleftpos", 1, 10); + interpolate("/controls/lgciu[1]/mlgrightpos", 1, 10); + interpolate("/controls/lgciu[1]/nlgpos", 1, 10); + setprop("/controls/lgciu[0]/mlgleftpos",1); + setprop("/controls/lgciu[0]/mlgrightpos",1); + setprop("/controls/lgciu[0]/nlgpos",1); +} else if ((gr == 0) and (inuseno1 == 1)) { + interpolate("/controls/lgciu[0]/mlgleftpos", 0, 10); + interpolate("/controls/lgciu[0]/mlgrightpos", 0, 10); + interpolate("/controls/lgciu[0]/nlgpos", 0, 10); + setprop("/controls/lgciu[1]/mlgleftpos",0); + setprop("/controls/lgciu[1]/mlgrightpos",0); + setprop("/controls/lgciu[1]/nlgpos",0); +} else if ((gr == 0) and (inuseno2 == 1)) { + interpolate("/controls/lgciu[1]/mlgleftpos", 0, 10); + interpolate("/controls/lgciu[1]/mlgrightpos", 0, 10); + interpolate("/controls/lgciu[1]/nlgpos", 0, 10); + setprop("/controls/lgciu[0]/mlgleftpos",0); + setprop("/controls/lgciu[0]/mlgrightpos",0); + setprop("/controls/lgciu[0]/nlgpos",0); +} +}); + +### Checking the Green Hydraulic System ### +#var checkgreen = func { +setlistener("/controls/gear/gear-down", func { +#var psigrn = getprop("/hydraulics/green/psi"); it0uchpods, please enable whenever hydraulic system is available +var spd = getprop("/velocities/airspeed-kt"); + #if ((psigrn < 2000) or (spd > 261)) { see above line where psigrn is defined + if (spd > 261) { + setprop("/controls/gear/gear-down",0); + screen.log.write("Hydraulic Safety Valve was disconnected at 260 kts; cannot move gear!", 1, 1, 1); +} +}); + +### Switching between LGCIUS ### + +# Putting the Gear Up +setlistener("/controls/gear/gear-down", func { +var inuse1 = getprop("/controls/lgciu[0]/inuse"); +var inuse2 = getprop("/controls/lgciu[1]/inuse"); +var isgearupordown = getprop("/controls/gear/gear-down"); +var hydsupp = getprop("/controls/lgciu[0]/hyd/greensupply"); +if ((inuse1 == 1) and (isgearupordown == 0) and (hydsupp == 1)) { +setprop("/controls/lgciu[0]/hasbeenret",1); #we have put gear up on lgciu no 1 +setprop("/controls/lgciu[0]/inuse",1); #we want to keep active LGCIU on no 1 +setprop("/controls/lgciu[0]/gearlever",0); #0 = retracted, 1 = extended + +} else { +if ((inuse2 == 1) and (isgearupordown == 0) and (hydsupp == 1)) { +setprop("/controls/lgciu[1]/hasbeenret",1); #we have put gear up on lgciu no 2 +setprop("/controls/lgciu[1]/inuse",1); #we want to keep active LGCIU on no 2 +setprop("/controls/lgciu[1]/gearlever",0); #0 = retracted, 1 = extended +} else { +} +} +}); + +# Putting the Gear Down Again +setlistener("/controls/gear/gear-down", func { +var inuse1 = getprop("/controls/lgciu[0]/inuse"); +var inuse2 = getprop("/controls/lgciu[1]/inuse"); +var hasbeen1 = getprop("/controls/lgciu[0]/hasbeenret"); +var hasbeen2 = getprop("/controls/lgciu[1]/hasbeenret"); +var isgearupordown = getprop("/controls/gear/gear-down"); +var hydsupp = getprop("/controls/lgciu[0]/hyd/greensupply"); +if ((inuse1 == 1) and (isgearupordown == 1) and (hasbeen1 == 1) and (hydsupp == 1)) { +setprop("/controls/lgciu[0]/hasbeenret",0); #reset retraction sensor +setprop("/controls/lgciu[0]/inuse",0); #we want to switch to no 2 after putting the gear down +setprop("/controls/lgciu[1]/inuse",1); +setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended +} else { +if ((inuse2 == 1) and (isgearupordown == 1) and (hasbeen2 == 1) and (hydsupp == 1)) { +setprop("/controls/lgciu[1]/hasbeenret",0); #reset retraction sensor +setprop("/controls/lgciu[0]/inuse",1); #we want to switch to no 1 after putting the gear down +setprop("/controls/lgciu[1]/inuse",0); +setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended +} else { +} +} +}); + diff --git a/Nasal/hydraulics.notes.nas b/Nasal/hydraulics.notes.nas index 58c8ef28..420d869c 100644 --- a/Nasal/hydraulics.notes.nas +++ b/Nasal/hydraulics.notes.nas @@ -20,6 +20,11 @@ var hyd_init = func { setprop("/hydraulics/ratextended",0); setprop("/hydraulics/ratmanguard",0); setprop("/hydraulics/ratmanext",0); + setprop("/hydraulics/ratextended",0); + setprop("/hydraulics/ratmanguard",0); + setprop("/hydraulics/ratelecguard",0); + setprop("/hydraulics/ratelecconnect",0); + setprop("/hydraulics/ratmanext",0); print("Hydraulics: PTU and RAT Initialized"); setprop("/hydraulics/greenpsi","0"); setprop("/hydraulics/bluepsi","0"); diff --git a/Nasal/systems.nas b/Nasal/systems.nas index fef26987..3c418acf 100644 --- a/Nasal/systems.nas +++ b/Nasal/systems.nas @@ -97,7 +97,7 @@ aircraft.rain.init(); # seatbelt/no smoking sign triggers setlistener("controls/switches/seatbelt-sign", func { - props.globals.getNode("sim/sound/seatbelt-sign").setBoolValue(1); + setprop("/sim/sound/seatbelt-sign",1); settimer(func { diff --git a/Paintkit/AAL.xcf b/Paintkit/AAL.xcf new file mode 100644 index 00000000..eacfce8a Binary files /dev/null and b/Paintkit/AAL.xcf differ diff --git a/Paintkit/ADR.xcf b/Paintkit/ADR.xcf new file mode 100644 index 00000000..c466111f Binary files /dev/null and b/Paintkit/ADR.xcf differ diff --git a/Paintkit/AEE.xcf b/Paintkit/AEE.xcf new file mode 100644 index 00000000..5c66f71c Binary files /dev/null and b/Paintkit/AEE.xcf differ diff --git a/Paintkit/AMU.xcf b/Paintkit/AMU.xcf new file mode 100644 index 00000000..94c3929e Binary files /dev/null and b/Paintkit/AMU.xcf differ diff --git a/Paintkit/ASL.xcf b/Paintkit/ASL.xcf new file mode 100644 index 00000000..9fb0d0bb Binary files /dev/null and b/Paintkit/ASL.xcf differ diff --git a/Paintkit/AVA.xcf b/Paintkit/AVA.xcf new file mode 100644 index 00000000..82633de4 Binary files /dev/null and b/Paintkit/AVA.xcf differ diff --git a/Paintkit/Air China.xcf b/Paintkit/Air China.xcf new file mode 100644 index 00000000..80502ec6 Binary files /dev/null and b/Paintkit/Air China.xcf differ diff --git a/Paintkit/BAW.xcf b/Paintkit/BAW.xcf new file mode 100644 index 00000000..544fe2cd Binary files /dev/null and b/Paintkit/BAW.xcf differ diff --git a/Paintkit/CBJ.xcf b/Paintkit/CBJ.xcf new file mode 100644 index 00000000..2e8dc466 Binary files /dev/null and b/Paintkit/CBJ.xcf differ diff --git a/Paintkit/KZR.xcf b/Paintkit/KZR.xcf new file mode 100644 index 00000000..c9ff03cc Binary files /dev/null and b/Paintkit/KZR.xcf differ diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index 21dff5b6..65bc44b3 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -40,6 +40,7 @@ <!-- Retard Warning --> + <retard> <name>retard</name> <path>Aircraft/A320Family/Sounds/GPWS/retard.wav</path> diff --git a/Sounds/GPWS/100-above.wav b/Sounds/GPWS/100-above.wav new file mode 100644 index 00000000..1ce105e1 Binary files /dev/null and b/Sounds/GPWS/100-above.wav differ diff --git a/Sounds/GPWS/altitude-2500.wav b/Sounds/GPWS/altitude-2500.wav new file mode 100644 index 00000000..1575db16 Binary files /dev/null and b/Sounds/GPWS/altitude-2500.wav differ