From b87f25c5a7f0ed76437e8c808d92426f131cfa1d Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 30 Jan 2019 17:16:27 -0500
Subject: [PATCH] VC: Fix bug with RMPs

---
 Models/Instruments/Radio/Radio1.xml | 28 +++++++++++++++-------
 Models/Instruments/Radio/Radio2.xml | 36 ++++++++++++++++++++++-------
 revision.txt                        |  2 +-
 3 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/Models/Instruments/Radio/Radio1.xml b/Models/Instruments/Radio/Radio1.xml
index 475b0b1f..95514ddb 100644
--- a/Models/Instruments/Radio/Radio1.xml
+++ b/Models/Instruments/Radio/Radio1.xml
@@ -1386,10 +1386,16 @@
 		<type>select</type>
 		<object-name>rmp-active-test</object-name>
 		<condition>
-			<equals>
-				<property>controls/switches/annun-test</property>
-				<value>1</value>
-			</equals>
+			<and>
+				<equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
+			</and>
 		</condition>
 	</animation>
 
@@ -1470,10 +1476,16 @@
 		<type>select</type>
 		<object-name>rmp-standby-test</object-name>
 		<condition>
-			<equals>
-				<property>controls/switches/annun-test</property>
-				<value>1</value>
-			</equals>
+			<and>
+				<equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
+			</and>
 		</condition>
 	</animation>
 
diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml
index d21e496b..8859e459 100644
--- a/Models/Instruments/Radio/Radio2.xml
+++ b/Models/Instruments/Radio/Radio2.xml
@@ -1386,10 +1386,20 @@
 		<type>select</type>
 		<object-name>rmp-active-test</object-name>
 		<condition>
-			<equals>
-				<property>controls/switches/annun-test</property>
-				<value>1</value>
-			</equals>
+			<and>
+				<not-equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</not-equals>
+				<equals>
+					<property>controls/radio/rmp[0]/on</property>
+					<value>1</value>
+				</equals>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
+			</and>
 		</condition>
 	</animation>
 
@@ -1470,10 +1480,20 @@
 		<type>select</type>
 		<object-name>rmp-standby-test</object-name>
 		<condition>
-			<equals>
-				<property>controls/switches/annun-test</property>
-				<value>1</value>
-			</equals>
+			<and>
+				<not-equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</not-equals>
+				<equals>
+					<property>controls/radio/rmp[0]/on</property>
+					<value>1</value>
+				</equals>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
+			</and>
 		</condition>
 	</animation>
 
diff --git a/revision.txt b/revision.txt
index 5817b57a..573de2f5 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4749
\ No newline at end of file
+4750
\ No newline at end of file