From a84a1328b41ab334abf494d2affad6f1115248fd Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 19 Jan 2019 13:00:26 -0500
Subject: [PATCH 1/2] VC: Fix overhead lighting integral/dome

---
 Models/Instruments/OHpanel/OHpanel.xml    |  1 -
 Models/Instruments/OHpanel/OHpanelEPR.xml | 27 ++++++++++++
 Models/Instruments/OHpanel/SteepAppr.xml  | 52 +++++++++++++++++++++++
 revision.txt                              |  2 +-
 4 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 596cba58..ee6d1b3f 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -987,7 +987,6 @@
 		</emission>
 	</animation>
 	
-	<!-- Panel lighting -->
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml
index 8dfa9180..8e2ec594 100644
--- a/Models/Instruments/OHpanel/OHpanelEPR.xml
+++ b/Models/Instruments/OHpanel/OHpanelEPR.xml
@@ -233,6 +233,20 @@
 		<name>Panel lighting</name>
 		<type>material</type>
 		<object-name>MarkingLts</object-name>
+		<condition>
+			<not>
+				<and>
+					<greater-than>
+						<property>sim/model/lights/dome-light</property>
+						<value>0</value>
+					</greater-than>
+					<less-than>
+						<property>controls/lighting/overhead-panel-norm</property>
+						<value>0.25</value>
+					</less-than>
+				</and>
+			</not>
+		</condition>
 		<emission>
 			<red>1</red>
 			<green>0.824</green>
@@ -266,4 +280,17 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
+	
+	<animation>
+		<name>Panel lighting</name>
+		<type>material</type>
+		<object-name>Panel</object-name>
+		<emission>
+			<red>0.3</red>
+			<green>0.3</green>
+			<blue>0.3</blue>
+			<factor-prop>sim/model/lights/dome-light</factor-prop>
+		</emission>
+	</animation>
+
 </PropertyList>
\ No newline at end of file
diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml
index 48a4693e..e3037097 100644
--- a/Models/Instruments/OHpanel/SteepAppr.xml
+++ b/Models/Instruments/OHpanel/SteepAppr.xml
@@ -80,6 +80,20 @@
 		<name>Panel lighting</name>
 		<type>material</type>
 		<object-name>MarkingLts</object-name>
+		<condition>
+			<not>
+				<and>
+					<greater-than>
+						<property>sim/model/lights/dome-light</property>
+						<value>0</value>
+					</greater-than>
+					<less-than>
+						<property>controls/lighting/overhead-panel-norm</property>
+						<value>0.25</value>
+					</less-than>
+				</and>
+			</not>
+		</condition>
 		<emission>
 			<red>1</red>
 			<green>0.824</green>
@@ -87,5 +101,43 @@
 			<factor-prop>controls/lighting/overhead-panel-norm</factor-prop>
 		</emission>
 	</animation>
+	
+	<animation>
+		<name>Panel lighting</name>
+		<type>material</type>
+		<object-name>MarkingLts</object-name>
+		<condition>
+			<and>
+				<not>
+					<greater-than>
+						<property>controls/lighting/overhead-panel-norm</property>
+						<value>0.25</value>
+					</greater-than>
+				</not>
+				<greater-than>
+					<property>sim/model/lights/dome-light</property>
+					<value>0</value>
+				</greater-than>
+			</and>
+		</condition>
+		<emission>
+			<red>0.20</red>
+			<green>0.20</green>
+			<blue>0.20</blue>
+			<factor-prop>sim/model/lights/dome-light</factor-prop>
+		</emission>
+	</animation>
+	
+	<animation>
+		<name>Panel lighting</name>
+		<type>material</type>
+		<object-name>Panel</object-name>
+		<emission>
+			<red>0.3</red>
+			<green>0.3</green>
+			<blue>0.3</blue>
+			<factor-prop>sim/model/lights/dome-light</factor-prop>
+		</emission>
+	</animation>
 
 </PropertyList>
\ No newline at end of file
diff --git a/revision.txt b/revision.txt
index 78f705ef..7a3dea98 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4739
\ No newline at end of file
+4740
\ No newline at end of file

From 74a519c6ec3042a4b1bb9f1e9b145ddecfa3e2e1 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 19 Jan 2019 17:35:41 -0500
Subject: [PATCH 2/2] Control: Fix FMGC might produce invalid heading such as
 '361' or '368478688'

---
 Models/Instruments/OHpanel/OHpanelEPR.xml | 12 ------------
 Models/Instruments/OHpanel/SteepAppr.xml  | 12 ------------
 Systems/fmgc-drivers.xml                  |  2 +-
 revision.txt                              |  2 +-
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml
index 8e2ec594..6db20d80 100644
--- a/Models/Instruments/OHpanel/OHpanelEPR.xml
+++ b/Models/Instruments/OHpanel/OHpanelEPR.xml
@@ -280,17 +280,5 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
-	<animation>
-		<name>Panel lighting</name>
-		<type>material</type>
-		<object-name>Panel</object-name>
-		<emission>
-			<red>0.3</red>
-			<green>0.3</green>
-			<blue>0.3</blue>
-			<factor-prop>sim/model/lights/dome-light</factor-prop>
-		</emission>
-	</animation>
 
 </PropertyList>
\ No newline at end of file
diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml
index e3037097..a1f77501 100644
--- a/Models/Instruments/OHpanel/SteepAppr.xml
+++ b/Models/Instruments/OHpanel/SteepAppr.xml
@@ -127,17 +127,5 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
-	<animation>
-		<name>Panel lighting</name>
-		<type>material</type>
-		<object-name>Panel</object-name>
-		<emission>
-			<red>0.3</red>
-			<green>0.3</green>
-			<blue>0.3</blue>
-			<factor-prop>sim/model/lights/dome-light</factor-prop>
-		</emission>
-	</animation>
 
 </PropertyList>
\ No newline at end of file
diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml
index 7b10669e..3797b083 100644
--- a/Systems/fmgc-drivers.xml
+++ b/Systems/fmgc-drivers.xml
@@ -744,7 +744,7 @@
 			<condition>
 				<less-than>
 					<property>/it-autoflight/internal/heading-predicted-cmd</property>
-					<value>1</value>
+					<value>0.5</value>
 				</less-than>
 			</condition>
 			<expression>
diff --git a/revision.txt b/revision.txt
index 7a3dea98..21f019a5 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4740
\ No newline at end of file
+4741
\ No newline at end of file