fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #18 from legoboyvdlp/master

Browse source 
Electrical ECAM
This commit is contained in:
Joshua Davidson 2017-05-05 12:22:38 -04:00 committed by GitHub
commit 12b3c33685
9 changed files with 413 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Models/Instruments/ECAM/page-apu.xml
View file

@ -159,7 +159,7 @@
<chunks> <chunks>
<chunk> <chunk>
<type>number-value</type> <type>number-value</type>
<property>/systems/electrical/suppliers/apu-v</property> <property>/systems/electrical/extra/apu-volts</property>
<format type="string">%3.0f</format> <format type="string">%3.0f</format>
</chunk> </chunk>
</chunks> </chunks>
@ -170,7 +170,7 @@
</transformation> </transformation>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>-80</offset> <offset>-84</offset>
</transformation> </transformation>
</transformations> </transformations>
</layer> </layer>

412
Models/Instruments/ECAM/page-elec.xml
View file

@ -213,19 +213,9 @@
</equals> </equals>
</condition> </condition>
</layer> </layer>
<layer> <layer>
<type>text</type> <type>text</type>
<name>GEN1</name> <name>GEN1-volts</name>
<color> <color>
<red>0</red> <red>0</red>
<green>1.0</green> <green>1.0</green>
@ -236,7 +226,7 @@
<chunks> <chunks>
<chunk> <chunk>
<type>number-value</type> <type>number-value</type>
<property>/systems/electrical/suppliers/gen1-v</property><!-- There is no TAT temperature property--> <property>/systems/electrical/bus/ac1</property>
<format type="string">%3.0f</format> <format type="string">%3.0f</format>
</chunk> </chunk>
</chunks> </chunks>
@ -247,15 +237,20 @@
</transformation> </transformation>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>-116</offset> <offset>-117</offset>
</transformation> </transformation>
</transformations> </transformations>
<condition>
<equals>
<property>/controls/electrical/switches/gen1</property>
<value>1</value>
</equals>
</condition>
</layer> </layer>
<layer> <layer>
<type>text</type> <type>text</type>
<name>GEN2</name> <name>GEN2-volts</name>
<color> <color>
<red>0</red> <red>0</red>
<green>1.0</green> <green>1.0</green>
@ -266,7 +261,7 @@
<chunks> <chunks>
<chunk> <chunk>
<type>number-value</type> <type>number-value</type>
<property>/systems/electrical/suppliers/gen2-v</property><!-- There is no TAT temperature property--> <property>/systems/electrical/bus/ac2</property>
<format type="string">%3.0f</format> <format type="string">%3.0f</format>
</chunk> </chunk>
</chunks> </chunks>
@ -277,13 +272,17 @@
</transformation> </transformation>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>92</offset> <offset>91</offset>
</transformation> </transformation>
</transformations> </transformations>
<condition>
<equals>
<property>/controls/electrical/switches/gen2</property>
<value>1</value>
</equals>
</condition>
</layer> </layer>
<layer> <layer>
<type>text</type> <type>text</type>
<name>APU-V</name> <name>APU-V</name>
<color> <color>
@ -292,26 +291,77 @@
<blue>0</blue> <blue>0</blue>
</color> </color>
<font>helvetica_bold</font> <font>helvetica_bold</font>
<point-size>11</point-size> <point-size>10</point-size>
<chunks> <chunks>
<chunk> <chunk>
<type>number-value</type> <type>number-value</type>
<property>/systems/electrical/suppliers/apu-v</property><!-- There is no TAT temperature property--> <property>/systems/electrical/extra/apu-volts</property>
<format type="string">%3.0f</format> <format type="string">%3.0f</format>
</chunk> </chunk>
</chunks> </chunks>
<transformations> <transformations>
<transformation> <transformation>
<type>y-shift</type> <type>y-shift</type>
<offset>-66</offset> <offset>-58</offset>
</transformation> </transformation>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>-24</offset> <offset>-24</offset>
</transformation> </transformation>
</transformations> </transformations>
<condition>
<and>
<equals>
<property>/controls/electrical/switches/gen-apu</property>
<value>1</value>
</equals>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>0</value>
</equals>
</and>
</condition>
</layer>
<layer>
<type>text</type>
<name>APU-H</name>
<color>
<red>0</red>
<green>1.0</green>
<blue>0</blue>
</color>
<font>helvetica_bold</font>
<point-size>10</point-size>
<chunks>
<chunk>
<type>number-value</type>
<property>/systems/electrical/extra/apu-hz</property>
<format type="string">%3.0f</format>
</chunk>
</chunks>
<transformations>
<transformation>
<type>y-shift</type>
<offset>-67</offset>
</transformation>
<transformation>
<type>x-shift</type>
<offset>-24</offset>
</transformation>
</transformations>
<condition>
<and>
<equals>
<property>/controls/electrical/switches/gen-apu</property>
<value>1</value>
</equals>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>0</value>
</equals>
</and>
</condition>
</layer> </layer>
<layer> <layer>
<type>text</type> <type>text</type>
@ -322,26 +372,334 @@
<blue>0</blue> <blue>0</blue>
</color> </color>
<font>helvetica_bold</font> <font>helvetica_bold</font>
<point-size>11</point-size> <point-size>10</point-size>
<chunks> <chunks>
<chunk> <chunk>
<type>number-value</type> <type>number-value</type>
<property>/systems/electrical/suppliers/ext-power-v</property><!-- There is no TAT temperature property--> <property>/systems/electrical/extra/ext-volts</property>
<format type="string">%3.0f</format> <format type="string">%3.0f</format>
</chunk> </chunk>
</chunks> </chunks>
<transformations> <transformations>
<transformation> <transformation>
<type>y-shift</type> <type>y-shift</type>
<offset>-54</offset> <offset>-53</offset>
</transformation> </transformation>
<transformation> <transformation>
<type>x-shift</type> <type>x-shift</type>
<offset>37</offset> <offset>32</offset>
</transformation> </transformation>
</transformations> </transformations>
<condition>
<and>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>1</value>
</equals>
<equals>
<property>/controls/switches/cart</property>
<value>1</value>
</equals>
</and>
</condition>
</layer>
<layer>
<type>text</type>
<name>EXT-V</name>
<color>
<red>0</red>
<green>1.0</green>
<blue>0</blue>
</color>
<font>helvetica_bold</font>
<point-size>10</point-size>
<chunks>
<chunk>
<type>number-value</type>
<property>/systems/electrical/extra/ext-volts</property>
<format type="string">%3.0f</format>
</chunk>
</chunks>
<transformations>
<transformation>
<type>y-shift</type>
<offset>-53</offset>
</transformation>
<transformation>
<type>x-shift</type>
<offset>32</offset>
</transformation>
</transformations>
<condition>
<and>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>1</value>
</equals>
<equals>
<property>/controls/switches/cart</property>
<value>1</value>
</equals>
</and>
</condition>
</layer>
<layer>
<type>text</type>
<name>EXT-H</name>
<color>
<red>0</red>
<green>1.0</green>
<blue>0</blue>
</color>
<font>helvetica_bold</font>
<point-size>10</point-size>
<chunks>
<chunk>
<type>number-value</type>
<property>/systems/electrical/extra/ext-hz</property>
<format type="string">%3.0f</format>
</chunk>
</chunks>
<transformations>
<transformation>
<type>y-shift</type>
<offset>-63</offset>
</transformation>
<transformation>
<type>x-shift</type>
<offset>32</offset>
</transformation>
</transformations>
<condition>
<and>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>1</value>
</equals>
<equals>
<property>/controls/switches/cart</property>
<value>1</value>
</equals>
</and>
</condition>
</layer>
<layer>
<name>apugen</name>
<emissive>true</emissive>
<w>42</w>
<h>42</h>
<texture>
<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-apu-gen-off.png</path>
</texture>
<transformations>
<transformation>
<type>y-shift</type>
<offset>-53</offset>
</transformation>
<transformation>
<type>x-shift</type>
<offset>-11</offset>
</transformation>
</transformations>
<condition>
<and>
<equals>
<property>/controls/electrical/switches/gen-apu</property>
<value>0</value>
</equals>
<equals>
<property>/controls/APU/master</property>
<value>1</value>
</equals>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>0</value>
</equals>
</and>
</condition>
</layer>
<layer>
<name>apugenno</name>
<emissive>true</emissive>
<w>42</w>
<h>42</h>
<texture>
<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-apu-gen-no.png</path>
</texture>
<transformations>
<transformation>
<type>y-shift</type>
<offset>-53</offset>
</transformation>
<transformation>
<type>x-shift</type>
<offset>-11</offset>
</transformation>
</transformations>
<condition>
<or>
<equals>
<property>/controls/APU/master</property>
<value>0</value>
</equals>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>1</value>
</equals>
</or>
</condition>
</layer>
<layer>
<name>noextpwr</name>
<emissive>true</emissive>
<w>55</w>
<h>38</h>
<texture>
<path>Aircraft/A320Family/Models/Instruments/ECAM/res/elec-extpwroff.png</path>
</texture>
<transformations>
<transformation>
<type>y-shift</type>
<offset>-50</offset>
</transformation>
<transformation>
<type>x-shift</type>
<offset>44</offset>
</transformation>
</transformations>
<condition>
<and>
<equals>
<property>/controls/electrical/switches/gen-ext</property>
<value>0</value>
</equals>
<equals>
<property>/controls/switches/cart</property>
<value>0</value>
</equals>
</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>
<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 #################################--> <!-- ################################## Bottom #################################-->
<layer> <layer>

BIN
Models/Instruments/ECAM/res/elec-apu-gen-no.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
Models/Instruments/ECAM/res/elec-apu-gen-off.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Models/Instruments/ECAM/res/elec-apu-gen.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.7 KiB

BIN
Models/Instruments/ECAM/res/elec-extpwr.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
Models/Instruments/ECAM/res/elec-extpwroff.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 534 B

BIN
Models/Instruments/ECAM/res/page-elec.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 46 KiB

28
Nasal/electrical.nas
View file

@ -35,9 +35,13 @@ var elec_init = func {
setprop("/systems/electrical/bus/dc-ess", 0); setprop("/systems/electrical/bus/dc-ess", 0);
setprop("/systems/electrical/bus/ac1", 0); setprop("/systems/electrical/bus/ac1", 0);
setprop("/systems/electrical/bus/ac2", 0); setprop("/systems/electrical/bus/ac2", 0);
setprop("/systems/electrical/bus/ac1-hz", 0); setprop("/systems/electrical/bus/gen1-hz", 0);
setprop("/systems/electrical/bus/ac2-hz", 0); setprop("/systems/electrical/bus/gen2-hz", 0);
setprop("/systems/electrical/bus/ac-ess", 0); setprop("/systems/electrical/bus/ac-ess", 0);
setprop("/systems/electrical/extra/ext-volts", 0);
setprop("/systems/electrical/extra/apu-volts", 0);
setprop("/systems/electrical/extra/ext-hz", 0);
setprop("/systems/electrical/extra/apu-hz", 0);
setprop("systems/electrical/on", 0); setprop("systems/electrical/on", 0);
setprop("/controls/electrical/xtie/xtieL", 0); setprop("/controls/electrical/xtie/xtieL", 0);
setprop("/controls/electrical/xtie/xtieR", 0); setprop("/controls/electrical/xtie/xtieR", 0);
@ -131,29 +135,39 @@ var master_elec = func {
if (extpwr_on and gen_ext_sw) { if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std); setprop("/systems/electrical/bus/ac1", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std); setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
setprop("/systems/electrical/extra/ext-volts", ac_volt_std);
setprop("/systems/electrical/extra/ext-hz", ac_volt_std);
setprop("/systems/electrical/bus/dc1", dc_volt_std); setprop("/systems/electrical/bus/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std); setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
} else if (rpmapu >= 94.9 and gen_apu_sw) { } else if (rpmapu >= 94.9 and gen_apu_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std); setprop("/systems/electrical/bus/ac1", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std); setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
setprop("/systems/electrical/extra/apu-volts", ac_volt_std);
setprop("/systems/electrical/extra/apu-hz", ac_volt_std);
setprop("/systems/electrical/bus/dc1", dc_volt_std); setprop("/systems/electrical/bus/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std); setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
} else if (stateL == 3 and gen1_sw) { } else if (stateL == 3 and gen1_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std); setprop("/systems/electrical/bus/ac1", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", 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/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std); setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
} else if (apu_ext_crosstie_sw == 1 and xtieL) { } else if (apu_ext_crosstie_sw == 1 and xtieL) {
setprop("/systems/electrical/bus/ac1", ac_volt_std); setprop("/systems/electrical/bus/ac1", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", 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/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std); setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std); setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
} else { } else {
setprop("/systems/electrical/bus/ac1", 0); setprop("/systems/electrical/bus/ac1", 0);
setprop("/systems/electrical/extra/ext-volts", 0);
setprop("/systems/electrical/extra/apu-volts", 0);
setprop("/systems/electrical/extra/ext-hz", 0);
setprop("/systems/electrical/extra/apu-hz", 0);
if (getprop("/systems/electrical/bus/ac2") == 0) { if (getprop("/systems/electrical/bus/ac2") == 0) {
setprop("/systems/electrical/bus/ac-ess", 0); setprop("/systems/electrical/bus/ac-ess", 0);
} }
@ -168,29 +182,39 @@ var master_elec = func {
if (extpwr_on and gen_ext_sw) { if (extpwr_on and gen_ext_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std); setprop("/systems/electrical/bus/ac2", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std); setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
setprop("/systems/electrical/extra/ext-volts", ac_volt_std);
setprop("/systems/electrical/extra/ext-hz", ac_hz_std);
setprop("/systems/electrical/bus/dc2", dc_volt_std); setprop("/systems/electrical/bus/dc2", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std); setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);
} else if (rpmapu >= 94.9 and gen_apu_sw) { } else if (rpmapu >= 94.9 and gen_apu_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std); setprop("/systems/electrical/bus/ac2", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", ac_volt_std); setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
setprop("/systems/electrical/extra/apu-volts", ac_volt_std);
setprop("/systems/electrical/extra/apu-hz", ac_hz_std);
setprop("/systems/electrical/bus/dc2", dc_volt_std); setprop("/systems/electrical/bus/dc2", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std); setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);
} else if (stateR == 3 and gen2_sw) { } else if (stateR == 3 and gen2_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std); setprop("/systems/electrical/bus/ac2", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", 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/dc2", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std); setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);
} else if (apu_ext_crosstie_sw == 1 and xtieR) { } else if (apu_ext_crosstie_sw == 1 and xtieR) {
setprop("/systems/electrical/bus/ac2", ac_volt_std); setprop("/systems/electrical/bus/ac2", ac_volt_std);
setprop("/systems/electrical/bus/ac-ess", 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/dc2", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std); setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc2-amps", dc_amps_std); setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);
} else { } else {
setprop("/systems/electrical/bus/ac2", 0); setprop("/systems/electrical/bus/ac2", 0);
setprop("/systems/electrical/extra/ext-volts", 0);
setprop("/systems/electrical/extra/apu-volts", 0);
setprop("/systems/electrical/extra/ext-hz", 0);
setprop("/systems/electrical/extra/apu-hz", 0);
if (getprop("/systems/electrical/bus/ac1") == 0) { if (getprop("/systems/electrical/bus/ac1") == 0) {
setprop("/systems/electrical/bus/ac-ess", 0); setprop("/systems/electrical/bus/ac-ess", 0);
} }