Cargo smoke test

Models/Instruments/OHpanel/OHpanel.xml

@@ -281,6 +281,10 @@
 					<property>/systems/fire/cargo/disch</property>
 					<value>1</value>
 				</equals>
+				<equals>
+					<property>/systems/fire/cargo/disch-test</property>
+					<value>1</value>
+				</equals>
 				<equals>
 					<property>controls/switches/annun-test</property>
 					<value>1</value>
@@ -298,6 +302,10 @@
 					<property>/systems/fire/cargo/disch</property>
 					<value>1</value>
 				</equals>
+				<equals>
+					<property>/systems/fire/cargo/disch-test</property>
+					<value>1</value>
+				</equals>
 				<equals>
 					<property>controls/switches/annun-test</property>
 					<value>1</value>
@@ -328,6 +336,19 @@
 				<command>nasal</command>
 				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
+			<mod-up>
+				<binding>
+					<condition>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-ess</property>
+							<value>25</value>
+						</greater-than-equals>
+					</condition>
+					<command>property-assign</command>
+					<property>controls/fire/cargo/test</property>
+					<value>0</value>
+				</binding>
+			</mod-up>
 		</action>
 	</animation>
 	

Nasal/ECAM/ECAM-logic.nas

@@ -734,33 +734,48 @@ var messages_priority_3 = func {
 		ECAM_controller.warningReset(athr_lim_1);
 	}
 	
-	if (cargoSmokeFwd.clearFlag == 0 and systems.fwdCargoFireWarn.getBoolValue() and (getprop("/ECAM/warning-phase") <= 3 or getprop("/ECAM/warning-phase") >= 9 or getprop("/ECAM/warning-phase") == 6)) {
+	if (!systems.cargoTestBtn.getBoolValue()) {
-		cargoSmokeFwd.active = 1;
+		if (cargoSmokeFwd.clearFlag == 0 and systems.fwdCargoFireWarn.getBoolValue() and (getprop("/ECAM/warning-phase") <= 3 or getprop("/ECAM/warning-phase") >= 9 or getprop("/ECAM/warning-phase") == 6)) {
-	} elsif (cargoSmokeFwd.clearFlag == 1) {
+			cargoSmokeFwd.active = 1;
-		ECAM_controller.warningReset(cargoSmokeFwd);
+		} elsif (cargoSmokeFwd.clearFlag == 1 or systems.cargoTestBtnOff.getBoolValue()) {
-		cargoSmokeFwd.hasSubmsg = 1;
+			ECAM_controller.warningReset(cargoSmokeFwd);
-	}
+			cargoSmokeFwd.hasSubmsg = 1;
-	
+		}
-	if (cargoSmokeFwdAgent.clearFlag == 0 and cargoSmokeFwd.active == 1 and !getprop("/systems/fire/cargo/disch")) {
+		
-		cargoSmokeFwdAgent.active = 1;
+		if (cargoSmokeFwdAgent.clearFlag == 0 and cargoSmokeFwd.active == 1 and !getprop("/systems/fire/cargo/disch")) {
-	} else {
+			cargoSmokeFwdAgent.active = 1;
-		ECAM_controller.warningReset(cargoSmokeFwdAgent);
+		} else {
-		cargoSmokeFwd.hasSubmsg = 0;
+			ECAM_controller.warningReset(cargoSmokeFwdAgent);
-	}
+			cargoSmokeFwd.hasSubmsg = 0;
+		}
 
-	if (cargoSmokeAft.clearFlag == 0 and systems.aftCargoFireWarn.getBoolValue() and (getprop("/ECAM/warning-phase") <= 3 or getprop("/ECAM/warning-phase") >= 9 or getprop("/ECAM/warning-phase") == 6)) {
+		if (cargoSmokeAft.clearFlag == 0 and systems.aftCargoFireWarn.getBoolValue() and (getprop("/ECAM/warning-phase") <= 3 or getprop("/ECAM/warning-phase") >= 9 or getprop("/ECAM/warning-phase") == 6)) {
-		cargoSmokeAft.active = 1;
+			cargoSmokeAft.active = 1;
-	} elsif (cargoSmokeAft.clearFlag == 1) {
+		} elsif (cargoSmokeAft.clearFlag == 1 or systems.cargoTestBtnOff.getBoolValue()) {
-		ECAM_controller.warningReset(cargoSmokeAft);
+			ECAM_controller.warningReset(cargoSmokeAft);
-		cargoSmokeAft.hasSubmsg = 1;
+			cargoSmokeAft.hasSubmsg = 1;
-	}
+			systems.cargoTestBtnOff.setBoolValue(0);
-	
+		}
-	if (cargoSmokeAftAgent.clearFlag == 0 and cargoSmokeAft.active == 1 and !getprop("/systems/fire/cargo/disch")) {
+		
-		cargoSmokeAftAgent.active = 1;
+		if (cargoSmokeAftAgent.clearFlag == 0 and cargoSmokeAft.active == 1 and !getprop("/systems/fire/cargo/disch")) {
+			cargoSmokeAftAgent.active = 1;
+		} else {
+			ECAM_controller.warningReset(cargoSmokeAftAgent);
+			cargoSmokeAft.hasSubmsg = 0;
+		}
 	} else {
-		ECAM_controller.warningReset(cargoSmokeAftAgent);
+		if (systems.aftCargoFireWarn.getBoolValue()) {
-		cargoSmokeAft.hasSubmsg = 0;
+			cargoSmokeFwd.active = 1;
-	}	
+			cargoSmokeFwdAgent.active = 1;
+			cargoSmokeAft.active = 1;
+			cargoSmokeAftAgent.active = 1;
+		} else {
+			ECAM_controller.warningReset(cargoSmokeFwd);
+			ECAM_controller.warningReset(cargoSmokeFwdAgent);
+			ECAM_controller.warningReset(cargoSmokeAft);
+			ECAM_controller.warningReset(cargoSmokeAftAgent);
+		}
+	}
 }
 
 var messages_priority_2 = func {

Nasal/fire.nas

@@ -7,6 +7,13 @@ var elapsedTime = props.globals.getNode("/sim/time/elapsed-sec");
 var apuTestBtn = props.globals.getNode("/controls/fire/apu-test-btn", 1);
 var testBtn = props.globals.getNode("/controls/fire/test-btn-1", 1);
 var testBtn2 = props.globals.getNode("/controls/fire/test-btn-2", 1);
+var dischTest = props.globals.initNode("/systems/fire/cargo/disch-test", 0, "BOOL");
+var cargoTestBtn = props.globals.initNode("/controls/fire/cargo/test", 0, "BOOL");
+var cargoTestTime = props.globals.initNode("/controls/fire/cargo/test-time", 0, "DOUBLE");
+var cargoTestTime2 = props.globals.initNode("/controls/fire/cargo/test-time2", 0, "DOUBLE");
+var cargoTestTime3 = props.globals.initNode("/controls/fire/cargo/test-time3", 0, "DOUBLE");
+var cargoTestTime4 = props.globals.initNode("/controls/fire/cargo/test-time4", 0, "DOUBLE");
+var cargoTestBtnOff = props.globals.initNode("/controls/fire/cargo/test-off", 0, "BOOL");
 var eng1FireWarn = props.globals.initNode("/systems/fire/engine1/warning-active", 0, "BOOL");
 var eng2FireWarn = props.globals.initNode("/systems/fire/engine2/warning-active", 0, "BOOL");
 var apuFireWarn = props.globals.initNode("/systems/fire/apu/warning-active", 0, "BOOL");
@@ -259,7 +266,6 @@ var cargoDetectorLoop = {
 		return cdL;
 	},
 	updateTemp: func(system, typeLoop) {
-		print(me.temperature.getValue() ~ " " ~ me.fireProp.getBoolValue());
 		
 		if (me.temperature.getValue() > 250 and me.fireProp.getBoolValue()) {
 			me.sendSignal(system, typeLoop);
@@ -282,9 +288,9 @@ var extinguisherBottle = {
 	failProp: "",
 	warningProp: "",
 	hack: 0,
-	new: func(number, lightProp, elecProp, failProp, warningProp, hack = 0) {
+	new: func(number, lightProp, elecProp, failProp, warningProp, quantity = 100, hack = 0) {
 		var eB = {parents:[extinguisherBottle]};
-		eB.quantity = 100;
+		eB.quantity = quantity;
 		eB.squib = 0;
 		eB.number = number;
 		eB.lightProp = props.globals.getNode(lightProp, 1);
@@ -327,18 +333,22 @@ var extinguisherBottle = {
 					}, rand() * 3);
 				}
 			} elsif (me.number == 7) {
-				if (rand() <= 0.999) {
+				if (rand() <= 0.95) {
 					settimer(func() {
 						me.failProp.setValue(0);
-						me.warningProp.setValue(0);
+						if (rand() <= 0.20) {
+							me.warningProp.setValue(0); # extinguishing agent detected as smoke, so warning likely to stay on
+						}
 					}, rand() * 3);
 					cargoExtinguisherBottles.vector[0].hack == 1;
 				}
 			} elsif (me.number == 8) {
-				if (rand() <= 0.999) {
+				if (rand() <= 0.95) {
 					settimer(func() {
 						me.failProp.setValue(0);
-						me.warningProp.setValue(0);
+						if (rand() <= 0.20) {
+							me.warningProp.setValue(0);
+						}
 					}, rand() * 3);
 					cargoExtinguisherBottles.vector[1].hack == 1;
 				}
@@ -454,7 +464,7 @@ extinguisherBottle.new(0, "/systems/fire/engine2/disch1", "/systems/electrical/b
 extinguisherBottle.new(9, "/systems/fire/apu/disch", "/systems/electrical/bus/dcbat", "/systems/failures/apu-fire", "/systems/fire/apu/warning-active") ]);
 
 # There is only one bottle but the system will think there are two, so other parts work
-var cargoExtinguisherBottles = std.Vector.new([extinguisherBottle.new(8, "/systems/fire/cargo/disch", "/systems/electrical/bus/dcbat", "/systems/failures/cargo-aft-fire", "/systems/fire/cargo/aft/warning-active"), extinguisherBottle.new(7, "/systems/fire/cargo/disch", "/systems/electrical/bus/dcbat", "/systems/failures/cargo-fwd-fire", "/systems/fire/cargo/fwd/warning-active")]);
+var cargoExtinguisherBottles = std.Vector.new([extinguisherBottle.new(8, "/systems/fire/cargo/disch", "/systems/electrical/bus/dcbat", "/systems/failures/cargo-aft-fire", "/systems/fire/cargo/aft/warning-active", 250), extinguisherBottle.new(7, "/systems/fire/cargo/disch", "/systems/electrical/bus/dcbat", "/systems/failures/cargo-fwd-fire", "/systems/fire/cargo/fwd/warning-active", 250)]);
 
 # Create CIDS channels
 var CIDSchannels = std.Vector.new([CIDSchannel.new("/systems/electrical/bus/dc-ess"), CIDSchannel.new("/systems/electrical/bus/dc2")]);
@@ -617,16 +627,101 @@ setlistener("/controls/fire/test-btn-2", func() {
 
 setlistener("/controls/fire/apu-test-btn", func() {
 	if (getprop("/systems/failures/apu-fire")) { return; }
-	if (apuTestBtn.getValue() == 1) {
+	if (cargoTestBtn.getValue() == 1) {
 		if (dcbatNode.getValue() > 25 or dcessNode.getValue() > 25) {
-			apuFireWarn.setBoolValue(1);
+			fwdCargoFireWarn.setBoolValue(1);
+			aftCargoFireWarn.setBoolValue(1);
 		}
 	} else {
-		apuFireWarn.setBoolValue(0);
+		fwdCargoFireWarn.setBoolValue(0);
+		aftCargoFireWarn.setBoolValue(0);
 		ecam.shutUpYou();
 	}
 }, 0, 0);
 
+setlistener("/controls/fire/cargo/test", func() {
+	if (getprop("/systems/failures/aft-cargo-fire") or getprop("/systems/failures/fwd-cargo-fire") or dcbatNode.getValue() < 25 or dcessNode.getValue() < 25) { return; }
+	if (cargoTestBtn.getBoolValue()) {
+		cargoTestTime.setValue(elapsedTime.getValue());
+		cargoTestChecker.start();
+	} else {
+		aftCargoFireWarn.setBoolValue(0);
+		fwdCargoFireWarn.setBoolValue(0);
+		dischTest.setBoolValue(0);
+		ecam.shutUpYou();
+		cargoTestBtnOff.setBoolValue(1);
+	}
+}, 0, 0);
+
+var doCargoTest = func() {
+	if (dcbatNode.getValue() >= 25 or dcessNode.getValue() >= 25) {
+		aftCargoFireWarn.setBoolValue(1);
+		fwdCargoFireWarn.setBoolValue(1);
+		cargoTestTime2.setValue(elapsedTime.getValue());
+		cargoTestChecker2.start();
+	}
+}
+
+var doCargoTest2 = func() {
+	aftCargoFireWarn.setBoolValue(0);
+	fwdCargoFireWarn.setBoolValue(0);
+	ecam.shutUpYou();
+	cargoTestTime3.setValue(elapsedTime.getValue());
+	dischTest.setBoolValue(1);
+	cargoTestChecker3.start();
+}
+
+var doCargoTest3 = func() {
+	dischTest.setBoolValue(0);
+	if (dcbatNode.getValue() >= 25 or dcessNode.getValue() >= 25) {
+		aftCargoFireWarn.setBoolValue(1);
+		fwdCargoFireWarn.setBoolValue(1);
+		cargoTestTime4.setValue(elapsedTime.getValue());
+		cargoTestChecker4.start();
+	}
+}
+
+var doCargoTest4 = func() {
+	aftCargoFireWarn.setBoolValue(0);
+	fwdCargoFireWarn.setBoolValue(0);
+}
+
+var cargoTestCheckerFunc = func() {
+	if (!cargoTestBtn.getBoolValue()) {
+		cargoTestChecker.stop();
+	} elsif  (elapsedTime.getValue() > (cargoTestTime.getValue() + 3)) {
+		doCargoTest();
+		cargoTestChecker.stop();
+	}
+}
+
+var cargoTestCheckerFunc2 = func() {
+	if (!cargoTestBtn.getBoolValue()) {
+		cargoTestChecker2.stop();
+	} elsif  (elapsedTime.getValue() > (cargoTestTime2.getValue() + 3)) {
+		doCargoTest2();
+		cargoTestChecker2.stop();
+	}
+}
+
+var cargoTestCheckerFunc3 = func() {
+	if (!cargoTestBtn.getBoolValue()) {
+		cargoTestChecker3.stop();
+	} elsif  (elapsedTime.getValue() > (cargoTestTime3.getValue() + 3)) {
+		doCargoTest3();
+		cargoTestChecker3.stop();
+	}
+}
+
+var cargoTestCheckerFunc4 = func() {
+	if (!cargoTestBtn.getBoolValue()) {
+		cargoTestChecker4.stop();
+	} elsif  (elapsedTime.getValue() > (cargoTestTime4.getValue() + 3)) {
+		doCargoTest4();
+		cargoTestChecker4.stop();
+	}
+}
+
 createFireBottleListener("/controls/engines/engine[0]/agent1-btn", "/controls/engines/engine[0]/fire-btn", 0);
 createFireBottleListener("/controls/engines/engine[0]/agent2-btn", "/controls/engines/engine[0]/fire-btn", 1);
 createFireBottleListener("/controls/engines/engine[1]/agent1-btn", "/controls/engines/engine[1]/fire-btn", 2);
@@ -658,4 +753,8 @@ var eng1AgentTimerMakeTimer = maketimer(0.1, eng1AgentTimerMakeTimerFunc);
 var eng2AgentTimerMakeTimer = maketimer(0.1, eng2AgentTimerMakeTimerFunc);
 var eng1Agent2TimerMakeTimer = maketimer(0.1, eng1Agent2TimerMakeTimerFunc);
 var eng2Agent2TimerMakeTimer = maketimer(0.1, eng2Agent2TimerMakeTimerFunc);
-var apuAgentTimerMakeTimer = maketimer(0.1, apuAgentTimerMakeTimerFunc);
+var apuAgentTimerMakeTimer = maketimer(0.1, apuAgentTimerMakeTimerFunc);
+var cargoTestChecker = maketimer(0.1, cargoTestCheckerFunc);
+var cargoTestChecker2 = maketimer(0.2, cargoTestCheckerFunc2);
+var cargoTestChecker3 = maketimer(0.2, cargoTestCheckerFunc3);
+var cargoTestChecker4 = maketimer(0.2, cargoTestCheckerFunc4);