Merge branch 'dev' into 3D

Models/Instruments/IESI/res/iesi.svg

@@ -12,7 +12,7 @@
    viewBox="0 0 1024 1024"
    version="1.1"
    id="svg2"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="iesi.svg">
   <metadata
      id="metadata375">
@@ -37,14 +37,14 @@
      guidetolerance="10"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="705"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview371"
      showgrid="true"
-     inkscape:zoom="0.90509668"
-     inkscape:cx="529.7525"
-     inkscape:cy="2142.6048"
-     inkscape:window-x="-8"
+     inkscape:zoom="0.45254834"
+     inkscape:cx="877.65465"
+     inkscape:cy="962.66623"
+     inkscape:window-x="1592"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:current-layer="IESI"
@@ -566,12 +566,12 @@
        y="138.78481"
        inkscape:label="#rect5809" />
     <rect
-       style="opacity:0.5;fill:#ff00ff;fill-opacity:1;stroke:#ff00ff;stroke-width:10.06530666;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+       style="opacity:0.5;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:10.06530666;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
        id="AI_bank_scale_clip"
-       width="653.14471"
-       height="226.44942"
-       x="169.67566"
-       y="138.67455"
+       width="663.21997"
+       height="229.7616"
+       x="164.6416"
+       y="138.67441"
        inkscape:label="#rect1094" />
     <rect
        style="opacity:0.46000001;fill:#ff00ff;fill-opacity:1;stroke:none;stroke-width:1.27696717;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"

Nasal/ECAM/ECAM-logic.nas

@@ -3433,7 +3433,7 @@ var messages_right_memo = func {
 		fltCtlLandAsap = 0;
 	}
 	
-	if (land_asap_r.active == 0 and !(FWC.Timer.gnd.getValue() == 1) and (warningNodes.Timers.lowLevelBoth.getValue() == 1 or warningNodes.Logic.eng1Shutdown.getValue() or warningNodes.Logic.eng2Shutdown.getValue() or warningNodes.Logic.eng1Fail.getValue() or warningNodes.Logic.eng2Fail.getValue() or warningNodes.Timers.dcEmerConfig.getValue() == 1 or fltCtlLandAsap)) {
+	if (land_asap_r.active == 0 and !(FWC.Timer.gnd.getValue() == 1) and (warningNodes.Timers.lowLevelBoth.getValue() == 1 or warningNodes.Logic.eng1Shutdown.getValue() or warningNodes.Logic.eng2Shutdown.getValue() or warningNodes.Logic.eng1FailFlipflop.getValue() or warningNodes.Logic.eng2FailFlipflop.getValue() or warningNodes.Timers.dcEmerConfig.getValue() == 1 or fltCtlLandAsap)) {
 		# todo avionics smoke and reverse unlocked
 		land_asap_a.active = 1;
 	} else {

Nasal/ECAM/ECAM-nodes.nas

@@ -140,6 +140,8 @@ var warningNodes = {
 		revSet: props.globals.initNode("/ECAM/warnings/logic/eng/reverse-set"),
 		eng1Fail: props.globals.initNode("/ECAM/warnings/logic/eng/eng-1-fail"),
 		eng2Fail: props.globals.initNode("/ECAM/warnings/logic/eng/eng-2-fail"),
+		eng1FailFlipflop: props.globals.initNode("/ECAM/warnings/logic/eng/eng-1-fail-output"),
+		eng2FailFlipflop: props.globals.initNode("/ECAM/warnings/logic/eng/eng-2-fail-output"),
 		phase5Trans: props.globals.initNode("/ECAM/warnings/logic/eng/phase-5-output"),
 		eng1Shutdown: props.globals.initNode("/ECAM/warnings/logic/eng/eng-1-shutdown"),
 		eng2Shutdown: props.globals.initNode("/ECAM/warnings/logic/eng/eng-2-shutdown"),

Nasal/QRH/QRH.nas

@@ -37,7 +37,7 @@ var createCanvasQRH = func() {
 	qrhCanvas.setLayout(myHBox);
 
 	QRH = canvas.gui.widgets.Label.new(root, canvas.style, {} )
-		.setImage(resolvepath("Aircraft/A320-family/Models/FlightDeck/QRH/" ~ QRHpageNo.getValue() ~ ".jpeg"))
+		.setImage(resolvepath("Aircraft/A320-family/Models/FlightDeck/QRH/" ~ QRHpageNo.getValue() ~ ".jpg"))
 		.move(0,-25)
 		.setSize(400,625);
 	myHBox.addItem(QRH);
@@ -78,11 +78,11 @@ var createCanvasQRH = func() {
 	});
 	buttonPrev.listen("clicked", func {
 		prevPage();
-		QRH.setImage(resolvepath("Aircraft/A320-family/Models/FlightDeck/QRH/" ~ QRHpageNo.getValue() ~ ".jpeg"));
+		QRH.setImage(resolvepath("Aircraft/A320-family/Models/FlightDeck/QRH/" ~ QRHpageNo.getValue() ~ ".jpg"));
 	});
 	buttonNext.listen("clicked", func {
 		nextPage();
-		QRH.setImage(resolvepath("Aircraft/A320-family/Models/FlightDeck/QRH/" ~ QRHpageNo.getValue() ~ ".jpeg"));
+		QRH.setImage(resolvepath("Aircraft/A320-family/Models/FlightDeck/QRH/" ~ QRHpageNo.getValue() ~ ".jpg"));
 	});
 
 

Sounds/A320-common-sound.xml

@@ -1178,15 +1178,42 @@
 			<path>Aircraft/A320-family/Sounds/SASA/A320_aircond.wav</path>
 			<mode>looped</mode>
 			<name>air conditioning</name>
+			<delay-sec>2</delay-sec>
 			<condition>
-				<property>/sim/current-view/internal</property>
+				<property>/sim/sound/other/air-con</property>
 			</condition>
 			<volume>
 				<property>/sim/sound/other/air-con</property>
-				<factor>6</factor>
+				<factor>10</factor>
 			</volume>
 		</ac>
 		
+		<ac2>
+			<path>Aircraft/A320-family/Sounds/SASA/Pack-In.wav</path>
+			<mode>once</mode>
+			<name>air conditioning in</name>
+			<condition>
+				<property>/sim/sound/other/air-con</property>
+			</condition>
+			<volume>
+				<factor>17</factor>
+				<property>/sim/current-view/internal</property>
+			</volume>
+		</ac2>
+		
+		<ac2>
+			<path>Aircraft/A320-family/Sounds/SASA/Pack-Out.wav</path>
+			<mode>once</mode>
+			<name>air conditioning out</name>
+			<condition>
+				<not><property>/sim/sound/other/air-con</property></not>
+			</condition>
+			<volume>
+				<property>/sim/current-view/internal</property>
+				<factor>17</factor>
+			</volume>
+		</ac2>
+		
 		<wow>
 			<mode>once</mode>
 			<name>wow0</name>

Systems/a320-fwc.xml

@@ -7,6 +7,12 @@
 
 	<channel name="FWC" execrate="16">
 		
+		<actuator name="/ECAM/phases/timer/acconfig-running">
+			<input>/systems/acconfig/autoconfig-running</input>
+			<rate_limit sense="decr">0.2</rate_limit>
+			<rate_limit sense="incr">100</rate_limit>
+		</actuator>
+		
 		<actuator name="/ECAM/phases/timer/eng1idle-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/phases/timer/eng1idle</input>
@@ -2895,6 +2901,7 @@
 		<switch name="/ECAM/warnings/logic/eng/eng-1-shutdown">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/dual-failure-enabled eq 0
 				<test logic="OR">
 					<test logic="AND">
@@ -2915,6 +2922,7 @@
 		<switch name="/ECAM/warnings/logic/eng/eng-2-shutdown">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/dual-failure-enabled eq 0
 				<test logic="OR">
 					<test logic="AND">
@@ -2959,6 +2967,7 @@
 		<switch name="/ECAM/warnings/fctl/lrElevFault">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/warning-phase ne 1
 				/ECAM/warning-phase ne 10
 				<test logic="OR">
@@ -3067,6 +3076,7 @@
 		<switch name="/ECAM/warnings/fctl/altn-law">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/warning-phase ne 1
 				/ECAM/warning-phase ne 10
 				/it-fbw/law eq 1
@@ -3083,6 +3093,7 @@
 		<switch name="/ECAM/warnings/fctl/direct-law-output">
 			<default value="0"/>
 			<test logic="AND" value="1">
+				/ECAM/phases/timer/acconfig-running eq 0
 				/ECAM/warning-phase ne 1
 				/ECAM/warning-phase ne 10
 				/it-fbw/law eq 2

Systems/sound-common.xml

@@ -214,8 +214,8 @@
 	</filter>
 	
 	<filter>
-		<type>gain</type>
-		<gain>1</gain>
+		<type>noise-spike</type>
+		<max-rate-of-change>0.5</max-rate-of-change>
 		<input>
 			<condition>
 				<property>/sim/sound/internal-custom</property>