diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index 44347315..4df7dc6a 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -84,7 +84,6 @@ Aircraft/A320Family/Nasal/it-autoflight.nas - Aircraft/A320Family/Nasal/thrust.nas diff --git a/A320-main.xml b/A320-main.xml index 3be973f5..dc320c30 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -143,7 +143,7 @@ - Left Wing Vent + Left Wing Pipes Left Wing Outer @@ -161,7 +161,7 @@ Right Wing Outer - Right Wing Vent + Right Wing Pipes @@ -263,6 +263,8 @@ + + diff --git a/Models/Liveries/A319/NKS.png b/Models/Liveries/A319/NKS.png new file mode 100644 index 00000000..e5698613 Binary files /dev/null and b/Models/Liveries/A319/NKS.png differ diff --git a/Models/Liveries/A319/NKS.xml b/Models/Liveries/A319/NKS.xml new file mode 100644 index 00000000..d08b7979 --- /dev/null +++ b/Models/Liveries/A319/NKS.xml @@ -0,0 +1,12 @@ + + + + + + + Spirit Airlines (N502NK) + Liveries/A319/NKS.png + + + + diff --git a/Models/Liveries/A319/THY.png b/Models/Liveries/A319/THY.png new file mode 100644 index 00000000..3bafa2c1 Binary files /dev/null and b/Models/Liveries/A319/THY.png differ diff --git a/Models/Liveries/A319/THY.xml b/Models/Liveries/A319/THY.xml new file mode 100644 index 00000000..8dbcd207 --- /dev/null +++ b/Models/Liveries/A319/THY.xml @@ -0,0 +1,12 @@ + + + + + + + Turkish Airlines (TC-JLZ) + Liveries/A319/THY.png + + + + diff --git a/Models/Liveries/A319/TPU.png b/Models/Liveries/A319/TPU.png new file mode 100644 index 00000000..5f7732c9 Binary files /dev/null and b/Models/Liveries/A319/TPU.png differ diff --git a/Models/Liveries/A319/TPU.xml b/Models/Liveries/A319/TPU.xml new file mode 100644 index 00000000..934f3518 --- /dev/null +++ b/Models/Liveries/A319/TPU.xml @@ -0,0 +1,12 @@ + + + + + + + TACA Peru (N472TA) + Liveries/A319/TPU.png + + + + diff --git a/Models/Liveries/A319/VOI.png b/Models/Liveries/A319/VOI.png new file mode 100644 index 00000000..b8801f2c Binary files /dev/null and b/Models/Liveries/A319/VOI.png differ diff --git a/Models/Liveries/A319/VOI.xml b/Models/Liveries/A319/VOI.xml new file mode 100644 index 00000000..4479dc2d --- /dev/null +++ b/Models/Liveries/A319/VOI.xml @@ -0,0 +1,12 @@ + + + + + + + Volaris (N504VL) + Liveries/A319/VOI.png + + + + diff --git a/Models/Liveries/ACJ/FAV0001.xml b/Models/Liveries/ACJ/FAV0001.xml index 9a1a6305..47ed0a80 100644 --- a/Models/Liveries/ACJ/FAV0001.xml +++ b/Models/Liveries/ACJ/FAV0001.xml @@ -4,7 +4,7 @@ - FAV0001 (Venuzuela) + FAV0001 (Venezuela) Liveries/ACJ/FAV0001.png diff --git a/Nasal/LGCIU.nas b/Nasal/LGCIU.nas index 5a9d36d8..c998e8f1 100644 --- a/Nasal/LGCIU.nas +++ b/Nasal/LGCIU.nas @@ -1,6 +1,7 @@ #### A320 Landing Gear System #### -#### Jonathan Redpath #### -#### v.0.2 #### +#### Jonathan Redpath #### +#### v.0.4 #### + var lgciu_one_init = func { setprop("controls/lgciu[0]/mlgleftpos",1); #0 = retracted, 1 = extended @@ -50,6 +51,8 @@ var lgciu_two_init = func { setprop("/controls/lgciu[1]/hasbeenret",0); #has the gear been retracted with LGCIU2? setprop("/controls/lgciu[1]/fail",0); #0 = no 1 = yes setprop("/controls/lgciu[1]/emermanext",0); #0 = no 1 = extended can only be retracted if green hyd is available + setprop("/controls/lgciu[0]/init",1); #these two properties say that 'everything is ready now' + setprop("/controls/lgciu[1]/init",1); } @@ -97,7 +100,7 @@ setlistener("/gear/gear[2]/wow", func { } }); -### Interpolate MLG and NLG so that they take 8 seconds to move positions ### +### Interpolate MLG and NLG so that they take 10 seconds to move positions ### setlistener("/controls/gear/gear-down", func { var gr = getprop("/controls/gear/gear-down"); var mlgl = getprop("/controls/lgciu[0]/mlgleftpos"); @@ -112,35 +115,39 @@ 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); + interpolate("/controls/lgciu[1]/mlgleftpos", 1, 10); #we also interpolate the other LGCIU's properties just to keep the systems from clashing + interpolate("/controls/lgciu[1]/mlgrightpos", 1, 10); + interpolate("/controls/lgciu[1]/nlgpos", 1, 10); } 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); + interpolate("/controls/lgciu[0]/mlgleftpos", 1, 10); + interpolate("/controls/lgciu[0]/mlgrightpos", 1, 10); + interpolate("/controls/lgciu[0]/nlgpos", 1, 10); } 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); + interpolate("/controls/lgciu[1]/mlgleftpos", 0, 10); + interpolate("/controls/lgciu[1]/mlgrightpos", 0, 10); + interpolate("/controls/lgciu[1]/nlgpos", 0, 10); } 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); + interpolate("/controls/lgciu[0]/mlgleftpos", 0, 10); + interpolate("/controls/lgciu[0]/mlgrightpos", 0, 10); + interpolate("/controls/lgciu[0]/nlgpos", 0, 10); } }); -### Checking the Green Hydraulic System ### -#var checkgreen = func { + + + + +### Checking the Hydraulics and Valves ### + 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"); @@ -198,20 +205,21 @@ setprop("/controls/lgciu[0]/inuse",1); #we want to switch to no 1 after putting setprop("/controls/lgciu[1]/inuse",0); setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended -} else if ((inuse1 == 1) and isgearupordown == 1) and (hasbeen1 == 1) and (hydsupp ==1) and (no2fail == 1) { +} else if ((inuse1 == 1) and (isgearupordown == 1) and (hasbeen1 == 1) and (hydsupp ==1) and (no2fail == 1)) { setprop("/controls/lgciu[0]/hasbeenret",0); #reset retraction sensor setprop("/controls/lgciu[0]/inuse",1); #we want to switch to no 2 after putting the gear down but we cant because it is failed setprop("/controls/lgciu[1]/inuse",0); setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended -} else if ((inuse1 == 2) and isgearupordown == 1) and (hasbeen2 == 1) and (hydsupp ==1) and (no1fail == 1) { +} else if ((inuse1 == 2) and (isgearupordown == 1) and (hasbeen2 == 1) and (hydsupp ==1) and (no1fail == 1)) { setprop("/controls/lgciu[0]/hasbeenret",0); #reset retraction sensor setprop("/controls/lgciu[1]/inuse",1); #we want to switch to no 1 after putting the gear down but we cant because it is failed setprop("/controls/lgciu[0]/inuse",0); setprop("/controls/lgciu[0]/gearlever",1); #0 = retracted, 1 = extended setprop("/controls/lgciu[1]/gearlever",1); #0 = retracted, 1 = extended } -}); +} +); # No 1 failed setlistener("/controls/lgciu[0]/fail", func { @@ -219,6 +227,7 @@ var no1fail = getprop("/controls/lgciu[0]/fail"); if (no1fail == 1) { setprop("/controls/lgciu[0]/inuse",0); setprop("/controls/lgciu[1]/inuse",1); +print("LGCIU No 1... Failed!"); } else { print("LGCIU No 1... Serviceable!"); } @@ -230,6 +239,7 @@ var no2fail = getprop("/controls/lgciu[1]/fail"); if (no2fail == 1) { setprop("/controls/lgciu[1]/inuse",0); setprop("/controls/lgciu[0]/inuse",1); +print("LGCIU No 2... Failed!"); } else { print("LGCIU No 2... Serviceable!"); } diff --git a/Paintkit/NKS.xcf b/Paintkit/NKS.xcf new file mode 100644 index 00000000..2087bffa Binary files /dev/null and b/Paintkit/NKS.xcf differ diff --git a/Paintkit/THY.xcf b/Paintkit/THY.xcf new file mode 100644 index 00000000..420c3201 Binary files /dev/null and b/Paintkit/THY.xcf differ diff --git a/Paintkit/TPU.xcf b/Paintkit/TPU.xcf new file mode 100644 index 00000000..ebaaff8a Binary files /dev/null and b/Paintkit/TPU.xcf differ diff --git a/Paintkit/VOI.xcf b/Paintkit/VOI.xcf new file mode 100644 index 00000000..fbf20d4c Binary files /dev/null and b/Paintkit/VOI.xcf differ diff --git a/README.md b/README.md index 5cd03153..20e632bf 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # A320Family -Airbus A320 Family for FlightGear. A320-200 Flyable! A319-200/A321-200 Flyable soon! Note: Flaps indicator still missing from ECAM, coming soon! \ No newline at end of file +Airbus A320 Family for FlightGear. A319-132, A320-232, and A321-232 flyable! CFM coming soon! Note: Flaps indicator still missing from ECAM, coming soon! \ No newline at end of file