A3XX: Tie integrity lighting to electrical

This commit is contained in:
Joshua Davidson 2017-10-27 16:22:22 -04:00
parent b5f86ba9c0
commit 2de2727dc3
5 changed files with 27 additions and 17 deletions

View file

@ -565,15 +565,19 @@
<cockpit type="bool">0</cockpit> <cockpit type="bool">0</cockpit>
<cones type="bool">true</cones> <cones type="bool">true</cones>
<dome-norm type="double">0</dome-norm> <dome-norm type="double">0</dome-norm>
<fcu-panel-knb type="double">0</fcu-panel-knb>
<fcu-panel-norm type="double">0</fcu-panel-norm> <fcu-panel-norm type="double">0</fcu-panel-norm>
<landing-lights n="0" type="bool">0</landing-lights> <landing-lights n="0" type="bool">0</landing-lights>
<landing-lights n="1" type="double">0</landing-lights> <landing-lights n="1" type="bool">0</landing-lights>
<landing-lights n="2" type="double">0</landing-lights> <landing-lights n="2" type="bool">0</landing-lights>
<main-flood-knb type="double">0</main-flood-knb>
<main-flood-norm type="double">0</main-flood-norm> <main-flood-norm type="double">0</main-flood-norm>
<main-panel-knb type="double">0</main-panel-knb>
<main-panel-norm type="double">0</main-panel-norm> <main-panel-norm type="double">0</main-panel-norm>
<nav-lights-switch type="int">0</nav-lights-switch> <nav-lights-switch type="int">0</nav-lights-switch>
<overhead-panel-norm type="double">0.0</overhead-panel-norm> <overhead-panel-knb type="double">0</overhead-panel-knb>
<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm> <overhead-panel-norm type="double">0</overhead-panel-norm>
<main-panel-pedestal-norm type="double">0</main-panel-pedestal-norm>
<strobe type="bool">0</strobe> <strobe type="bool">0</strobe>
<taxi-light-switch type="float">0</taxi-light-switch> <taxi-light-switch type="float">0</taxi-light-switch>
</lighting> </lighting>

View file

@ -4640,7 +4640,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/main-flood-norm</property> <property>controls/lighting/main-flood-knb</property>
<step>0.05</step> <step>0.05</step>
<max>1</max> <max>1</max>
</binding> </binding>
@ -4651,7 +4651,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/main-flood-norm</property> <property>controls/lighting/main-flood-knb</property>
<step>-0.05</step> <step>-0.05</step>
<min>0</min> <min>0</min>
</binding> </binding>
@ -4660,7 +4660,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>flood_lt_main</object-name> <object-name>flood_lt_main</object-name>
<property>controls/lighting/main-flood-norm</property> <property>controls/lighting/main-flood-knb</property>
<interpolation> <interpolation>
<entry><ind>0</ind><dep>-129</dep></entry> <entry><ind>0</ind><dep>-129</dep></entry>
<entry><ind>1</ind><dep>129</dep></entry> <entry><ind>1</ind><dep>129</dep></entry>
@ -4679,7 +4679,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/main-panel-norm</property> <property>controls/lighting/main-panel-knb</property>
<step>0.05</step> <step>0.05</step>
<max>1</max> <max>1</max>
</binding> </binding>
@ -4690,7 +4690,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/main-panel-norm</property> <property>controls/lighting/main-panel-knb</property>
<step>-0.05</step> <step>-0.05</step>
<min>0</min> <min>0</min>
</binding> </binding>
@ -4699,7 +4699,7 @@
<animation> <animation>
<type>rotate</type> <type>rotate</type>
<object-name>integ_lt</object-name> <object-name>integ_lt</object-name>
<property>controls/lighting/main-panel-norm</property> <property>controls/lighting/main-panel-knb</property>
<interpolation> <interpolation>
<entry><ind>0</ind><dep>-129</dep></entry> <entry><ind>0</ind><dep>-129</dep></entry>
<entry><ind>1</ind><dep>129</dep></entry> <entry><ind>1</ind><dep>129</dep></entry>
@ -4718,7 +4718,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/fcu-panel-norm</property> <property>controls/lighting/fcu-panel-knb</property>
<step>0.05</step> <step>0.05</step>
<max>1</max> <max>1</max>
</binding> </binding>
@ -4729,7 +4729,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/fcu-panel-norm</property> <property>controls/lighting/fcu-panel-knb</property>
<step>-0.05</step> <step>-0.05</step>
<min>0</min> <min>0</min>
</binding> </binding>
@ -4739,7 +4739,7 @@
<!--animation> <!--animation>
<type>rotate</type> <type>rotate</type>
<object-name>fcu_integ_knb</object-name> <object-name>fcu_integ_knb</object-name>
<property>controls/lighting/fcu-panel-norm</property> <property>controls/lighting/fcu-panel-knb</property>
<factor>10</factor> <factor>10</factor>
<axis> <axis>
<x1-m>-0.45533</x1-m> <x1-m>-0.45533</x1-m>

View file

@ -5738,7 +5738,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/overhead-panel-norm</property> <property>controls/lighting/overhead-panel-knb</property>
<step>0.05</step> <step>0.05</step>
<max>1</max> <max>1</max>
</binding> </binding>
@ -5749,7 +5749,7 @@
<repeatable>true</repeatable> <repeatable>true</repeatable>
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>controls/lighting/overhead-panel-norm</property> <property>controls/lighting/overhead-panel-knb</property>
<step>-0.05</step> <step>-0.05</step>
<min>0</min> <min>0</min>
</binding> </binding>
@ -5759,7 +5759,7 @@
<name>Overhead panel light rotate</name> <name>Overhead panel light rotate</name>
<type>rotate</type> <type>rotate</type>
<object-name>OHPMarkLtKnb</object-name> <object-name>OHPMarkLtKnb</object-name>
<property>controls/lighting/overhead-panel-norm</property> <property>controls/lighting/overhead-panel-knb</property>
<interpolation> <interpolation>
<entry><ind>0</ind><dep>129</dep></entry> <entry><ind>0</ind><dep>129</dep></entry>
<entry><ind>1</ind><dep>-129</dep></entry> <entry><ind>1</ind><dep>-129</dep></entry>

View file

@ -477,6 +477,9 @@ var master_elec = func {
setprop("/systems/electrical/outputs/taxi-lights", 0); setprop("/systems/electrical/outputs/taxi-lights", 0);
setprop("/systems/electrical/outputs/transponder", 0); setprop("/systems/electrical/outputs/transponder", 0);
setprop("/systems/electrical/outputs/turn-coordinator", 0); setprop("/systems/electrical/outputs/turn-coordinator", 0);
setprop("/controls/lighting/fcu-panel-norm", 0);
setprop("/controls/lighting/main-panel-norm", 0);
setprop("/controls/lighting/overhead-panel-norm", 0);
} else { } else {
setprop("/systems/electrical/on", 1); setprop("/systems/electrical/on", 1);
# aispin.start(); # aispin.start();
@ -511,6 +514,9 @@ var master_elec = func {
setprop("/systems/electrical/outputs/taxi-lights", dc_volt_std); setprop("/systems/electrical/outputs/taxi-lights", dc_volt_std);
setprop("/systems/electrical/outputs/transponder", dc_volt_std); setprop("/systems/electrical/outputs/transponder", dc_volt_std);
setprop("/systems/electrical/outputs/turn-coordinator", dc_volt_std); setprop("/systems/electrical/outputs/turn-coordinator", dc_volt_std);
setprop("/controls/lighting/fcu-panel-norm", getprop("/controls/lighting/fcu-panel-knb"));
setprop("/controls/lighting/main-panel-norm", getprop("/controls/lighting/main-panel-knb"));
setprop("/controls/lighting/overhead-panel-norm", getprop("/controls/lighting/overhead-panel-knb"));
} }
# Fault lights # Fault lights

View file

@ -1 +1 @@
3017 3018