From 3ae7bb6076a25de41116cf281b76555701cbc877 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Fri, 30 Jul 2021 13:04:58 +0100
Subject: [PATCH 1/4] Boost switch volume

---
 Sounds/A320-common-sound.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml
index fdff70f0..38673039 100644
--- a/Sounds/A320-common-sound.xml
+++ b/Sounds/A320-common-sound.xml
@@ -1474,7 +1474,7 @@
 			</condition>
 			<volume>
 				<property>/sim/current-view/internal</property>
-				<factor>0.75</factor>
+				<factor>1.5</factor>
 			</volume>
 		</switch>
 		
@@ -1500,7 +1500,7 @@
 			</condition>
 			<volume>
 				<property>/sim/current-view/internal</property>
-				<factor>0.75</factor>
+				<factor>1.5</factor>
 			</volume>
 		</switch>
 		
@@ -1513,7 +1513,7 @@
 			</condition>
 			<volume>
 				<property>/sim/current-view/internal</property>
-				<factor>0.75</factor>
+				<factor>1.5</factor>
 			</volume>
 		</switch>
 		
@@ -1526,7 +1526,7 @@
 			</condition>
 			<volume>
 				<property>/sim/current-view/internal</property>
-				<factor>0.6</factor>
+				<factor>1.0</factor>
 			</volume>
 		</switch>
 		
@@ -1539,7 +1539,7 @@
 			</condition>
 			<volume>
 				<property>/sim/current-view/internal</property>
-				<factor>0.75</factor>
+				<factor>1.5</factor>
 			</volume>
 		</switch>
 		

From a6c5a08b39538627fedc2b36e7fce7b78a4ff647 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Fri, 30 Jul 2021 14:23:58 +0100
Subject: [PATCH 2/4] Improve layout of ground services dialog slightly

---
 AircraftConfig/groundservices.xml | 86 +++++++++++++++++--------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml
index b8d554a8..7ecff3d6 100644
--- a/AircraftConfig/groundservices.xml
+++ b/AircraftConfig/groundservices.xml
@@ -172,25 +172,28 @@
             </hrule>
         </group>
 
-        <checkbox>
-            <label>Front Left</label>
-            <halign>left</halign>
-            <property>/services/stairs/l1</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-            <live>true</live>
-        </checkbox>
+		<group>
+            <layout>hbox</layout>
+			<checkbox>
+				<label>Front Left</label>
+				<halign>left</halign>
+				<property>/services/stairs/l1</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
 
-        <checkbox>
-            <label>Rear Left</label>
-            <halign>left</halign>
-            <property>/services/stairs/l4</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-            <live>true</live>
-        </checkbox>
+			<checkbox>
+				<label>Rear Left</label>
+				<halign>left</halign>
+				<property>/services/stairs/l4</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<live>true</live>
+			</checkbox>
+		</group>
 
         <checkbox>
             <label>Stairway Cover</label>
@@ -356,28 +359,31 @@
             </hrule>
         </group>
 		
-		<text>
-			<x>10</x>
-			<y>200</y>
-			<label>8888 litres</label><!-- placeholder for width -->
-			<format>%4.0f litres</format>
-			<property>/systems/oxygen/cockpit-oxygen/cockpit-bottle-L</property>
-			<live>true</live>
-		</text>
-		
-        <button>
-            <legend>Replace Oxygen Bottle</legend>
-            <halign>center</halign>
-            <padding>5</padding>
-			<enable>
-				<property>/gear/gear[1]/wow</property>
-			</enable>
-            <binding>
-                <command>property-assign</command>
-                <property>/systems/oxygen/cockpit-oxygen/cockpit-bottle-L</property>
-                <value>2183</value>
-            </binding>
-        </button>
+		<group>
+			<layout>hbox</layout>
+			<button>
+				<legend>Replace Oxygen Bottle</legend>
+				<halign>center</halign>
+				<padding>5</padding>
+				<enable>
+					<property>/gear/gear[1]/wow</property>
+				</enable>
+				<binding>
+					<command>property-assign</command>
+					<property>/systems/oxygen/cockpit-oxygen/cockpit-bottle-L</property>
+					<value>2183</value>
+				</binding>
+			</button>
+			
+			<text>
+				<x>10</x>
+				<y>200</y>
+				<label>8888 litres</label><!-- placeholder for width -->
+				<format>%4.0f litres</format>
+				<property>/systems/oxygen/cockpit-oxygen/cockpit-bottle-L</property>
+				<live>true</live>
+			</text>
+		</group>
 		
         <button>
             <legend>Reset Pax Oxy Masks</legend>

From 499709429637f9ab492948dbe818e382392ac95d Mon Sep 17 00:00:00 2001
From: Josh Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 1 Aug 2021 10:31:48 -0400
Subject: [PATCH 3/4] Sim: properly support version checks for the new
 2020.3.xx

---
 AircraftConfig/acconfig.nas   | 24 +++++++++++++++++++-----
 Nasal/Libraries/libraries.nas |  2 +-
 revision.txt                  |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 09fb2edb..e6f2337d 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -104,14 +104,30 @@ setlistener("/systems/acconfig/new-revision", func {
 	}
 });
 
+var fgfsMin = split(".", getprop("/sim/minimum-fg-version"));
+var fgfsVer = split(".", getprop("/sim/version/flightgear"));
+
+var versionCheck = func() {
+	if (fgfsVer[0] < fgfsMin[0] or fgfsVer[1] < fgfsMin[1]) {
+		return 0;
+	} else if (fgfsVer[1] == fgfsMin[1]) {
+		if (fgfsVer[2] < fgfsMin[2]) {
+			return 0;
+		} else {
+			return 1;
+		}
+	} else {
+		return 1;
+	}
+}
+
 var mismatch_chk = func {
-	if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201920) {
+	if (!versionCheck()) {
 		setprop("/systems/acconfig/mismatch-code", "0x121");
-		setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2019.2.0.");
+		setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least " ~ getprop("/sim/minimum-fg-version") ~ ".");
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
 			error_mismatch.open();
 		}
-		libraries.systemsLoop.stop();
 		print("Mismatch: 0x121");
 		welcome_dlg.close();
 	} else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) {
@@ -120,7 +136,6 @@ var mismatch_chk = func {
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
 			error_mismatch.open();
 		}
-		libraries.systemsLoop.stop();
 		print("Mismatch: 0x223");
 		welcome_dlg.close();
 	} else if (getprop("/systems/acconfig/libraries-loaded") != 1) {
@@ -129,7 +144,6 @@ var mismatch_chk = func {
 		if (getprop("/systems/acconfig/out-of-date") != 1) {
 			error_mismatch.open();
 		}
-		libraries.systemsLoop.stop();
 		print("Mismatch: 0x247");
 		welcome_dlg.close();
 	}
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index 244f97e9..f5014294 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -176,7 +176,7 @@ var update_items = [
 ];
 
 var systemsLoop = func(notification) {
-	if (!systemsInitialized) { return; }
+	if (!systemsInitialized and getprop("/systems/acconfig/mismatch-code") != "0x000") { return; }
 	systems.PNEU.loop(notification);
 	systems.ADIRS.loop(notification);
 	systems.BrakeSys.update(notification);
diff --git a/revision.txt b/revision.txt
index 31ff414b..2e66562e 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-48
\ No newline at end of file
+49
\ No newline at end of file

From 3b83e1dd75610a33dd58440040395b0a15d4c090 Mon Sep 17 00:00:00 2001
From: Josh Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 1 Aug 2021 10:32:35 -0400
Subject: [PATCH 4/4] Sim: Fix minver for new engine component logic

---
 A320-main.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/A320-main.xml b/A320-main.xml
index 05927f1f..77be38fc 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -591,7 +591,7 @@
 			<z-offset-max-m type="float">300.0</z-offset-max-m>
 		</current-view>
 		
-		<minimum-fg-version>2019.2.0</minimum-fg-version>
+		<minimum-fg-version>2020.3.1</minimum-fg-version>
 
 		<navdb>
 			<min-runway-length-ft>3000</min-runway-length-ft>