From c422fce9818f54b17af0c9c6706413197a29795a Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 14 Jun 2017 20:07:01 -0400
Subject: [PATCH] A3XX: Add dynamic block limits

---
 A319-100-CFM-set.xml | 3 ++-
 A319-100-IAE-set.xml | 3 ++-
 A320-200-CFM-set.xml | 3 ++-
 A320-200-IAE-set.xml | 3 ++-
 A320neo-CFM-set.xml  | 3 ++-
 A321-200-CFM-set.xml | 3 ++-
 A321-200-IAE-set.xml | 3 ++-
 A321neo-CFM-set.xml  | 3 ++-
 Nasal/MCDU/MCDU1.nas | 5 +++--
 Nasal/MCDU/MCDU2.nas | 5 +++--
 10 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/A319-100-CFM-set.xml b/A319-100-CFM-set.xml
index 4c99d60a..2a133e4a 100644
--- a/A319-100-CFM-set.xml
+++ b/A319-100-CFM-set.xml
@@ -103,9 +103,10 @@
 		
 	</sim>
 	
-	<options>
+	<options n="0">
 		<EIS2 type="bool">0</EIS2>
 		<eng>CFM</eng>
+		<maxblock>52.3</maxblock>
 	</options>
 	
 	<sharklet type="bool">0</sharklet>
diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml
index 6bdb49c1..091a56a5 100644
--- a/A319-100-IAE-set.xml
+++ b/A319-100-IAE-set.xml
@@ -103,9 +103,10 @@
 		
 	</sim>
 	
-	<options>
+	<options n="0">
 		<EIS2 type="bool">0</EIS2>
 		<eng>IAE</eng>
+		<maxblock>52.3</maxblock>
 	</options>
 	
 	<sharklet type="bool">0</sharklet>
diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml
index 069e2bd4..6c26bc35 100644
--- a/A320-200-CFM-set.xml
+++ b/A320-200-CFM-set.xml
@@ -103,9 +103,10 @@
 		
 	</sim>
 	
-	<options>
+	<options n="0">
 		<EIS2 type="bool">0</EIS2>
 		<eng>CFM</eng>
+		<maxblock>52.3</maxblock>
 	</options>
 	
 	<sharklet type="bool">0</sharklet>
diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml
index 4011e8d5..05e272c1 100644
--- a/A320-200-IAE-set.xml
+++ b/A320-200-IAE-set.xml
@@ -103,9 +103,10 @@
 		
 	</sim>
 	
-	<options>
+	<options n="0">
 		<EIS2 type="bool">0</EIS2>
 		<eng>IAE</eng>
+		<maxblock>52.3</maxblock>
 	</options>
 	
 	<sharklet type="bool">0</sharklet>
diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml
index 2bd24e03..d2b066e1 100644
--- a/A320neo-CFM-set.xml
+++ b/A320neo-CFM-set.xml
@@ -103,9 +103,10 @@
 		
 	</sim>
 	
-	<options>
+	<options n="0">
 		<EIS2 type="bool">1</EIS2>
 		<eng>CFM</eng>
+		<maxblock>52.3</maxblock>
 	</options>
 	
 	<sharklet type="bool">1</sharklet>
diff --git a/A321-200-CFM-set.xml b/A321-200-CFM-set.xml
index 5df9d413..67daad7d 100644
--- a/A321-200-CFM-set.xml
+++ b/A321-200-CFM-set.xml
@@ -103,9 +103,10 @@
 		
 	</sim>
 	
-	<options>
+	<options n="0">
 		<EIS2 type="bool">0</EIS2>
 		<eng>CFM</eng>
+		<maxblock>52.0</maxblock>
 	</options>
 	
 	<sharklet type="bool">0</sharklet>
diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml
index 5f06cba5..280f2c64 100644
--- a/A321-200-IAE-set.xml
+++ b/A321-200-IAE-set.xml
@@ -103,9 +103,10 @@
 		
 	</sim>
 	
-	<options>
+	<options n="0">
 		<EIS2 type="bool">0</EIS2>
 		<eng>IAE</eng>
+		<maxblock>52.0</maxblock>
 	</options>
 	
 	<sharklet type="bool">0</sharklet>
diff --git a/A321neo-CFM-set.xml b/A321neo-CFM-set.xml
index 8c7c5252..5ed60f1a 100644
--- a/A321neo-CFM-set.xml
+++ b/A321neo-CFM-set.xml
@@ -103,9 +103,10 @@
 		
 	</sim>
 	
-	<options>
+	<options n="0">
 		<EIS2 type="bool">1</EIS2>
 		<eng>CFM</eng>
+		<maxblock>52.0</maxblock>
 	</options>
 	
 	<sharklet type="bool">1</sharklet>
diff --git a/Nasal/MCDU/MCDU1.nas b/Nasal/MCDU/MCDU1.nas
index 16c50ef9..a390fee1 100644
--- a/Nasal/MCDU/MCDU1.nas
+++ b/Nasal/MCDU/MCDU1.nas
@@ -453,8 +453,9 @@ var initInputB = func(key) {
 			setprop("/MCDU[0]/scratchpad", "");
 		} else {
 			var tfs = size(scratchpad);
-			if (tfs == 2 or tfs == 4) {
-				if (scratchpad >= 1.0 and scratchpad <= 45.0) {
+			var maxblock = getprop("/options/maxblock");
+			if (tfs == 2 or tfs == 4 or tfs == 5) {
+				if (scratchpad >= 1.0 and scratchpad <= maxblock) {
 					setprop("/FMGC/internal/block", scratchpad);
 					setprop("/FMGC/internal/block-set", 1);
 					setprop("/MCDU[0]/scratchpad", "");
diff --git a/Nasal/MCDU/MCDU2.nas b/Nasal/MCDU/MCDU2.nas
index 79981f52..907476bd 100644
--- a/Nasal/MCDU/MCDU2.nas
+++ b/Nasal/MCDU/MCDU2.nas
@@ -453,8 +453,9 @@ var initInputB = func(key) {
 			setprop("/MCDU[1]/scratchpad", "");
 		} else {
 			var tfs = size(scratchpad);
-			if (tfs == 2 or tfs == 4) {
-				if (scratchpad >= 1.0 and scratchpad <= 45.0) {
+			var maxblock = getprop("/options/maxblock");
+			if (tfs == 2 or tfs == 4 or tfs == 5) {
+				if (scratchpad >= 1.0 and scratchpad <= maxblock) {
 					setprop("/FMGC/internal/block", scratchpad);
 					setprop("/FMGC/internal/block-set", 1);
 					setprop("/MCDU[1]/scratchpad", "");