1
0
Fork 0

RMP: add extra frequency digit to ADF. ADF power supply: add 2 second BITE after power off > 2 second

This commit is contained in:
Jonathan Redpath 2021-12-24 20:04:55 +00:00
parent 1e93076a83
commit da6104dc5a
5 changed files with 92 additions and 16 deletions

View file

@ -151,7 +151,7 @@
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/ddrmi/vor-adf-1</property> <property>instrumentation/ddrmi/vor-adf-1</property>
<min>-1</min> <min>0</min>
<max>1</max> <max>1</max>
</binding> </binding>
</action> </action>
@ -163,8 +163,7 @@
<object-name>ddrmi_vor_adf_select_1</object-name> <object-name>ddrmi_vor_adf_select_1</object-name>
<property>instrumentation/ddrmi/vor-adf-1</property> <property>instrumentation/ddrmi/vor-adf-1</property>
<interpolation> <interpolation>
<entry><ind>-1</ind><dep>90</dep></entry> <!-- ADF --> <entry><ind> 0</ind><dep>90</dep></entry> <!-- ADF -->
<entry><ind> 0</ind><dep>45</dep></entry> <!-- OFF -->
<entry><ind> 1</ind><dep> 0</dep></entry> <!-- VOR --> <entry><ind> 1</ind><dep> 0</dep></entry> <!-- VOR -->
</interpolation> </interpolation>
<axis> <axis>
@ -183,7 +182,7 @@
<binding> <binding>
<command>property-adjust</command> <command>property-adjust</command>
<property>instrumentation/ddrmi/vor-adf-2</property> <property>instrumentation/ddrmi/vor-adf-2</property>
<min>-1</min> <min>0</min>
<max>1</max> <max>1</max>
</binding> </binding>
</action> </action>
@ -195,8 +194,7 @@
<object-name>ddrmi_vor_adf_select_2</object-name> <object-name>ddrmi_vor_adf_select_2</object-name>
<property>instrumentation/ddrmi/vor-adf-2</property> <property>instrumentation/ddrmi/vor-adf-2</property>
<interpolation> <interpolation>
<entry><ind>-1</ind><dep>-90</dep></entry> <!-- ADF --> <entry><ind> 0</ind><dep>-90</dep></entry> <!-- ADF -->
<entry><ind> 0</ind><dep>-45</dep></entry> <!-- OFF -->
<entry><ind> 1</ind><dep> 0</dep></entry> <!-- VOR --> <entry><ind> 1</ind><dep> 0</dep></entry> <!-- VOR -->
</interpolation> </interpolation>
<axis> <axis>

View file

@ -277,11 +277,11 @@ var update_displays_nav = func(nav) {
stby_display_rmp2.setValue(sprintf("%3.2f", stby_vor2.getValue())); stby_display_rmp2.setValue(sprintf("%3.2f", stby_vor2.getValue()));
} }
} else if (nav == 5 and chan1 == "adf") { } else if (nav == 5 and chan1 == "adf") {
act_display_rmp1.setValue(sprintf("%4.0f", act_adf1.getValue())); act_display_rmp1.setValue(sprintf("%4.2f", act_adf1.getValue()));
stby_display_rmp1.setValue(sprintf("%4.0f", stby_adf1.getValue())); stby_display_rmp1.setValue(sprintf("%4.2f", stby_adf1.getValue()));
} else if (nav == 6 and chan2 == "adf") { } else if (nav == 6 and chan2 == "adf") {
act_display_rmp2.setValue(sprintf("%4.0f", act_adf2.getValue())); act_display_rmp2.setValue(sprintf("%4.2f", act_adf2.getValue()));
stby_display_rmp2.setValue(sprintf("%4.0f", stby_adf2.getValue())); stby_display_rmp2.setValue(sprintf("%4.2f", stby_adf2.getValue()));
} }
} }

View file

@ -39,6 +39,84 @@
</channel> </channel>
<channel name="ADF" execrate="8">
<switch name="/instrumentation/adf[0]/power-supply">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/ac-ess-shed ge 110
</test>
</switch>
<actuator name="/instrumentation/adf[0]/power-supply-bite-enable">
<input>/instrumentation/adf[0]/power-supply</input>
<rate_limit sense="incr">100</rate_limit>
<rate_limit sense="decr">0.5</rate_limit>
</actuator>
<actuator name="/instrumentation/adf[0]/power-supply-bite-timer">
<input>/instrumentation/adf[0]/power-supply</input>
<rate_limit sense="incr">0.5</rate_limit>
<rate_limit sense="decr">100</rate_limit>
</actuator>
<switch name="/instrumentation/adf[0]/power-supply-was-off">
<default value="/instrumentation/adf[0]/power-supply-was-off"/>
<test logic="AND" value="0">
/instrumentation/adf[0]/power-supply-bite-timer eq 1
</test>
<test logic="AND" value="1">
/instrumentation/adf[0]/power-supply-bite-enable eq 0
</test>
</switch>
<switch name="/instrumentation/adf[0]/power-supply-node">
<default value="0"/>
<test logic="OR" value="/systems/electrical/bus/ac-ess-shed">
/instrumentation/adf[0]/power-supply-was-off eq 0
/instrumentation/adf[0]/power-supply-bite-timer eq 1
</test>
</switch>
<switch name="/instrumentation/adf[1]/power-supply">
<default value="0"/>
<test logic="AND" value="1">
/systems/electrical/bus/ac-2 ge 110
</test>
</switch>
<actuator name="/instrumentation/adf[1]/power-supply-bite-enable">
<input>/instrumentation/adf[1]/power-supply</input>
<rate_limit sense="incr">100</rate_limit>
<rate_limit sense="decr">0.5</rate_limit>
</actuator>
<actuator name="/instrumentation/adf[1]/power-supply-bite-timer">
<input>/instrumentation/adf[1]/power-supply</input>
<rate_limit sense="incr">0.5</rate_limit>
<rate_limit sense="decr">100</rate_limit>
</actuator>
<switch name="/instrumentation/adf[1]/power-supply-was-off">
<default value="/instrumentation/adf[1]/power-supply-was-off"/>
<test logic="AND" value="0">
/instrumentation/adf[1]/power-supply-bite-timer eq 1
</test>
<test logic="AND" value="1">
/instrumentation/adf[1]/power-supply-bite-enable eq 0
</test>
</switch>
<switch name="/instrumentation/adf[1]/power-supply-node">
<default value="0"/>
<test logic="OR" value="/systems/electrical/bus/ac-2">
/instrumentation/adf[1]/power-supply-was-off eq 0
/instrumentation/adf[1]/power-supply-bite-timer eq 1
</test>
</switch>
</channel>
<channel name="ACP" execrate="8"> <channel name="ACP" execrate="8">
<switch name="/instrumentation/adf[0]/volume-norm"> <switch name="/instrumentation/adf[0]/volume-norm">

View file

@ -9,14 +9,14 @@
<adf> <adf>
<name>adf</name> <name>adf</name>
<number>0</number> <number>0</number>
<power-supply>/systems/electrical/bus/ac-ess-shed</power-supply> <power-supply>/instrumentation/adf[0]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts> <minimum-supply-volts>109.9</minimum-supply-volts>
</adf> </adf>
<adf> <adf>
<name>adf</name> <name>adf</name>
<number>1</number> <number>1</number>
<power-supply>/systems/electrical/bus/ac-2</power-supply> <power-supply>/instrumentation/adf[1]/power-supply-node</power-supply>
<minimum-supply-volts>109.9</minimum-supply-volts> <minimum-supply-volts>109.9</minimum-supply-volts>
</adf> </adf>

View file

@ -1007,7 +1007,7 @@
</greater-than-equals> </greater-than-equals>
<equals> <equals>
<property>/instrumentation/ddrmi/vor-adf-1</property> <property>/instrumentation/ddrmi/vor-adf-1</property>
<value>-1</value> <value>0</value>
</equals> </equals>
<equals> <equals>
<property>/instrumentation/adf[0]/in-range</property> <property>/instrumentation/adf[0]/in-range</property>
@ -1110,7 +1110,7 @@
</greater-than-equals> </greater-than-equals>
<equals> <equals>
<property>/instrumentation/ddrmi/vor-adf-2</property> <property>/instrumentation/ddrmi/vor-adf-2</property>
<value>-1</value> <value>0</value>
</equals> </equals>
<equals> <equals>
<property>/instrumentation/adf[1]/in-range</property> <property>/instrumentation/adf[1]/in-range</property>
@ -1186,7 +1186,7 @@
<and> <and>
<equals> <equals>
<property>/instrumentation/ddrmi/vor-adf-1</property> <property>/instrumentation/ddrmi/vor-adf-1</property>
<value>-1</value> <value>0</value>
</equals> </equals>
<equals> <equals>
<property>/instrumentation/adf[0]/in-range</property> <property>/instrumentation/adf[0]/in-range</property>
@ -1246,7 +1246,7 @@
<and> <and>
<equals> <equals>
<property>/instrumentation/ddrmi/vor-adf-2</property> <property>/instrumentation/ddrmi/vor-adf-2</property>
<value>-1</value> <value>0</value>
</equals> </equals>
<equals> <equals>
<property>/instrumentation/adf[1]/in-range</property> <property>/instrumentation/adf[1]/in-range</property>