From cf61cbd921d9fee191568dbd2e4d96d3b3f69c2d Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Wed, 13 May 2020 09:02:31 +0100
Subject: [PATCH 1/2] Update readme per Charlie_X request

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 54c70cf5..96d909f6 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ You can find a Checklist to download and print [here](https://raw.githubusercont
 ## Navdata
 It is highly reccomended to purchase a NAVIGRAPH subscription and download their level d FMSDATA / waypoint / navaid data! If you do not wish to do that, there is older data linked below. But it won't have most of the newer procedures, and is only for a limited number of airports, as naturally it is not possible to distribute commercial data. If runway numbering changed, it is quite possible that it will not work due to FlightGear limitations in the routing code.
 
-To install navdata, create a folder FMSDATA, and add it to your additional scenery folders, at the top of the list. Inside that folder, place all the XXXX.procedures.xml files, in the format FMSDATA/X/X/X/XXXX.procedures.xml. For instance, FMSDATA/E/G/K/EGKK.procedures.xml. 
+To install navdata, create a folder FMSDATA, and add it to your additional scenery folders, at the top of the list. Inside that folder, place all the XXXX.procedures.xml files, in the format FMSDATA/X/X/X/XXXX.procedures.xml. For instance, FMSDATA/Airports/E/G/K/EGKK.procedures.xml. 
 
 ## External tools
 Some external tools you might want to checkout and use with this Model.  

From 19acfc434e3cbcdbf8bbe8252112047c6b7714f1 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Wed, 13 May 2020 10:58:59 +0100
Subject: [PATCH 2/2] Correct GPWS landing flaps

---
 A320-main.xml            | 66 ++++++++++++++++++++++------------------
 Systems/fmgc-drivers.xml | 19 ++++++++++--
 revision.txt             |  2 +-
 3 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 7c8b50fd..03e26a22 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1360,6 +1360,12 @@
 				<category-13 type="int">7</category-13>
 				<category-14 type="int">0</category-14>
 			</configuration-module>
+			<input-feeders>
+				<discretes>
+					<!-- disable the built-in input feeder -->
+					<landing-flaps type="bool">false</landing-flaps>
+				</discretes>
+			</input-feeders>
 			<inputs>
 				<arinc429>
 					<decision-height-ncd type="bool">0</decision-height-ncd>
@@ -1385,8 +1391,8 @@
 			<antenna>
 				<x-offset-m type="double">-1</x-offset-m>
 				<y-offset-m type="double">0</y-offset-m>
- 				<z-offset-m type="double">2.52</z-offset-m>
- 			</antenna>
+				<z-offset-m type="double">2.52</z-offset-m>
+			</antenna>
 			<az-step-deg type="int">10</az-step-deg>
 			<az-limit-deg type="int">30</az-limit-deg>
 			<elev-step-deg type="int">10</elev-step-deg>
@@ -1399,8 +1405,8 @@
 			<antenna>
 				<x-offset-m type="double">-1</x-offset-m>
 				<y-offset-m type="double">0</y-offset-m>
- 				<z-offset-m type="double">2.52</z-offset-m>
- 			</antenna>
+				<z-offset-m type="double">2.52</z-offset-m>
+			</antenna>
 			<az-step-deg type="int">10</az-step-deg>
 			<az-limit-deg type="int">30</az-limit-deg>
 			<elev-step-deg type="int">10</elev-step-deg>
@@ -2178,19 +2184,19 @@
 						<not><property>/FMGC/keyboard-left</property></not>
 						<not><property>/FMGC/keyboard-right</property></not>
 					</condition>
-   					<command>nasal</command>
-   					<script>controls.applyParkingBrake(1)</script>
-  				</binding>
-  				<mod-up>
-   					<binding>
-   						<condition>
+					<command>nasal</command>
+					<script>controls.applyParkingBrake(1)</script>
+				</binding>
+				<mod-up>
+					<binding>
+						<condition>
 							<not><property>/FMGC/keyboard-left</property></not>
 							<not><property>/FMGC/keyboard-right</property></not>
 						</condition>
 						<command>nasal</command>
 						<script>controls.applyParkingBrake(0)</script>
-   					</binding>
-  				</mod-up>
+					</binding>
+				</mod-up>
 			</key>
 			<key n="67">
 				<name>SHIFT-c</name>
@@ -2306,9 +2312,9 @@
 						<not><property>/FMGC/keyboard-left</property></not>
 						<not><property>/FMGC/keyboard-right</property></not>
 					</condition>
-   					<command>nasal</command>
-   					<script>controls.gearDown(1)</script>
-  				</binding>
+					<command>nasal</command>
+					<script>controls.gearDown(1)</script>
+				</binding>
 			  	<mod-up>
 			   		<binding>
 			   			<condition>
@@ -2342,9 +2348,9 @@
 						<not><property>/FMGC/keyboard-left</property></not>
 						<not><property>/FMGC/keyboard-right</property></not>
 					</condition>
-   					<command>nasal</command>
-   					<script>aircraft.HUD.cycle_brightness()</script>
-  				</binding>
+					<command>nasal</command>
+					<script>aircraft.HUD.cycle_brightness()</script>
+				</binding>
 			</key>
 			<key n="73">
 				<name>SHIFT-i</name>
@@ -2368,9 +2374,9 @@
 						<not><property>/FMGC/keyboard-left</property></not>
 						<not><property>/FMGC/keyboard-right</property></not>
 					</condition>
-  					<command>nasal</command>
-   					<script>aircraft.HUD.cycle_type()</script>
-  				</binding>
+					<command>nasal</command>
+					<script>aircraft.HUD.cycle_type()</script>
+				</binding>
 			</key>
 			<key n="74">
 				<name>SHIFT-j</name>
@@ -2502,9 +2508,9 @@
 						<not><property>/FMGC/keyboard-left</property></not>
 						<not><property>/FMGC/keyboard-right</property></not>
 					</condition>
-   					<command>property-toggle</command>
-   					<property>/sim/panel/visibility</property>
-  				</binding>
+					<command>property-toggle</command>
+					<property>/sim/panel/visibility</property>
+				</binding>
 			</key>
 			<key n="81">
 				<name>SHIFT-q</name>
@@ -2618,9 +2624,9 @@
 						<not><property>/FMGC/keyboard-left</property></not>
 						<not><property>/FMGC/keyboard-right</property></not>
 					</condition>
-   					<command>nasal</command>
-   					<script>view.stepView(-1)</script>
-  				</binding>
+					<command>nasal</command>
+					<script>view.stepView(-1)</script>
+				</binding>
 			</key>
 			<key n="87">
 				<name>SHIFT-w</name>
@@ -2707,9 +2713,9 @@
 						<not><property>/FMGC/keyboard-left</property></not>
 						<not><property>/FMGC/keyboard-right</property></not>
 					</condition>
-   					<command>nasal</command>
-   					<script>environment.decreaseVisibility()</script>
-  				</binding>
+					<command>nasal</command>
+					<script>environment.decreaseVisibility()</script>
+				</binding>
 			</key>
 			<key n="97">
 				<name>a</name>
diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml
index aa9f80b2..4642cdc8 100644
--- a/Systems/fmgc-drivers.xml
+++ b/Systems/fmgc-drivers.xml
@@ -290,7 +290,7 @@
 				</equals>
 			</condition>
 		</enable>
-        <input>
+		<input>
 			<expression>
 				<floor>
 					<sum>
@@ -315,7 +315,7 @@
 				</equals>
 			</condition>
 		</enable>
-        <input>
+		<input>
 			<expression>
 				<div>
 					<floor>
@@ -885,5 +885,18 @@
 		<max>30</max>
 		<max-rate-of-change>10</max-rate-of-change>
 	</filter>
-
+	
+	<logic>
+		<!-- somewhat confusing : this input is not 'are the flaps in landing configration', but rather,
+		'are the flaps NOT in a landing configuration'. There is a configuration bit to flip
+		the sense of this, if required. -->
+		<input>
+			<less-than>
+				<property>/controls/flight/flaps</property>
+				<value>0.8</value>
+			</less-than>
+		</input>
+		<output>/instrumentation/mk-viii/inputs/discretes/landing-flaps</output>
+	</logic>
+ 
 </PropertyList>
diff --git a/revision.txt b/revision.txt
index dc7b54ad..3e932fe8 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-33
\ No newline at end of file
+34
\ No newline at end of file