From 2525fc5b08090e5ba7460ff1dff9384a964bf94e Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Sat, 18 Apr 2020 13:53:54 +0100
Subject: [PATCH] Correct electrical power source for clock and rudder trim
 display

---
 Models/FlightDeck/a320.flightdeck.xml | 104 ++++++++------------------
 Nasal/Instruments/clock.nas           |   1 +
 2 files changed, 33 insertions(+), 72 deletions(-)

diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index a4a44007..7d7236b6 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -430,8 +430,6 @@
 		<object-name>radio_vor_led</object-name>
 		<object-name>rgear_down</object-name>
 		<object-name>rgear_unlk</object-name>
-		<object-name>rudder-trim-letter</object-name>
-		<object-name>rudder-trim</object-name>
 		<object-name>spd-text</object-name>
 		<object-name>spd-text-test</object-name>
 		<object-name>terr_on_nd_label</object-name>
@@ -452,6 +450,18 @@
 			</greater-than-equals>
 		</condition>
 	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>rudder-trim-letter</object-name>
+		<object-name>rudder-trim</object-name>
+		<condition>
+			<greater-than-equals>
+				<property>systems/electrical/bus/dc-2</property>
+				<value>25</value>
+			</greater-than-equals>
+		</condition>
+	</animation>
 
 	<animation>
 		<type>select</type>
@@ -6934,20 +6944,10 @@
 		<object-name>chrono1</object-name>
 		<condition>
 			<and>
-				<or>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-1</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-2</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-ess</property>
-						<value>25</value>
-					</greater-than-equals>
-				</or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
 				<or>
 					<equals>
 						<property>controls/switches/annun-test</property>
@@ -6977,20 +6977,10 @@
 		<object-name>chrono2_1</object-name>
 		<condition>
 			<and>
-				<or>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-1</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-2</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-ess</property>
-						<value>25</value>
-					</greater-than-equals>
-				</or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
 				<property>instrumentation/clock/serviceable</property>
 				<or>
 					<equals>
@@ -7017,20 +7007,10 @@
 		<object-name>chrono2_2</object-name>
 		<condition>
 			<and>
-				<or>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-1</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-2</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-ess</property>
-						<value>25</value>
-					</greater-than-equals>
-				</or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
 				<property>instrumentation/clock/serviceable</property>
 				<not-equals>
 					<property>instrumentation/chrono[0]/chrono-reset</property>
@@ -7063,20 +7043,10 @@
 		<object-name>UTC_3</object-name>
 		<condition>
 			<and>
-				<or>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-1</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-2</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-ess</property>
-						<value>25</value>
-					</greater-than-equals>
-				</or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
 				<not>
 					<and>
 						<property>instrumentation/clock/serviceable</property>
@@ -7107,20 +7077,10 @@
 		<object-name>chrono3</object-name>
 		<condition>
 			<and>
-				<or>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-1</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-hot-2</property>
-						<value>25</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-ess</property>
-						<value>25</value>
-					</greater-than-equals>
-				</or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess</property>
+					<value>25</value>
+				</greater-than-equals>
 				<property>instrumentation/clock/serviceable</property>
 			</and>
 		</condition>
diff --git a/Nasal/Instruments/clock.nas b/Nasal/Instruments/clock.nas
index 921887b5..abecd297 100644
--- a/Nasal/Instruments/clock.nas
+++ b/Nasal/Instruments/clock.nas
@@ -96,6 +96,7 @@ setlistener("instrumentation/clock/et-selector", func(et){
 },0,0);
 
 var start_loop = maketimer(0.1, func {
+	if (systems.ELEC.Bus.dcEss.getValue() < 25) { return; }
 	# Annun-test
 	if (getprop("controls/switches/annun-test") == 1) {
 		var UTC_date = sprintf("%02d %02d %02d", "88", "88", "88");