diff --git a/A320-main.xml b/A320-main.xml
index 898de752..d68cc179 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -277,7 +277,7 @@
0.10
- 0.03
+ 0.05
-0.3
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index c2aba87c..af7383a9 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -74,26 +74,6 @@
-
-
-
- /controls/electrical/switches/battery1
- 1
-
-
- /controls/electrical/switches/battery2
- 1
-
-
-
- /systems/electrical/bus/ac1
- 25
-
-
- /systems/electrical/bus/ac2
- 25
-
-
/systems/electrical/bus/ac1
25
@@ -186,26 +166,6 @@
-
-
-
- /controls/electrical/switches/battery1
- 1
-
-
- /controls/electrical/switches/battery2
- 1
-
-
-
- /systems/electrical/bus/ac1
- 25
-
-
- /systems/electrical/bus/ac2
- 25
-
-
/systems/electrical/bus/ac1
25
diff --git a/Nasal/engines.nas b/Nasal/engines.nas
index 4cf46aef..57f19f58 100644
--- a/Nasal/engines.nas
+++ b/Nasal/engines.nas
@@ -192,11 +192,11 @@ var do_rev_thrust = func {
if ((getprop("/controls/engines/engine[0]/reverser") == "1") and (getprop("/controls/engines/engine[1]/reverser") == "1") and (getprop("/gear/gear[1]/wow") == 1) and (getprop("/gear/gear[2]/wow") == 1)) {
var pos1 = getprop("/controls/engines/engine[0]/throttle-pos");
var pos2 = getprop("/controls/engines/engine[1]/throttle-pos");
- if (pos1 < 0.25) {
- setprop("/controls/engines/engine[0]/throttle-pos", pos1 + 0.05);
+ if (pos1 < 0.5) {
+ setprop("/controls/engines/engine[0]/throttle-pos", pos1 + 0.167);
}
- if (pos2 < 0.25) {
- setprop("/controls/engines/engine[1]/throttle-pos", pos2 + 0.05);
+ if (pos2 < 0.5) {
+ setprop("/controls/engines/engine[1]/throttle-pos", pos2 + 0.167);
}
}
var state1 = getprop("/systems/thrust/state1");
@@ -215,17 +215,15 @@ var do_rev_thrust = func {
var un_rev_thrust = func {
if ((getprop("/controls/engines/engine[0]/reverser") == "1") and (getprop("/controls/engines/engine[1]/reverser") == "1")) {
- interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
- interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0);
var pos1 = getprop("/controls/engines/engine[0]/throttle-pos");
var pos2 = getprop("/controls/engines/engine[1]/throttle-pos");
if (pos1 > 0.0) {
- setprop("/controls/engines/engine[0]/throttle-pos", pos1 - 0.05);
+ setprop("/controls/engines/engine[0]/throttle-pos", pos1 - 0.167);
} else {
un_rev_thrust_b();
}
if (pos2 > 0.0) {
- setprop("/controls/engines/engine[1]/throttle-pos", pos2 - 0.05);
+ setprop("/controls/engines/engine[1]/throttle-pos", pos2 - 0.167);
} else {
un_rev_thrust_b();
}
@@ -233,6 +231,8 @@ var un_rev_thrust = func {
}
var un_rev_thrust_b = func {
+ interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0);
+ interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0);
setprop("/controls/engines/engine[0]/throttle-pos", 0);
setprop("/controls/engines/engine[1]/throttle-pos", 0);
setprop("/fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 0);
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index 375ee388..3048eb84 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -1,5 +1,5 @@
# Airbus A3XX FBW System by Joshua Davidson (it0uchpods/411)
-# V0.9.1
+# V0.9.2
########################
# Roll Update Function #
@@ -7,8 +7,9 @@
var roll_input = func {
+ var ail = getprop("/controls/flight/aileron");
+
if (getprop("/it-autoflight/output/ap1") == 0 and getprop("/it-autoflight/output/ap2") == 0 and ((getprop("/it-fbw/law") == "NORMAL") or (getprop("/it-fbw/law") == "ALTERNATE"))) {
- var ail = getprop("/controls/flight/aileron");
if (ail >= 0.05 and ail < 0.15) {
var rfbw = getprop("/it-fbw/roll-deg");
diff --git a/Nasal/systems.nas b/Nasal/systems.nas
index 2b1ec70b..a4ea6eca 100644
--- a/Nasal/systems.nas
+++ b/Nasal/systems.nas
@@ -159,7 +159,7 @@ setlistener("/sim/signals/fdm-initialized", func {
var aglgears = func {
var agl = getprop("/position/altitude-agl-ft") or 0;
- var aglft = agl - 8.004; # is the position from the Airbus A320 above ground
+ var aglft = agl - 11.102; # is the position from the Airbus A320 above ground
var aglm = aglft * 0.3048;
setprop("/position/gear-agl-ft", aglft);
setprop("/position/gear-agl-m", aglm);
@@ -168,11 +168,3 @@ var aglgears = func {
}
aglgears();
-
-setlistener("/controls/parking-brake", func {
- if (getprop("/controls/parking-brake") == 1) {
- setprop("/electrical/switches/ext-pwr", 1);
- } else {
- setprop("/electrical/switches/ext-pwr", 0);
- }
-});
\ No newline at end of file
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index f29fff2f..2124f687 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -49,10 +49,10 @@
/instrumentation/mk-viii/inputs/discretes/gpws-inhibit
0
-
+
/position/gear-agl-ft
2500
-
+
/position/gear-agl-ft
2400
@@ -84,10 +84,10 @@
/instrumentation/mk-viii/inputs/discretes/gpws-inhibit
0
-
+
/position/gear-agl-ft
2000
-
+
/position/gear-agl-ft
1900
@@ -109,6 +109,102 @@
20.0
100.0
+
+ 10ftaland
+ Aircraft/A320Family/Sounds/GPWS/altitude-10ft.wav
+ once
+
+
+
+ /instrumentation/mk-viii/inputs/discretes/gpws-inhibit
+ 0
+
+
+ /controls/flight/flaps
+ 0.640
+
+
+ /position/gear-agl-ft
+ 10
+
+
+ /position/gear-agl-ft
+ 8
+
+
+ /it-autoflight/internal/vert-speed-fpm
+ 0
+
+
+
+ /it-autoflight/output/ap1
+ 1
+
+
+ /it-autoflight/output/ap2
+ 1
+
+
+
+
+
+ 8
+
+
+ 0.00
+ 0.00
+ 0.00
+
+ 20.0
+ 100.0
+
+
+ 5
+ Aircraft/A320Family/Sounds/GPWS/altitude-5.wav
+ once
+
+
+
+ /instrumentation/mk-viii/inputs/discretes/gpws-inhibit
+ 0
+
+
+ /controls/flight/flaps
+ 0.640
+
+
+ /position/gear-agl-ft
+ 5
+
+
+ /position/gear-agl-ft
+ 3
+
+
+ /it-autoflight/internal/vert-speed-fpm
+ 0
+
+
+ /controls/engines/engine[0]/throttle
+ 0.0
+
+
+ /controls/engines/engine[1]/throttle
+ 0.0
+
+
+
+
+ 8
+
+
+ 0.00
+ 0.00
+ 0.00
+
+ 20.0
+ 100.0
+
100above
@@ -120,10 +216,10 @@
/instrumentation/mk-viii/inputs/discretes/gpws-inhibit
0
-
+
/position/gear-agl-ft
350
-
+
/position/gear-agl-ft
300
@@ -159,10 +255,38 @@
/controls/flight/flaps
0.640
-
- /position/gear-agl-ft
- 18
-
+
+
+
+ /position/gear-agl-ft
+ 18
+
+
+ /it-autoflight/output/ap1
+ 0
+
+
+ /it-autoflight/output/ap2
+ 0
+
+
+
+
+ /position/gear-agl-ft
+ 8
+
+
+
+ /it-autoflight/output/ap1
+ 1
+
+
+ /it-autoflight/output/ap2
+ 1
+
+
+
+
controls/engines/engine[0]/throttle
0.0
@@ -192,7 +316,6 @@
/sim/sound/effects/volume
- avionics
diff --git a/Sounds/GPWS/altitude-10.wav b/Sounds/GPWS/altitude-10.wav
index 2e159ba9..59c8e62a 100644
Binary files a/Sounds/GPWS/altitude-10.wav and b/Sounds/GPWS/altitude-10.wav differ
diff --git a/Sounds/GPWS/altitude-10ft.wav b/Sounds/GPWS/altitude-10ft.wav
new file mode 100644
index 00000000..2e159ba9
Binary files /dev/null and b/Sounds/GPWS/altitude-10ft.wav differ
diff --git a/Sounds/GPWS/altitude-5.wav b/Sounds/GPWS/altitude-5.wav
new file mode 100644
index 00000000..e673cbe6
Binary files /dev/null and b/Sounds/GPWS/altitude-5.wav differ
diff --git a/Sounds/GPWS/bank-angle.wav b/Sounds/GPWS/bank-angle.wav
index cd2145c0..8dbde954 100644
Binary files a/Sounds/GPWS/bank-angle.wav and b/Sounds/GPWS/bank-angle.wav differ