make APU GEN elec ECAM work, without the green lines to ACBUS

This commit is contained in:
Jonathan Redpath 2017-05-04 21:06:21 +01:00
parent f85bd78ed3
commit d1556090aa
7 changed files with 96 additions and 21 deletions

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>

View file

@ -213,19 +213,10 @@
</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 +227,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 +238,21 @@
</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 +263,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 +274,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>
@ -296,7 +297,7 @@
<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>
@ -310,6 +311,12 @@
<offset>-24</offset> <offset>-24</offset>
</transformation> </transformation>
</transformations> </transformations>
<condition>
<equals>
<property>/controls/electrical/switches/gen-apu</property>
<value>1</value>
</equals>
</condition>
</layer> </layer>
<layer> <layer>
@ -326,7 +333,7 @@
<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><!-- There is no TAT temperature property-->
<format type="string">%3.0f</format> <format type="string">%3.0f</format>
</chunk> </chunk>
</chunks> </chunks>
@ -341,6 +348,64 @@
</transformation> </transformation>
</transformations> </transformations>
</layer> </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>
</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>
<and>
<equals>
<property>/controls/APU/master</property>
<value>0</value>
</equals>
</and>
</condition>
</layer>
<!-- ################################## Bottom #################################--> <!-- ################################## Bottom #################################-->

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View file

@ -38,6 +38,8 @@ var elec_init = func {
setprop("/systems/electrical/bus/ac1-hz", 0); setprop("/systems/electrical/bus/ac1-hz", 0);
setprop("/systems/electrical/bus/ac2-hz", 0); setprop("/systems/electrical/bus/ac2-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/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,12 +133,14 @@ 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/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/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);
@ -154,6 +158,8 @@ var master_elec = func {
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);
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,12 +174,14 @@ 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/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/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);
@ -191,6 +199,8 @@ var master_elec = func {
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);
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);
} }