A3XX: Fix LDG FLAP 3 switcH

A320-main.xml

@@ -1376,7 +1376,6 @@
 		<libraries>
 			<file>Aircraft/IDG-A32X/Nasal/libraries.nas</file>
 			<file>Aircraft/IDG-A32X/Nasal/buttons.nas</file>
-			<file>Aircraft/IDG-A32X/Nasal/gpws.nas</file>
 			<file>Aircraft/IDG-A32X/Nasal/efis.nas</file>
 			<file>Aircraft/IDG-A32X/Nasal/ECAM.nas</file>
 			<file>Aircraft/IDG-A32X/Nasal/shake.nas</file>

Models/Instruments/OHpanel/OHpanel.xml

@@ -1740,7 +1740,7 @@
 					</or>
 				</condition>
 				<command>property-toggle</command>
-				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-override</property>
+				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
@@ -1755,7 +1755,7 @@
 		<condition>
 			<or>
 				<equals>
-					<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-override</property>
+					<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override</property>
 					<value>1</value>
 				</equals>
 				<equals>
@@ -1789,7 +1789,7 @@
 					</or>
 				</condition>
 				<command>property-toggle</command>
-				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap3-override</property>
+				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
@@ -1804,7 +1804,7 @@
 		<condition>
 			<or>
 				<equals>
-					<property>instrumentation/mk-viii/inputs/discretes/momentary-flap3-override</property>
+					<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override</property>
 					<value>1</value>
 				</equals>
 				<equals>

Nasal/buttons.nas

@@ -15,8 +15,8 @@ var variousReset = func {
 	setprop("/instrumentation/mk-viii/inputs/discretes/terr-inhibit", 0);
 	setprop("/instrumentation/mk-viii/inputs/discretes/gpws-inhibit", 0);
 	setprop("/instrumentation/mk-viii/inputs/discretes/glideslope-cancel", 0);
-	setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-override", 0);
+	setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override", 0);
-	setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap3-override", 0);
+	setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override", 0);
 	setprop("/controls/switches/cabinCall", 0);
 	setprop("/controls/switches/mechCall", 0);
 	setprop("/controls/switches/emer-lights", 0.5);

Nasal/gpws.nas

@@ -1,164 +0,0 @@
-# GPWS Wrapper by Thorsten Brehm.
-
-##############################################
-# Copyright (c) Joshua Davidson (it0uchpods) #
-##############################################
-
-var gpws_min_landing_flaps = 0.645;
-
-var GPWS = 
-{
-    new : func(prop1)
-    {
-        m = { parents : [GPWS]};
-
-        m.gpws            = props.globals.getNode(prop1);
-        m.self_test       = m.gpws.getNode("inputs/discretes/self-test");
-        m.flap_override   = m.gpws.getNode("inputs/discretes/momentary-flap-override");
-        m.gs_inhibit      = m.gpws.getNode("inputs/discretes/glideslope-inhibit");
-        m.gpws_inhibit    = m.gpws.getNode("inputs/discretes/gpws-inhibit");
-        m.terrain_inhibit = m.gpws.getNode("inputs/discretes/ta-tcf-inhibit");
-        m.landing_gear    = m.gpws.getNode("inputs/discretes/landing-gear");
-        m.landing_flaps   = m.gpws.getNode("inputs/discretes/landing-flaps");
-
-        # mk-viii doesn't provide gear-override input. Emulate it...
-        m.gear_override = m.gpws.initNode("inputs/discretes/gear-override",0,"BOOL");
-
-        m.last_gear_state = 0;
-
-        # add listener to gear
-        setlistener("controls/gear/gear-down",         func { Gpws.update_gear_state() } );
-
-        # GPWS provides two TCWs (Time Critical Warnings) to the PFD:
-        # "PULL UP" and "WINDSHEAR" alerts (windshears not supported here...)
-        m.tcw_out = m.gpws.initNode("outputs/warning","","STRING");
-        m.tcw_out.setValue("");
-        m.logic_discretes = m.gpws.getNode("outputs/arinc429/egpwc-logic-discretes");
-        settimer(gpws_input_feeder,0);
-
-        return m;
-    },
-
-    clicked_selftest : func
-    {
-        if (!me.self_test.getBoolValue())
-        {
-            # simulate a long button press (>> 5 seconds)
-            me.self_test.setBoolValue(1);
-            settimer(func { Gpws.release_selftest_button() },9);
-        }
-        else
-        {
-            # clicked again => release button early...
-            me.release_selftest_button();
-        }
-    },
-    press_selftest_button : func
-    {
-        me.self_test.setBoolValue(1);
-    },
-    release_selftest_button : func
-    {
-        me.self_test.setBoolValue(0);
-    },
-
-    clicked_flap_override : func
-    {
-        if (!me.flap_override.getBoolValue())
-        {
-            # simulate a short button press
-            me.flap_override.setBoolValue(1);
-            settimer(func {Gpws.release_button_flap_override() },0.5);
-        }
-    },
-    release_button_flap_override : func
-    {
-        me.flap_override.setBoolValue(0);
-    },
-
-    clicked_gear_override : func
-    {
-        # toggle
-        me.gear_override.setBoolValue(!me.gear_override.getBoolValue());
-        me.update_gear_state();
-    },
-
-    clicked_gs_override : func
-    {
-        # toggle g/s inhibit.
-        me.gs_inhibit.setBoolValue(!me.gs_inhibit.getBoolValue());
-    },
-    disable_gs_override : func
-    {
-        me.gs_inhibit.setBoolValue(0);
-    },
-
-    clicked_gpws_inhibit : func
-    {
-        # toggle
-        me.gpws_inhibit.setBoolValue(!me.gpws_inhibit.getBoolValue());
-    },
-
-    clicked_terrain_inhibit : func
-    {
-        # toggle
-        me.terrain_inhibit.setBoolValue(!me.terrain_inhibit.getBoolValue());
-    },
-
-    tcw_feeder : func
-    {
-        var tcwmsg="";
-        var alerts = me.logic_discretes.getValue();
-        if (gpws_test_bit(alerts,0x100000)) # bit 20="MODE1_PULL_UP"
-            tcwmsg="PULL UP";
-        me.tcw_out.setValue(tcwmsg);
-    },
-
-    update_gear_state : func()
-    {
-        # Simulate gear override button using a custom landing gear feeder.
-        # Default mk-viii gear feeder is disabled in <plane>-set.xml
-        var gear_state = getprop("controls/gear/gear-down");
-
-        me.landing_gear.setBoolValue(gear_state or me.gear_override.getBoolValue());
-
-        if ((me.last_gear_state)and(!gear_state))
-        {
-            # g/s override is cancelled when retracting landing gear...
-            me.disable_gs_override();
-        }
-        me.last_gear_state = gear_state;
-    },
-    update_flap_state : func()
-    {
-        # Feeder to configure custom "minimum landing flap position".
-        # Default mk-viii flap feeder is disabled in <plane>-set.xml
-        var flap_position = getprop("controls/flight/flaps");
-
-        me.landing_flaps.setBoolValue(flap_position < gpws_min_landing_flaps);
-    },
-    update_height : func()
-    {
-        radio_alt = getprop("position/gear-agl-ft");
-        # "glide-slope warning inhibited" is disabled below 50 feet
-        if ((radio_alt < 50.0)or(radio_alt > 1000.0))
-            me.disable_gs_override();
-    },
-};
-
-var gpws_test_bit = func(value,bitValue)
-{
-    if (bitValue>1) value=int(value/bitValue);
-    # test if LSB set
-    return (value!=int(value/2)*2);
-}
-
-var gpws_input_feeder = func
-{
-    Gpws.tcw_feeder();
-    Gpws.update_flap_state();
-    Gpws.update_height();
-    settimer(gpws_input_feeder,0.3);
-}
-
-var Gpws = GPWS.new("instrumentation/mk-viii");

Nasal/libraries.nas

@@ -214,6 +214,12 @@ var systemsLoop = maketimer(0.1, func {
 	if (getprop("/it-autoflight/custom/show-hdg") == 0 and getprop("/it-autoflight/output/lat") != 4) {
 		setprop("/it-autoflight/input/hdg", math.round(getprop("/orientation/heading-magnetic-deg")));
 	}
+	
+	if (getprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-all-override") == 1 or (getprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-3-override") == 1 and getprop("/controls/flight/flap-pos") >= 4)) {
+		setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-override", 1);
+	} else {
+		setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-override", 0);
+	}
 });
 
 setlistener("/options/steep-ils", func {
@@ -225,23 +231,23 @@ setlistener("/options/steep-ils", func {
 });
 
 canvas.Text._lastText = canvas.Text["_lastText"];
-canvas.Text.setText = func (text) {
+canvas.Text.setText = func(text) {
 	if (text == me._lastText) {return me;}
 	me._lastText = text;
 	me.set("text", typeof(text) == 'scalar' ? text : "");
 };
 canvas.Element._lastVisible = nil;
-canvas.Element.show = func () {
+canvas.Element.show = func {
 	if (1 == me._lastVisible) {return me;}
 	me._lastVisible = 1;
 	me.setBool("visible", 1);
 };
-canvas.Element.hide = func () {
+canvas.Element.hide = func {
 	if (0 == me._lastVisible) {return me;}
 	me._lastVisible = 0;
 	me.setBool("visible", 0);
 };
-canvas.Element.setVisible = func (vis) {
+canvas.Element.setVisible = func(vis) {
 	if (vis == me._lastVisible) {return me;}
 	me._lastVisible = vis;
 	me.setBool("visible", vis);

revision.txt

@@ -1 +1 @@
-4201
+4202