1
0
Fork 0

Add VOR / DME power supply and 3 second / 2 second BITE. Connect VOR to ACP

This commit is contained in:
Jonathan Redpath 2021-12-26 14:44:14 +00:00
parent ae6a566993
commit e5e3027402
5 changed files with 319 additions and 19 deletions

View file

@ -9038,8 +9038,6 @@
<kerning>default</kerning>
</text>
<text>
<name>dme1_0</name>
<offsets>
@ -9102,14 +9100,74 @@
<kerning>default</kerning>
</text>
<text>
<name>dme_flag</name>
<offsets>
<x-m>-0.529</x-m>
<y-m>-0.149</y-m>
<z-m>0.1305</z-m>
<heading-deg>90</heading-deg>
<roll-deg>72.81</roll-deg>
</offsets>
<alignment>right-center</alignment>
<axis-alignment>xy-plane</axis-alignment>
<type type="string">literal</type>
<text type="string">----</text>
<truncate>false</truncate>
<layout>left-to-right</layout>
<draw-text type="bool">true</draw-text> <!-- draw the text itself -->
<draw-alignment type="bool">false</draw-alignment> <!-- draw crosshair at object center -->
<draw-boundingbox type="bool">false</draw-boundingbox> <!-- draw a bounding box -->
<font>led.txf</font> <!-- The font file name, relative to data/Fonts -->
<character-size type="double">0.007</character-size> <!-- size (height) im meters -->
<character-aspect-ratio type="double">1.0</character-aspect-ratio>
<max-height>0.012</max-height> <!-- the maximum height of the text -->
<max-width>0.040</max-width> <!-- the maximum width of the text -->
<font-resolution>
<width type="int">32</width>
<height type="int">32</height>
</font-resolution>
<kerning>default</kerning>
</text>
<text>
<name>dme1_flag</name>
<offsets>
<x-m>-0.529</x-m>
<y-m>-0.116</y-m>
<z-m>0.1305</z-m>
<heading-deg>90</heading-deg>
<roll-deg>72.81</roll-deg>
</offsets>
<alignment>right-center</alignment>
<axis-alignment>xy-plane</axis-alignment>
<type type="string">literal</type>
<text type="string">----</text>
<truncate>false</truncate>
<layout>left-to-right</layout>
<draw-text type="bool">true</draw-text> <!-- draw the text itself -->
<draw-alignment type="bool">false</draw-alignment> <!-- draw crosshair at object center -->
<draw-boundingbox type="bool">false</draw-boundingbox> <!-- draw a bounding box -->
<font>led.txf</font> <!-- The font file name, relative to data/Fonts -->
<character-size type="double">0.007</character-size> <!-- size (height) im meters -->
<character-aspect-ratio type="double">1.0</character-aspect-ratio>
<max-height>0.012</max-height> <!-- the maximum height of the text -->
<max-width>0.040</max-width> <!-- the maximum width of the text -->
<font-resolution>
<width type="int">32</width>
<height type="int">32</height>
</font-resolution>
<kerning>default</kerning>
</text>
<animation>
<type>material</type>
<object-name>dme_0</object-name>
<object-name>dme</object-name>
<!-- <object-name>dme_20</object-name>-->
<object-name>dme_flag</object-name>
<object-name>dme1_0</object-name>
<object-name>dme1</object-name>
<!-- <object-name>dme1_20</object-name>-->
<object-name>dme1_flag</object-name>
<diffuse>
<red>1.00</red>
<green>0.355</green>
@ -9244,6 +9302,44 @@
</condition>
</animation>
<animation>
<type>select</type>
<object-name>dme_flag</object-name>
<condition>
<and>
<property>instrumentation/dme[2]/operable</property>
<not><property>instrumentation/dme[2]/in-range</property></not>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess</property>
<value>110.0</value>
</greater-than-equals>
<equals>
<property>instrumentation/ddrmi/vor-adf-1</property>
<value>1</value>
</equals>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>dme1_flag</object-name>
<condition>
<and>
<property>instrumentation/dme[3]/operable</property>
<not><property>instrumentation/dme[3]/in-range</property></not>
<greater-than-equals>
<property>systems/electrical/bus/ac-ess</property>
<value>110.0</value>
</greater-than-equals>
<equals>
<property>instrumentation/ddrmi/vor-adf-2</property>
<value>1</value>
</equals>
</and>
</condition>
</animation>
<!-- ND_L chrono -->
<animation>
<type>pick</type>

View file

@ -20,6 +20,10 @@ var adf1_capt_receive = props.globals.initNode("/controls/audio/acp[0]/adf1-reci
var adf1_capt_volume = props.globals.initNode("/controls/audio/acp[0]/adf1-volume", 1, "DOUBLE");
var adf2_capt_receive = props.globals.initNode("/controls/audio/acp[0]/adf2-recive", 0, "BOOL");
var adf2_capt_volume = props.globals.initNode("/controls/audio/acp[0]/adf2-volume", 1, "DOUBLE");
var vor1_capt_receive = props.globals.initNode("/controls/audio/acp[0]/vor1-recive", 0, "BOOL");
var vor1_capt_volume = props.globals.initNode("/controls/audio/acp[0]/vor1-volume", 1, "DOUBLE");
var vor2_capt_receive = props.globals.initNode("/controls/audio/acp[0]/vor2-recive", 0, "BOOL");
var vor2_capt_volume = props.globals.initNode("/controls/audio/acp[0]/vor2-volume", 1, "DOUBLE");
var vhf1_fo_recive = props.globals.initNode("/controls/audio/acp[1]/vhf1-recive", 1, "BOOL");
var vhf2_fo_recive = props.globals.initNode("/controls/audio/acp[1]/vhf2-recive", 1, "BOOL");
@ -29,6 +33,10 @@ var adf1_fo_receive = props.globals.initNode("/controls/audio/acp[1]/adf1-recive
var adf1_fo_volume = props.globals.initNode("/controls/audio/acp[1]/adf1-volume", 1, "DOUBLE");
var adf2_fo_receive = props.globals.initNode("/controls/audio/acp[1]/adf2-recive", 0, "BOOL");
var adf2_fo_volume = props.globals.initNode("/controls/audio/acp[1]/adf2-volume", 1, "DOUBLE");
var vor1_fo_receive = props.globals.initNode("/controls/audio/acp[1]/vor1-recive", 0, "BOOL");
var vor1_fo_volume = props.globals.initNode("/controls/audio/acp[1]/vor1-volume", 1, "DOUBLE");
var vor2_fo_receive = props.globals.initNode("/controls/audio/acp[1]/vor2-recive", 0, "BOOL");
var vor2_fo_volume = props.globals.initNode("/controls/audio/acp[1]/vor2-volume", 1, "DOUBLE");
var com1_volume = props.globals.getNode("instrumentation/comm[0]/volume");
var com2_volume = props.globals.getNode("instrumentation/comm[1]/volume");

View file

@ -117,6 +117,162 @@
</channel>
<channel name="VOR" execrate="8">
<switch name="/instrumentation/nav[2]/power-supply">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/ac-ess ge 110
</test>
</switch>
<actuator name="/instrumentation/nav[2]/power-supply-bite-enable">
<input>/instrumentation/nav[2]/power-supply</input>
<rate_limit sense="incr">100</rate_limit>
<rate_limit sense="decr">0.333</rate_limit>
</actuator>
<actuator name="/instrumentation/nav[2]/power-supply-bite-timer">
<input>/instrumentation/nav[2]/power-supply</input>
<rate_limit sense="incr">0.333</rate_limit>
<rate_limit sense="decr">100</rate_limit>
</actuator>
<switch name="/instrumentation/nav[2]/power-supply-was-off">
<default value="/instrumentation/nav[2]/power-supply-was-off"/>
<test logic="AND" value="0">
/instrumentation/nav[2]/power-supply-bite-timer eq 1
</test>
<test logic="AND" value="1">
/instrumentation/nav[2]/power-supply-bite-enable eq 0
</test>
</switch>
<switch name="/instrumentation/nav[2]/power-supply-node">
<default value="0"/>
<test logic="OR" value="/systems/electrical/bus/ac-ess">
/instrumentation/nav[2]/power-supply-was-off eq 0
/instrumentation/nav[2]/power-supply-bite-timer eq 1
</test>
</switch>
<switch name="/instrumentation/nav[3]/power-supply">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/ac-2 ge 110
</test>
</switch>
<actuator name="/instrumentation/nav[3]/power-supply-bite-enable">
<input>/instrumentation/nav[3]/power-supply</input>
<rate_limit sense="incr">100</rate_limit>
<rate_limit sense="decr">0.333</rate_limit>
</actuator>
<actuator name="/instrumentation/nav[3]/power-supply-bite-timer">
<input>/instrumentation/nav[3]/power-supply</input>
<rate_limit sense="incr">0.333</rate_limit>
<rate_limit sense="decr">100</rate_limit>
</actuator>
<switch name="/instrumentation/nav[3]/power-supply-was-off">
<default value="/instrumentation/nav[3]/power-supply-was-off"/>
<test logic="AND" value="0">
/instrumentation/nav[3]/power-supply-bite-timer eq 1
</test>
<test logic="AND" value="1">
/instrumentation/nav[3]/power-supply-bite-enable eq 0
</test>
</switch>
<switch name="/instrumentation/nav[3]/power-supply-node">
<default value="0"/>
<test logic="OR" value="/systems/electrical/bus/ac-2">
/instrumentation/nav[3]/power-supply-was-off eq 0
/instrumentation/nav[3]/power-supply-bite-timer eq 1
</test>
</switch>
</channel>
<channel name="VOR" execrate="8">
<switch name="/instrumentation/dme[0]/power-supply">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/ac-ess-shed ge 110
</test>
</switch>
<actuator name="/instrumentation/dme[0]/power-supply-bite-enable">
<input>/instrumentation/dme[0]/power-supply</input>
<rate_limit sense="incr">100</rate_limit>
<rate_limit sense="decr">0.5</rate_limit>
</actuator>
<actuator name="/instrumentation/dme[0]/power-supply-bite-timer">
<input>/instrumentation/dme[0]/power-supply</input>
<rate_limit sense="incr">0.5</rate_limit>
<rate_limit sense="decr">100</rate_limit>
</actuator>
<switch name="/instrumentation/dme[0]/power-supply-was-off">
<default value="/instrumentation/dme[0]/power-supply-was-off"/>
<test logic="AND" value="0">
/instrumentation/dme[0]/power-supply-bite-timer eq 1
</test>
<test logic="AND" value="1">
/instrumentation/dme[0]/power-supply-bite-enable eq 0
</test>
</switch>
<switch name="/instrumentation/dme[0]/power-supply-node">
<default value="0"/>
<test logic="OR" value="/systems/electrical/bus/ac-ess-shed">
/instrumentation/dme[0]/power-supply-was-off eq 0
/instrumentation/dme[0]/power-supply-bite-timer eq 1
</test>
</switch>
<switch name="/instrumentation/dme[1]/power-supply">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/ac-2 ge 110
</test>
</switch>
<actuator name="/instrumentation/dme[1]/power-supply-bite-enable">
<input>/instrumentation/dme[1]/power-supply</input>
<rate_limit sense="incr">100</rate_limit>
<rate_limit sense="decr">0.5</rate_limit>
</actuator>
<actuator name="/instrumentation/dme[1]/power-supply-bite-timer">
<input>/instrumentation/dme[1]/power-supply</input>
<rate_limit sense="incr">0.5</rate_limit>
<rate_limit sense="decr">100</rate_limit>
</actuator>
<switch name="/instrumentation/dme[1]/power-supply-was-off">
<default value="/instrumentation/dme[1]/power-supply-was-off"/>
<test logic="AND" value="0">
/instrumentation/dme[1]/power-supply-bite-timer eq 1
</test>
<test logic="AND" value="1">
/instrumentation/dme[1]/power-supply-bite-enable eq 0
</test>
</switch>
<switch name="/instrumentation/dme[1]/power-supply-node">
<default value="0"/>
<test logic="OR" value="/systems/electrical/bus/ac-2">
/instrumentation/dme[1]/power-supply-was-off eq 0
/instrumentation/dme[1]/power-supply-bite-timer eq 1
</test>
</switch>
</channel>
<channel name="ACP" execrate="8">
<switch name="/instrumentation/adf[0]/volume-norm">
@ -172,6 +328,42 @@
</test>
</test>
</switch>
<switch name="/instrumentation/nav[2]/volume">
<default value="0"/>
<test logic="AND" value="/controls/audio/acp[0]/vor1-volume">
/controls/audio/acp[0]/vor1-recive eq 1
<test logic="OR">
/controls/audio/acp[1]/vor1-recive eq 0
/controls/audio/acp[0]/vor1-volume ge /controls/audio/acp[1]/vor1-volume
</test>
</test>
<test logic="AND" value="/controls/audio/acp[1]/vor1-volume">
/controls/audio/acp[1]/vor1-recive eq 1
<test logic="OR">
/controls/audio/acp[0]/vor1-recive eq 0
/controls/audio/acp[0]/vor1-volume lt /controls/audio/acp[1]/vor1-volume
</test>
</test>
</switch>
<switch name="/instrumentation/nav[3]/volume">
<default value="0"/>
<test logic="AND" value="/controls/audio/acp[0]/vor2-volume">
/controls/audio/acp[0]/vor2-recive eq 1
<test logic="OR">
/controls/audio/acp[1]/vor2-recive eq 0
/controls/audio/acp[0]/vor2-volume ge /controls/audio/acp[1]/vor2-volume
</test>
</test>
<test logic="AND" value="/controls/audio/acp[1]/vor2-volume">
/controls/audio/acp[1]/vor2-recive eq 1
<test logic="OR">
/controls/audio/acp[0]/vor2-recive eq 0
/controls/audio/acp[0]/vor2-volume lt /controls/audio/acp[1]/vor2-volume
</test>
</test>
</switch>
</channel>

View file

@ -126,31 +126,31 @@
<eight-point-three>1</eight-point-three>
</comm-radio>
<dme>
<dme> <!-- fake extra dme units for the ILS -->
<name>dme</name>
<number>0</number>
<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply>
<power-supply>/instrumentation/dme[0]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</dme>
<dme>
<name>dme</name>
<number>1</number>
<power-supply>/systems/electrical/bus/ac-2</power-supply>
<power-supply>/instrumentation/dme[1]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</dme>
<dme> <!-- fake extra dme units for the ILS -->
<dme> <!-- VOR DME -->
<name>dme</name>
<number>2</number>
<power-supply>/systems/electrical/bus/ac-ess</power-supply>
<power-supply>/instrumentation/dme[0]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</dme>
<dme>
<name>dme</name>
<number>3</number>
<power-supply>/systems/electrical/bus/ac-2</power-supply>
<power-supply>/instrumentation/dme[1]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</dme>
@ -181,35 +181,35 @@
<marker-beacon> <!-- part of VOR1 unit -->
<name>marker-beacon</name>
<number>0</number>
<power-supply>/systems/electrical/bus/ac-ess</power-supply>
<power-supply>/instrumentation/nav[2]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</marker-beacon>
<nav-radio> <!-- VOR unit -->
<nav-radio> <!-- ILS unit -->
<name>nav</name>
<number>0</number>
<power-supply>/systems/electrical/bus/ac-ess</power-supply>
<power-supply>/instrumentation/nav[2]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</nav-radio>
<nav-radio>
<name>nav</name>
<number>1</number>
<power-supply>/systems/electrical/bus/ac-2</power-supply>
<power-supply>/instrumentation/nav[3]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</nav-radio>
<nav-radio> <!-- ILS unit -->
<nav-radio> <!-- VOR unit -->
<name>nav</name>
<number>2</number>
<power-supply>/systems/electrical/bus/ac-ess</power-supply>
<power-supply>/instrumentation/nav[2]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</nav-radio>
<nav-radio>
<name>nav</name>
<number>3</number>
<power-supply>/systems/electrical/bus/ac-2</power-supply>
<power-supply>/instrumentation/nav[3]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts>
</nav-radio>

View file

@ -1036,7 +1036,9 @@
<property>/instrumentation/adf[0]/indicated-bearing-deg</property>
<scale>-1.0</scale>
</input>
<input>-90</input>
<input>
<property>/instrumentation/ddrmi/needle-1</property>
</input>
<output>/instrumentation/ddrmi/needle-1</output>
</filter>
@ -1139,7 +1141,9 @@
<property>/instrumentation/adf[1]/indicated-bearing-deg</property>
<scale>-1.0</scale>
</input>
<input>-90</input>
<input>
<property>/instrumentation/ddrmi/needle-2</property>
</input>
<output>/instrumentation/ddrmi/needle-2</output>
</filter>