diff --git a/A320-main.xml b/A320-main.xml
index 1bebeaaf..1905d347 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1059,6 +1059,7 @@
+ 0
0
0
0
@@ -1067,6 +1068,8 @@
0
0
0
+ 0
+ 0
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index dbe1ceba..09fb2edb 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -323,7 +323,7 @@ var beforestart = func {
setprop("/controls/flight/elevator-trim", 0);
libraries.systemsInit();
libraries.variousReset();
- setprop("/controls/oxygen/crewOxyPB", 1);
+ setprop("/controls/oxygen/cockpit-oxygen-supply-pb", 1);
failResetOld();
# Now the Startup!
@@ -419,7 +419,7 @@ var taxi = func {
setprop("/controls/flight/elevator-trim", 0);
libraries.systemsInit();
libraries.variousReset();
- setprop("/controls/oxygen/crewOxyPB", 1);
+ setprop("/controls/oxygen/cockpit-oxygen-supply-pb", 1);
failResetOld();
# Now the Startup!
diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml
index de0bacd7..b8d554a8 100644
--- a/AircraftConfig/groundservices.xml
+++ b/AircraftConfig/groundservices.xml
@@ -378,6 +378,20 @@
2183
+
+
diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas
index 05607dae..9157e72c 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM-door.nas
@@ -339,7 +339,7 @@ var input = {
cargoAft: "/sim/model/door-positions/cargoaft/position-norm",
cargoBulk: "/sim/model/door-positions/cargobulk/position-norm",
cargoFwd: "/sim/model/door-positions/cargofwd/position-norm",
- oxyPB: "/controls/oxygen/crewOxyPB",
+ oxyPB: "/controls/oxygen/cockpit-oxygen-supply-pb",
oxyBottlePress: "/systems/oxygen/cockpit-oxygen/bottle-psi",
oxyBottleRegulLoPr: "/systems/oxygen/cockpit-oxygen/regul-lo-pr",
};
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 2448cac4..034526f5 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -7502,37 +7502,13 @@
-
- pick
- PassOxyInd
- PassOxyInd1S
-
-
- false
-
-
-
- systems/electrical/bus/dc-ess
- 25
-
-
- property-toggle
- controls/oxygen/masksSys
-
-
- nasal
-
-
-
-
-
select
PassOxyInd1S
- controls/oxygen/masksSys
+ /systems/oxygen/passenger-oxygen/sys-on-light
1
@@ -7558,7 +7534,7 @@
property-toggle
- controls/oxygen/crewOxyPB
+ controls/oxygen/cockpit-oxygen-supply-pb
nasal
@@ -7573,7 +7549,7 @@
- controls/oxygen/crewOxyPB
+ controls/oxygen/cockpit-oxygen-supply-pb
0
@@ -7603,8 +7579,9 @@
- property-toggle
- controls/oxygen/masksDeployMan
+ property-assign
+ controls/oxygen/passenger-mask-deploy-man
+ 1
@@ -7616,17 +7593,36 @@
nasal
-
-
-
- controls/OH/protectors/maskman
- 1
-
-
- property-assign
- controls/OH/protectors/maskman
- 0
-
+
+
+
+
+
+ controls/OH/protectors/maskman
+ 1
+
+
+ systems/electrical/bus/dc-ess
+ 25
+
+
+
+ property-assign
+ controls/oxygen/passenger-mask-deploy-man
+ 0
+
+
+
+
+ controls/OH/protectors/maskman
+ 1
+
+
+ property-assign
+ controls/OH/protectors/maskman
+ 0
+
+
diff --git a/Nasal/Libraries/buttons.nas b/Nasal/Libraries/buttons.nas
index b480d47b..2ca80885 100644
--- a/Nasal/Libraries/buttons.nas
+++ b/Nasal/Libraries/buttons.nas
@@ -32,7 +32,6 @@ var variousReset = func() {
setprop("/controls/CVR/gndctl", 0);
setprop("/controls/CVR/erase", 0);
setprop("/controls/switches/pneumatics/cabin-fans", 1);
- setprop("/controls/oxygen/crewOxyPB", 0); # 0 = OFF 1 = AUTO
setprop("/controls/switches/emerCallLtO", 0); # ON light, flashes white for 10s
setprop("/controls/switches/emerCallLtC", 0); # CALL light, flashes amber for 10s
setprop("/controls/switches/emerCall", 0);
diff --git a/Nasal/Systems/pneumatics.nas b/Nasal/Systems/pneumatics.nas
index cf3879f3..3689c740 100644
--- a/Nasal/Systems/pneumatics.nas
+++ b/Nasal/Systems/pneumatics.nas
@@ -140,10 +140,8 @@ var PNEU = {
#setprop("/systems/ventilation/cabin/fans", 0); # aircon fans
#setprop("/systems/ventilation/avionics/extractvalve", "0");
#setprop("/systems/ventilation/avionics/inletvalve", "0");
- setprop("/controls/oxygen/masksDeploy", 0);
- setprop("/controls/oxygen/masksDeployMan", 0);
- setprop("/controls/oxygen/masksReset", 0); # this is the TMR RESET pb on the maintenance panel, needs 3D model
- setprop("/controls/oxygen/masksSys", 0);
+ setprop("/controls/oxygen/passenger-mask-deploy-man", 0);
+ setprop("/controls/oxygen/passenger-mask-reset", 0); # this is the TMR RESET pb on the maintenance panel, needs 3D model
},
resetFail: func() {
me.Fail.apu.setBoolValue(0);
@@ -206,41 +204,5 @@ var PNEU = {
#setprop("/systems/ventilation/avionics/extractvalve", "1");
#setprop("/systems/ventilation/avionics/inletvalve", "1");
#}
-
- # Oxygen
- if (cabinalt > 13500) {
- setprop("/controls/oxygen/masksDeploy", 1);
- setprop("/controls/oxygen/masksSys", 1);
- }
},
-};
-
-
-# Oxygen (Cabin)
-
-setlistener("/controls/oxygen/masksDeployMan", func {
- guard = getprop("/controls/oxygen/masksGuard");
- masks = getprop("/controls/oxygen/masksDeployMan");
-
- if (guard and masks) {
- setprop("/controls/oxygen/masksDeployMan", 0);
- } else if (!guard and masks) {
- setprop("/controls/oxygen/masksDeployMan", 1);
- setprop("/controls/oxygen/masksDeploy", 1);
- setprop("/controls/oxygen/masksSys", 1);
- }
-}, 0, 0);
-
-setlistener("/controls/oxygen/masksDeployMan", func {
- masks = getprop("/controls/oxygen/masksDeployMan");
- if (!masks) {
- setprop("/controls/oxygen/masksDeployMan", 1);
- }
-}, 0, 0);
-
-setlistener("/controls/oxygen/masksDeploy", func {
- autoMasks = getprop("/controls/oxygen/masksDeploy");
- if (!autoMasks) {
- setprop("/controls/oxygen/masksDeploy", 1);
- }
-}, 0, 0);
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index af9ce4c8..fdff70f0 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -1913,6 +1913,22 @@
+
+ depressurization
+ once
+ Aircraft/A320-family/Sounds/Announce/depressurization.wav
+
+
+ /systems/oxygen/passenger-oxygen/sys-on-light
+ 1
+
+
+
+ /sim/current-view/internal
+ 2.0
+
+
+
Click
Aircraft/A320-family/Sounds/Cockpit/click.wav
diff --git a/Systems/a320-oxygen.xml b/Systems/a320-oxygen.xml
index 5de9b205..1fb49433 100644
--- a/Systems/a320-oxygen.xml
+++ b/Systems/a320-oxygen.xml
@@ -20,7 +20,7 @@
- /controls/oxygen/crewOxyPB eq 1
+ /controls/oxygen/cockpit-oxygen-supply-pb eq 1
/systems/electrical/bus/dc-ess-shed ge 25
@@ -287,19 +287,43 @@
-
+
- Door actuators AC ESS SHED 801PP
- Pressure switch for 14K feet powered by 401PP (DC ESS)
- Reset + taped msg + sys on light powred by 401PP
+
+
+
+ /systems/oxygen/passenger-oxygen/pressure-switch eq 1
+ /controls/oxygen/passenger-mask-deploy-man eq 1
+
+
- Regulators: below 10k zero flow
- -->
+
+
+
+ /systems/oxygen/passenger-oxygen/masks-deploy-cmd eq 1
+ /systems/electrical/bus/ac-ess-shed ge 110
+
+
+
+
+
+
+ /controls/oxygen/passenger-mask-reset eq 1
+ /systems/electrical/bus/dc-ess lt 25
+
+
+ /systems/oxygen/passenger-oxygen/masks-deploy-cmd eq 1
+ /systems/electrical/bus/dc-ess ge 25
+
+
+