From cb46cd82630d4ed8ace037a10959f50369ead258 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Fri, 5 May 2017 17:04:15 +0100
Subject: [PATCH] add generators and the generator HZ

---
 Models/Instruments/ECAM/page-elec.xml | 121 +++++++++++++++++++++++++-
 Nasal/electrical.nas                  |   8 +-
 2 files changed, 125 insertions(+), 4 deletions(-)

diff --git a/Models/Instruments/ECAM/page-elec.xml b/Models/Instruments/ECAM/page-elec.xml
index 451c2436..2aa9fec5 100644
--- a/Models/Instruments/ECAM/page-elec.xml
+++ b/Models/Instruments/ECAM/page-elec.xml
@@ -214,7 +214,6 @@
 			</condition>
 		</layer>
 		<layer>
-
 			<type>text</type>
 			<name>GEN1-volts</name>
 			<color>
@@ -250,7 +249,6 @@
 		</layer>
 		
 		<layer>
-
 			<type>text</type>
 			<name>GEN2-volts</name>
 			<color>
@@ -582,7 +580,126 @@
 				</and>
 			</condition>
 		</layer>
+		<layer>
+
+			<type>text</type>
+			<name>GEN1-hz</name>
+			<color>
+				<red>0</red>
+				<green>1.0</green>
+				<blue>0</blue>
+			</color>
+			<font>helvetica_bold</font>
+			<point-size>11</point-size>
+			<chunks>
+				<chunk>
+					<type>number-value</type>
+					<property>/systems/electrical/bus/gen1-hz</property>
+					<format type="string">%3.0f</format>
+				</chunk>
+			</chunks>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>-68</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>-117</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/gen1</property>
+					<value>1</value>
+				</equals>
+			</condition>
+		</layer>
 		
+		<layer>
+			<type>text</type>
+			<name>GEN2-hz</name>
+			<color>
+				<red>0</red>
+				<green>1.0</green>
+				<blue>0</blue>
+			</color>
+			<font>helvetica_bold</font>
+			<point-size>11</point-size>
+			<chunks>
+				<chunk>
+					<type>number-value</type>
+					<property>/systems/electrical/bus/gen2-hz</property>
+					<format type="string">%3.0f</format>
+				</chunk>
+			</chunks>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>-68</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>91</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/gen2</property>
+					<value>1</value>
+				</equals>
+			</condition>
+		</layer>
+		<layer>
+			<name>gen1off</name>
+			<emissive>true</emissive>
+			<w>44</w>
+			<h>55</h>
+			<texture>
+				<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-gen1off.png</path>
+			</texture>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>-48</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>-103</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/gen1</property>
+					<value>0</value>
+				</equals>
+			</condition>
+		</layer>
+		<layer>
+			<name>gen2off</name>
+			<emissive>true</emissive>
+			<w>44</w>
+			<h>55</h>
+			<texture>
+				<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-gen2off.png</path>
+			</texture>
+			<transformations>
+				<transformation>
+					<type>y-shift</type>
+					<offset>-48</offset>
+				</transformation>
+				<transformation>
+					<type>x-shift</type>
+					<offset>106</offset>
+				</transformation>
+			</transformations>
+			<condition>
+				<equals>
+					<property>/controls/electrical/switches/gen2</property>
+					<value>0</value>
+				</equals>
+			</condition>
+		</layer>
 <!-- ################################## Bottom  #################################-->
 
 		<layer>
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index 000ba561..f24ef5a0 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -35,8 +35,8 @@ var elec_init = func {
 	setprop("/systems/electrical/bus/dc-ess", 0);
 	setprop("/systems/electrical/bus/ac1", 0);
 	setprop("/systems/electrical/bus/ac2", 0);
-	setprop("/systems/electrical/bus/ac1-hz", 0);
-	setprop("/systems/electrical/bus/ac2-hz", 0);
+	setprop("/systems/electrical/bus/gen1-hz", 0);
+	setprop("/systems/electrical/bus/gen2-hz", 0);
 	setprop("/systems/electrical/bus/ac-ess", 0);
 	setprop("/systems/electrical/extra/ext-volts", 0);
 	setprop("/systems/electrical/extra/apu-volts", 0);
@@ -151,12 +151,14 @@ var master_elec = func {
 	} else if (stateL == 3 and gen1_sw) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+		setprop("/systems/electrical/bus/gen1-hz", ac_hz_std);
 		setprop("/systems/electrical/bus/dc1", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); 
 	} else if (apu_ext_crosstie_sw == 1 and xtieL) {
 		setprop("/systems/electrical/bus/ac1", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+		setprop("/systems/electrical/bus/gen1-hz", ac_hz_std);
 		setprop("/systems/electrical/bus/dc1", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); 
@@ -196,12 +198,14 @@ var master_elec = func {
 	} else if (stateR == 3 and gen2_sw) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+		setprop("/systems/electrical/bus/gen2-hz", ac_hz_std);
 		setprop("/systems/electrical/bus/dc2", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); 
 	} else if (apu_ext_crosstie_sw == 1  and xtieR) {
 		setprop("/systems/electrical/bus/ac2", ac_volt_std);
 		setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
+		setprop("/systems/electrical/bus/gen2-hz", ac_hz_std);
 		setprop("/systems/electrical/bus/dc2", dc_volt_std);
 		setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
 		setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);