Update warning for engine fire on ground to conform to new FWC standard

Nasal/ECAM/ECAM-logic.nas

@@ -15,8 +15,6 @@ var state2Node = props.globals.getNode("/engines/engine[1]/state", 1);
 var wing_pb    = props.globals.getNode("/controls/ice-protection/wing", 1);
 var apu_bleedSw   = props.globals.getNode("/controls/pneumatics/switches/apu", 1);
 var gear       = props.globals.getNode("/gear/gear-pos-norm", 1);
-var cutoff1    = props.globals.getNode("/controls/engines/engine[0]/cutoff-switch", 1);
-var cutoff2    = props.globals.getNode("/controls/engines/engine[1]/cutoff-switch", 1);
 var stallVoice = props.globals.initNode("/sim/sound/warnings/stall-voice", 0, "BOOL");
 var engOpt     = props.globals.getNode("/options/eng", 1);
 
@@ -218,7 +216,7 @@ var messages_priority_3 = func {
 			ECAM_controller.warningReset(dualFailfinalspeed);
 		}
 		
-		if (dualFailmasteroff.clearFlag == 0 and (!cutoff1.getBoolValue() or !cutoff2.getBoolValue())) {
+		if (dualFailmasteroff.clearFlag == 0 and (!pts.Controls.Engines.Engine.cutoffSw[0].getValue() or !pts.Controls.Engines.Engine.cutoffSw[1].getValue())) {
 			dualFailmasteroff.active = 1;
 		} else {
 			ECAM_controller.warningReset(dualFailmasteroff);
@@ -299,13 +297,13 @@ var messages_priority_3 = func {
 	}
 	
 	# ENG FIRE
-	if ((eng1FireFlAgent2.clearFlag == 0 and getprop("/systems/fire/engine1/warning-active") == 1 and phaseVar3 >= 5 and phaseVar3 <= 7) or (eng1FireGnevacBat.clearFlag == 0 and getprop("/systems/fire/engine1/warning-active") == 1 and (phaseVar3 < 5 or phaseVar3 > 7))) {
+	if ((eng1FireFlAgent2.clearFlag == 0 and getprop("/systems/fire/engine1/warning-active") == 1 and phaseVar3 >= 5 and phaseVar3 <= 7) or (eng1FireGnEvac.clearFlag == 0 and getprop("/systems/fire/engine1/warning-active") == 1 and (phaseVar3 < 5 or phaseVar3 > 7))) {
 		eng1Fire.active = 1;
 	} else {
 		ECAM_controller.warningReset(eng1Fire);
 	}
 	
-	if ((eng2FireFlAgent2.clearFlag == 0 and getprop("/systems/fire/engine2/warning-active") == 1 and phaseVar3 >= 5 and phaseVar3 <= 7) or (eng2FireGnevacBat.clearFlag == 0 and getprop("/systems/fire/engine2/warning-active") == 1 and (phaseVar3 < 5 or phaseVar3 > 7))) {
+	if ((eng2FireFlAgent2.clearFlag == 0 and getprop("/systems/fire/engine2/warning-active") == 1 and phaseVar3 >= 5 and phaseVar3 <= 7) or (eng2FireGnEvac.clearFlag == 0 and getprop("/systems/fire/engine2/warning-active") == 1 and (phaseVar3 < 5 or phaseVar3 > 7))) {
 		eng2Fire.active = 1;
 	} else {
 		ECAM_controller.warningReset(eng2Fire);
@@ -325,7 +323,7 @@ var messages_priority_3 = func {
 				ECAM_controller.warningReset(eng1FireFllever);
 			}
 			
-			if (eng1FireFlmaster.clearFlag == 0 and getprop("/controls/engines/engine[0]/cutoff-switch") == 0) {
+			if (eng1FireFlmaster.clearFlag == 0 and pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 0) {
 				eng1FireFlmaster.active = 1;
 			} else {
 				ECAM_controller.warningReset(eng1FireFlmaster);
@@ -399,7 +397,19 @@ var messages_priority_3 = func {
 				ECAM_controller.warningReset(eng1FireGnparkbrk);
 			}
 			
-			if (eng1FireGnmaster.clearFlag == 0 and getprop("/controls/engines/engine[0]/cutoff-switch") == 0) {
+			if (eng1FireGnATC.clearFlag == 0) {
+				eng1FireGnATC.active = 1;
+			} else {
+				ECAM_controller.warningReset(eng1FireGnATC);
+			}
+			
+			if (eng1FireGncrew.clearFlag == 0) {
+				eng1FireGncrew.active = 1;
+			} else {
+				ECAM_controller.warningReset(eng1FireGncrew);
+			}
+			
+			if (eng1FireGnmaster.clearFlag == 0 and pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 0) {
 				eng1FireGnmaster.active = 1;
 			} else {
 				ECAM_controller.warningReset(eng1FireGnmaster);
@@ -423,58 +433,22 @@ var messages_priority_3 = func {
 				ECAM_controller.warningReset(eng1FireGnAgent2);
 			}
 			
-			if (eng1FireGnmaster2.clearFlag == 0 and getprop("/controls/engines/engine[1]/cutoff-switch") == 0) {
+			if (eng1FireGnEvac.clearFlag == 0) {
-				eng1FireGnmaster2.active = 1;
+				eng1FireGnEvac.active = 1;
 			} else {
-				ECAM_controller.warningReset(eng1FireGnmaster2);
+				ECAM_controller.warningReset(eng1FireGnEvac);
-			}
-			
-			if (eng1FireGnATC.clearFlag == 0) {
-				eng1FireGnATC.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng1FireGnATC);
-			}
-			
-			if (eng1FireGncrew.clearFlag == 0) {
-				eng1FireGncrew.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng1FireGncrew);
-			}
-			
-			if (eng1FireGnevacSw.clearFlag == 0) {
-				eng1FireGnevac.active = 1;
-				eng1FireGnevacSw.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng1FireGnevac);
-				ECAM_controller.warningReset(eng1FireGnevacSw);
-			}
-			
-			if (eng1FireGnevacApu.clearFlag == 0 and systems.APUNodes.Controls.master.getBoolValue() and pts.APU.rpm.getValue() > 99) {
-				eng1FireGnevacApu.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng1FireGnevacApu);
-			}
-			
-			if (eng1FireGnevacBat.clearFlag == 0 and (systems.ELEC.Switch.bat1.getValue() or systems.ELEC.Switch.bat2.getValue())) {
-				eng1FireGnevacBat.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng1FireGnevacBat);
 			}
 		} else {
 			ECAM_controller.warningReset(eng1FireGnlever);
 			ECAM_controller.warningReset(eng1FireGnstopped);
 			ECAM_controller.warningReset(eng1FireGnparkbrk);
+			ECAM_controller.warningReset(eng1FireGnATC);
+			ECAM_controller.warningReset(eng1FireGncrew);
 			ECAM_controller.warningReset(eng1FireGnmaster);
 			ECAM_controller.warningReset(eng1FireGnPB);
 			ECAM_controller.warningReset(eng1FireGnAgent1);
 			ECAM_controller.warningReset(eng1FireGnAgent2);
-			ECAM_controller.warningReset(eng1FireGnmaster2);
+			ECAM_controller.warningReset(eng1FireGnEvac);
-			ECAM_controller.warningReset(eng1FireGnATC);
-			ECAM_controller.warningReset(eng1FireGncrew);
-			ECAM_controller.warningReset(eng1FireGnevac);
-			ECAM_controller.warningReset(eng1FireGnevacSw);
-			ECAM_controller.warningReset(eng1FireGnevacApu);
-			ECAM_controller.warningReset(eng1FireGnevacBat);
 		}
 	} else {
 		ECAM_controller.warningReset(eng1FireFllever);
@@ -487,17 +461,13 @@ var messages_priority_3 = func {
 		ECAM_controller.warningReset(eng1FireGnlever);
 		ECAM_controller.warningReset(eng1FireGnstopped);
 		ECAM_controller.warningReset(eng1FireGnparkbrk);
+		ECAM_controller.warningReset(eng1FireGnATC);
+		ECAM_controller.warningReset(eng1FireGncrew);
 		ECAM_controller.warningReset(eng1FireGnmaster);
 		ECAM_controller.warningReset(eng1FireGnPB);
 		ECAM_controller.warningReset(eng1FireGnAgent1);
 		ECAM_controller.warningReset(eng1FireGnAgent2);
-		ECAM_controller.warningReset(eng1FireGnmaster2);
+		ECAM_controller.warningReset(eng1FireGnEvac);
-		ECAM_controller.warningReset(eng1FireGnATC);
-		ECAM_controller.warningReset(eng1FireGncrew);
-		ECAM_controller.warningReset(eng1FireGnevac);
-		ECAM_controller.warningReset(eng1FireGnevacSw);
-		ECAM_controller.warningReset(eng1FireGnevacApu);
-		ECAM_controller.warningReset(eng1FireGnevacBat);
 	}
 	
 	if (eng2Fire.active == 1) {
@@ -508,7 +478,7 @@ var messages_priority_3 = func {
 				ECAM_controller.warningReset(eng2FireFllever);
 			}
 			
-			if (eng2FireFlmaster.clearFlag == 0 and getprop("/controls/engines/engine[1]/cutoff-switch") == 0) {
+			if (eng2FireFlmaster.clearFlag == 0 and pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 0) {
 				eng2FireFlmaster.active = 1;
 			} else {
 				ECAM_controller.warningReset(eng2FireFlmaster);
@@ -582,7 +552,19 @@ var messages_priority_3 = func {
 				ECAM_controller.warningReset(eng2FireGnparkbrk);
 			}
 			
-			if (eng2FireGnmaster.clearFlag == 0 and getprop("/controls/engines/engine[1]/cutoff-switch") == 0) {
+			if (eng2FireGnATC.clearFlag == 0) {
+				eng2FireGnATC.active = 1;
+			} else {
+				ECAM_controller.warningReset(eng2FireGnATC);
+			}
+			
+			if (eng2FireGncrew.clearFlag == 0) {
+				eng2FireGncrew.active = 1;
+			} else {
+				ECAM_controller.warningReset(eng2FireGncrew);
+			}
+			
+			if (eng2FireGnmaster.clearFlag == 0 and pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 0) {
 				eng2FireGnmaster.active = 1;
 			} else {
 				ECAM_controller.warningReset(eng2FireGnmaster);
@@ -606,58 +588,22 @@ var messages_priority_3 = func {
 				ECAM_controller.warningReset(eng2FireGnAgent2);
 			}
 			
-			if (eng2FireGnmaster2.clearFlag == 0 and getprop("/controls/engines/engine[0]/cutoff-switch") == 0) {
+			if (eng2FireGnEvac.clearFlag == 0) {
-				eng2FireGnmaster2.active = 1;
+				eng2FireGnEvac.active = 1;
 			} else {
-				ECAM_controller.warningReset(eng2FireGnmaster2);
+				ECAM_controller.warningReset(eng2FireGnEvac);
-			}
-			
-			if (eng2FireGnATC.clearFlag == 0) {
-				eng2FireGnATC.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng2FireGnATC);
-			}
-			
-			if (eng2FireGncrew.clearFlag == 0) {
-				eng2FireGncrew.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng2FireGncrew);
-			}
-			
-			if (eng2FireGnevacSw.clearFlag == 0) {
-				eng2FireGnevac.active = 1;
-				eng2FireGnevacSw.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng2FireGnevac);
-				ECAM_controller.warningReset(eng2FireGnevacSw);
-			}
-			
-			if (eng2FireGnevacApu.clearFlag == 0 and systems.APUNodes.Controls.master.getBoolValue() and pts.APU.rpm.getValue() > 99) {
-				eng2FireGnevacApu.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng2FireGnevacApu);
-			}
-			
-			if (eng2FireGnevacBat.clearFlag == 0 and (systems.ELEC.Switch.bat1.getValue() or systems.ELEC.Switch.bat2.getValue())) {
-				eng2FireGnevacBat.active = 1;
-			} else {
-				ECAM_controller.warningReset(eng2FireGnevacBat);
 			}
 		} else {
 			ECAM_controller.warningReset(eng2FireGnlever);
 			ECAM_controller.warningReset(eng2FireGnstopped);
 			ECAM_controller.warningReset(eng2FireGnparkbrk);
+			ECAM_controller.warningReset(eng2FireGnATC);
+			ECAM_controller.warningReset(eng2FireGncrew);
 			ECAM_controller.warningReset(eng2FireGnmaster);
 			ECAM_controller.warningReset(eng2FireGnPB);
 			ECAM_controller.warningReset(eng2FireGnAgent1);
 			ECAM_controller.warningReset(eng2FireGnAgent2);
-			ECAM_controller.warningReset(eng2FireGnmaster2);
+			ECAM_controller.warningReset(eng2FireGnEvac);
-			ECAM_controller.warningReset(eng2FireGnATC);
-			ECAM_controller.warningReset(eng2FireGncrew);
-			ECAM_controller.warningReset(eng2FireGnevac);
-			ECAM_controller.warningReset(eng2FireGnevacSw);
-			ECAM_controller.warningReset(eng2FireGnevacApu);
-			ECAM_controller.warningReset(eng2FireGnevacBat);
 		}
 	} else {
 		ECAM_controller.warningReset(eng2FireFllever);
@@ -670,17 +616,13 @@ var messages_priority_3 = func {
 		ECAM_controller.warningReset(eng2FireGnlever);
 		ECAM_controller.warningReset(eng2FireGnstopped);
 		ECAM_controller.warningReset(eng2FireGnparkbrk);
+		ECAM_controller.warningReset(eng2FireGnATC);
+		ECAM_controller.warningReset(eng2FireGncrew);
 		ECAM_controller.warningReset(eng2FireGnmaster);
 		ECAM_controller.warningReset(eng2FireGnPB);
 		ECAM_controller.warningReset(eng2FireGnAgent1);
 		ECAM_controller.warningReset(eng2FireGnAgent2);
-		ECAM_controller.warningReset(eng2FireGnmaster2);
+		ECAM_controller.warningReset(eng2FireGnEvac);
-		ECAM_controller.warningReset(eng2FireGnATC);
-		ECAM_controller.warningReset(eng2FireGncrew);
-		ECAM_controller.warningReset(eng2FireGnevac);
-		ECAM_controller.warningReset(eng2FireGnevacSw);
-		ECAM_controller.warningReset(eng2FireGnevacApu);
-		ECAM_controller.warningReset(eng2FireGnevacBat);
 	}
 	
 	# APU Fire

Nasal/ECAM/ECAM-messages.nas

@@ -71,17 +71,13 @@ var warnings				  = std.Vector.new([
 	var eng1FireGnlever       = warning.new(msg: " -THR LEVERS........IDLE",  colour: "c"),
 	var eng1FireGnstopped     = warning.new(msg: "  •WHEN A/C IS STOPPED:",   colour: "w", isMainMsg: 1),
 	var eng1FireGnparkbrk     = warning.new(msg: " -PARKING BRK.........ON",  colour: "c"),
+	var eng1FireGnATC         = warning.new(msg: " -ATC.............NOTIFY",  colour: "c"),
+	var eng1FireGncrew        = warning.new(msg: " -CABIN CREW.......ALERT",  colour: "c"),
 	var eng1FireGnmaster      = warning.new(msg: " -ENG MASTER 1.......OFF",  colour: "c"),
 	var eng1FireGnPB          = warning.new(msg: " -ENG 1 FIRE P/B....PUSH",  colour: "c"),
 	var eng1FireGnAgent1      = warning.new(msg: " -AGENT 1..........DISCH",  colour: "c"),
 	var eng1FireGnAgent2      = warning.new(msg: " -AGENT 2..........DISCH",  colour: "c"),
-	var eng1FireGnmaster2     = warning.new(msg: " -ENG MASTER 2.......OFF",  colour: "c"),
+	var eng1FireGnEvac        = warning.new(msg: " -EMER EVAC PROC...APPLY",  colour: "c"),
-	var eng1FireGnATC         = warning.new(msg: " -ATC.............NOTIFY",  colour: "c"),
-	var eng1FireGncrew        = warning.new(msg: " -CABIN CREW.......ALERT",  colour: "c"),
-	var eng1FireGnevac        = warning.new(msg: "    •IF EVAC RQRD:",        colour: "w", isMainMsg: 1),
-	var eng1FireGnevacSw      = warning.new(msg: " -EVAC COMMAND........ON",  colour: "c"),
-	var eng1FireGnevacApu     = warning.new(msg: " -APU MASTER SW......OFF",  colour: "c"),
-	var eng1FireGnevacBat     = warning.new(msg: " -BAT 1+2............OFF",  colour: "c"),
 	
 	# ENG 2 FIRE (flight)
 	var eng2Fire              = warning.new(msg: "ENG 2 FIRE",                colour: "r", aural: 0, light: 0, isMainMsg: 1),
@@ -98,17 +94,13 @@ var warnings				  = std.Vector.new([
 	var eng2FireGnlever       = warning.new(msg: " -THR LEVERS........IDLE",  colour: "c"),
 	var eng2FireGnstopped     = warning.new(msg: "  •WHEN A/C IS STOPPED:",   colour: "w", isMainMsg: 1),
 	var eng2FireGnparkbrk     = warning.new(msg: " -PARKING BRK.........ON",  colour: "c"),
+	var eng2FireGnATC         = warning.new(msg: " -ATC.............NOTIFY",  colour: "c"),
+	var eng2FireGncrew        = warning.new(msg: " -CABIN CREW.......ALERT",  colour: "c"),
 	var eng2FireGnmaster      = warning.new(msg: " -ENG MASTER 2.......OFF",  colour: "c"),
 	var eng2FireGnPB          = warning.new(msg: " -ENG 2 FIRE P/B....PUSH",  colour: "c"),
 	var eng2FireGnAgent1      = warning.new(msg: " -AGENT 1..........DISCH",  colour: "c"),
 	var eng2FireGnAgent2      = warning.new(msg: " -AGENT 2..........DISCH",  colour: "c"),
-	var eng2FireGnmaster2     = warning.new(msg: " -ENG MASTER 1.......OFF",  colour: "c"),
+	var eng2FireGnEvac        = warning.new(msg: " -EMER EVAC PROC...APPLY",  colour: "c"),
-	var eng2FireGnATC         = warning.new(msg: " -ATC.............NOTIFY",  colour: "c"),
-	var eng2FireGncrew        = warning.new(msg: " -CABIN CREW.......ALERT",  colour: "c"),
-	var eng2FireGnevac        = warning.new(msg: "    •IF EVAC RQRD:",        colour: "w", isMainMsg: 1),
-	var eng2FireGnevacSw      = warning.new(msg: " -EVAC COMMAND........ON",  colour: "c"),
-	var eng2FireGnevacApu     = warning.new(msg: " -APU MASTER SW......OFF",  colour: "c"),
-	var eng2FireGnevacBat     = warning.new(msg: " -BAT 1+2............OFF",  colour: "c"),
 	
 	# APU FIRE
 	var apuFire               = warning.new(msg: "APU FIRE                ",  colour: "r", aural: 0, light: 0, isMainMsg: 1, sdPage: "apu"),

Nasal/Systems/FADEC/engines-cfm.nas

@@ -25,7 +25,7 @@ var eng_init = func {
 
 # Trigger Startups and Stops
 setlistener("/controls/engines/engine[0]/cutoff-switch", func {
-	if (getprop("/controls/engines/engine[0]/cutoff-switch") == 0) {
+	if (pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 0) {
 		if (getprop("/systems/acconfig/autoconfig-running") == 1) {
 			fast_start_one();
 		} else {
@@ -35,7 +35,7 @@ setlistener("/controls/engines/engine[0]/cutoff-switch", func {
 				eng_one_man_start.start();
 			}
 		}
-	} else if (getprop("/controls/engines/engine[0]/cutoff-switch") == 1) {
+	} else if (pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 1) {
 		cutoff_one();
 	}
 });
@@ -75,7 +75,7 @@ setlistener("/controls/engines/engine[0]/man-start", func {
 
 var start_one_mancheck = func {
 	if (getprop("/controls/engines/engine[0]/man-start") == 1) {
-		if (getprop("/controls/engines/engine-start-switch") == 2 and (getprop("/controls/engines/engine[0]/cutoff-switch") == 1)) {
+		if (getprop("/controls/engines/engine-start-switch") == 2 and (pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 1)) {
 			setprop("/systems/pneumatics/valves/starter-valve-1", 1);
 			settimer(start_one_mancheck_b, 0.5);
 		}
@@ -96,20 +96,20 @@ var start_one_mancheck_b = func {
 }
 
 var start_one_check = func {
-	if (getprop("/controls/engines/engine-start-switch") == 2 and getprop("/controls/engines/engine[0]/cutoff-switch") == 0) {
+	if (getprop("/controls/engines/engine-start-switch") == 2 and pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 0) {
 		setprop("/systems/pneumatics/valves/starter-valve-1", 1);
 		settimer(start_one_check_b, 0.5);
 	}
 }
 
 var start_one_check_b = func {
-	if (getprop("/controls/engines/engine-start-switch") == 2 and systems.PNEU.Psi.engine1.getValue() and !getprop("/controls/engines/engine[0]/cutoff-switch")) {
+	if (getprop("/controls/engines/engine-start-switch") == 2 and systems.PNEU.Psi.engine1.getValue() and !pts.Controls.Engines.Engine.cutoffSw[0].getValue()) {
 		auto_start_one();
 	}
 }
 
 setlistener("/controls/engines/engine[1]/cutoff-switch", func {
-	if (getprop("/controls/engines/engine[1]/cutoff-switch") == 0) {
+	if (pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 0) {
 		if (getprop("/systems/acconfig/autoconfig-running") == 1) {
 			fast_start_two();
 		} else {
@@ -119,7 +119,7 @@ setlistener("/controls/engines/engine[1]/cutoff-switch", func {
 				eng_two_man_start.start();
 			}
 		}
-	} else if (getprop("/controls/engines/engine[1]/cutoff-switch") == 1) {
+	} else if (pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 1) {
 		cutoff_two();
 	}
 });
@@ -158,7 +158,7 @@ setlistener("/controls/engines/engine[1]/man-start", func {
 
 var start_two_mancheck = func {
 	if (getprop("/controls/engines/engine[1]/man-start") == 1) {
-		if (getprop("/controls/engines/engine-start-switch") == 2 and (getprop("/controls/engines/engine[1]/cutoff-switch") == 1)) {
+		if (getprop("/controls/engines/engine-start-switch") == 2 and (pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 1)) {
 			setprop("/systems/pneumatics/valves/starter-valve-2", 1);
 			settimer(start_two_mancheck_b, 0.5);
 		}
@@ -179,14 +179,14 @@ var start_two_mancheck_b = func {
 }
 
 var start_two_check = func {
-	if (getprop("/controls/engines/engine-start-switch") == 2 and getprop("/controls/engines/engine[1]/cutoff-switch") == 0) {
+	if (getprop("/controls/engines/engine-start-switch") == 2 and pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 0) {
 		setprop("/systems/pneumatics/valves/starter-valve-2", 1);
 		settimer(start_two_check_b, 0.5);
 	}
 }
 
 var start_two_check_b = func {
-	if (getprop("/controls/engines/engine-start-switch") == 2 and systems.PNEU.Psi.engine2.getValue() >= 25 and !getprop("/controls/engines/engine[1]/cutoff-switch")) {
+	if (getprop("/controls/engines/engine-start-switch") == 2 and systems.PNEU.Psi.engine2.getValue() >= 25 and !pts.Controls.Engines.Engine.cutoffSw[1].getValue()) {
 		auto_start_two();
 	}
 }

Nasal/Systems/FADEC/engines-iae.nas

@@ -25,7 +25,7 @@ var eng_init = func {
 
 # Trigger Startups and Stops
 setlistener("/controls/engines/engine[0]/cutoff-switch", func {
-	if (getprop("/controls/engines/engine[0]/cutoff-switch") == 0) {
+	if (pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 0) {
 		if (getprop("/systems/acconfig/autoconfig-running") == 1) {
 			fast_start_one();
 		} else {
@@ -35,7 +35,7 @@ setlistener("/controls/engines/engine[0]/cutoff-switch", func {
 				eng_one_man_start.start();
 			}
 		}
-	} else if (getprop("/controls/engines/engine[0]/cutoff-switch") == 1) {
+	} else if (pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 1) {
 		cutoff_one();
 	}
 });
@@ -75,7 +75,7 @@ setlistener("/controls/engines/engine[0]/man-start", func {
 
 var start_one_mancheck = func {
 	if (getprop("/controls/engines/engine[0]/man-start") == 1) {
-		if (getprop("/controls/engines/engine-start-switch") == 2 and (getprop("/controls/engines/engine[0]/cutoff-switch") == 1)) {
+		if (getprop("/controls/engines/engine-start-switch") == 2 and (pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 1)) {
 			setprop("/systems/pneumatics/valves/starter-valve-1", 1);
 			settimer(start_one_mancheck_b, 0.5);
 		}
@@ -96,20 +96,20 @@ var start_one_mancheck_b = func {
 }
 
 var start_one_check = func {
-	if (getprop("/controls/engines/engine-start-switch") == 2 and getprop("/controls/engines/engine[0]/cutoff-switch") == 0) {
+	if (getprop("/controls/engines/engine-start-switch") == 2 and pts.Controls.Engines.Engine.cutoffSw[0].getValue() == 0) {
 		setprop("/systems/pneumatics/valves/starter-valve-1", 1);
 		settimer(start_one_check_b, 0.5);
 	}
 }
 
 var start_one_check_b = func {
-	if (getprop("/controls/engines/engine-start-switch") == 2 and systems.PNEU.Psi.engine1.getValue() and !getprop("/controls/engines/engine[0]/cutoff-switch")) {
+	if (getprop("/controls/engines/engine-start-switch") == 2 and systems.PNEU.Psi.engine1.getValue() and !pts.Controls.Engines.Engine.cutoffSw[0].getValue()) {
 		auto_start_one();
 	}
 }
 
 setlistener("/controls/engines/engine[1]/cutoff-switch", func {
-	if (getprop("/controls/engines/engine[1]/cutoff-switch") == 0) {
+	if (pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 0) {
 		if (getprop("/systems/acconfig/autoconfig-running") == 1) {
 			fast_start_two();
 		} else {
@@ -119,7 +119,7 @@ setlistener("/controls/engines/engine[1]/cutoff-switch", func {
 				eng_two_man_start.start();
 			}
 		}
-	} else if (getprop("/controls/engines/engine[1]/cutoff-switch") == 1) {
+	} else if (pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 1) {
 		cutoff_two();
 	}
 });
@@ -158,7 +158,7 @@ setlistener("/controls/engines/engine[1]/man-start", func {
 
 var start_two_mancheck = func {
 	if (getprop("/controls/engines/engine[1]/man-start") == 1) {
-		if (getprop("/controls/engines/engine-start-switch") == 2 and (getprop("/controls/engines/engine[1]/cutoff-switch") == 1)) {
+		if (getprop("/controls/engines/engine-start-switch") == 2 and (pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 1)) {
 			setprop("/systems/pneumatics/valves/starter-valve-2", 1);
 			settimer(start_two_mancheck_b, 0.5);
 		}
@@ -179,14 +179,14 @@ var start_two_mancheck_b = func {
 }
 
 var start_two_check = func {
-	if (getprop("/controls/engines/engine-start-switch") == 2 and getprop("/controls/engines/engine[1]/cutoff-switch") == 0) {
+	if (getprop("/controls/engines/engine-start-switch") == 2 and pts.Controls.Engines.Engine.cutoffSw[1].getValue() == 0) {
 		setprop("/systems/pneumatics/valves/starter-valve-2", 1);
 		settimer(start_two_check_b, 0.5);
 	}
 }
 
 var start_two_check_b = func {
-	if (getprop("/controls/engines/engine-start-switch") == 2 and systems.PNEU.Psi.engine2.getValue() >= 25 and !getprop("/controls/engines/engine[1]/cutoff-switch")) {
+	if (getprop("/controls/engines/engine-start-switch") == 2 and systems.PNEU.Psi.engine2.getValue() >= 25 and !pts.Controls.Engines.Engine.cutoffSw[1].getValue()) {
 		auto_start_two();
 	}
 }

Systems/a320-fwc.xml

@@ -1797,7 +1797,7 @@
 		
 		<switch name="/ECAM/warnings/logic/eng/eng-1-tla-abv-6-2">
 			<default value="0"/>
-			<test logic="OR" value="1">
+			<test logic="AND" value="1">
 				/controls/engines/engine[0]/throttle-lever ge 0.13333333333
 				/ECAM/phases/to-power-set eq 0
 			</test>
@@ -1850,7 +1850,7 @@
 		
 		<switch name="/ECAM/warnings/logic/eng/eng-2-tla-abv-6-2">
 			<default value="0"/>
-			<test logic="OR" value="1">
+			<test logic="AND" value="1">
 				/controls/engines/engine[1]/throttle-lever ge 0.13333333333
 				/ECAM/phases/to-power-set eq 0
 			</test>