fly/A320-family
1
0
Fork 0
Code Activity

DDRMI: update power supply to AC ESS; fix inverted rotate animation; add dependance on ADIRS and ATT HDG

Browse source
This commit is contained in:
Jonathan Redpath 2021-12-23 15:45:00 +00:00
parent 3712fdf89f
commit cf6a24c06d
2 changed files with 151 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Models/FlightDeck/a320.flightdeck.xml
View file

@ -111,6 +111,7 @@
<type>rotate</type>
<object-name>ddrmi_hdg</object-name>
<property>instrumentation/ddrmi/heading</property>
<factor>-1</factor>
<axis>
<object-name>ddrmi_hdg.axis</object-name>
</axis>
@ -121,6 +122,7 @@
<object-name>ddrmi_pointer_1</object-name>
<type>rotate</type>
<property>instrumentation/ddrmi/needle-1</property>
<factor>-1</factor>
<axis>
<object-name>ddrmi_hdg.axis</object-name>
</axis>
@ -131,6 +133,7 @@
<object-name>ddrmi_pointer_2</object-name>
<type>rotate</type>
<property>instrumentation/ddrmi/needle-2</property>
<factor>-1</factor>
<axis>
<object-name>ddrmi_hdg.axis</object-name>
</axis>
@ -9149,8 +9152,8 @@
</greater-than>
</or>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>instrumentation/ddrmi/vor-adf-1</property>
@ -9176,8 +9179,8 @@
<value>20</value>
</less-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>instrumentation/ddrmi/vor-adf-1</property>
@ -9205,8 +9208,8 @@
</greater-than>
</or>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>instrumentation/ddrmi/vor-adf-2</property>
@ -9232,8 +9235,8 @@
<value>20.0</value>
</less-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25.0</value>
<property>systems/electrical/bus/ac-ess</property>
<value>110.0</value>
</greater-than-equals>
<equals>
<property>instrumentation/ddrmi/vor-adf-2</property>

182
Systems/libraries.xml
View file

@ -909,13 +909,27 @@
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>/systems/navigation/aligned-1</property>
<value>1</value>
</equals> <!-- TODO ATT HDG SWITCH -->
<or>
<and>
<property>/systems/navigation/aligned-1</property>
<not>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</not>
</and>
<and>
<property>/systems/navigation/aligned-3</property>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</and>
</or>
</and>
</condition>
</enable>
@ -950,8 +964,8 @@
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>/instrumentation/ddrmi/vor-adf-1</property>
@ -961,10 +975,24 @@
<property>/instrumentation/nav[2]/in-range</property>
<value>1</value>
</equals>
<equals>
<property>/systems/navigation/aligned-1</property>
<value>1</value>
</equals>
<or>
<and>
<property>/systems/navigation/aligned-1</property>
<not>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</not>
</and>
<and>
<property>/systems/navigation/aligned-3</property>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</and>
</or>
</and>
</condition>
<property>/instrumentation/ddrmi/vor-1-error</property>
@ -974,8 +1002,8 @@
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>/instrumentation/ddrmi/vor-adf-1</property>
@ -985,10 +1013,24 @@
<property>/instrumentation/adf[0]/in-range</property>
<value>1</value>
</equals>
<equals>
<property>/systems/navigation/aligned-1</property>
<value>1</value>
</equals>
<or>
<and>
<property>/systems/navigation/aligned-1</property>
<not>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</not>
</and>
<and>
<property>/systems/navigation/aligned-3</property>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</and>
</or>
</and>
</condition>
<property>/instrumentation/adf[0]/indicated-bearing-deg</property>
@ -1025,8 +1067,8 @@
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>/instrumentation/ddrmi/vor-adf-2</property>
@ -1036,10 +1078,24 @@
<property>/instrumentation/nav[3]/in-range</property>
<value>1</value>
</equals>
<equals>
<property>/systems/navigation/aligned-1</property>
<value>1</value>
</equals>
<or>
<and>
<property>/systems/navigation/aligned-1</property>
<not>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</not>
</and>
<and>
<property>/systems/navigation/aligned-3</property>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</and>
</or>
</and>
</condition>
<property>/instrumentation/ddrmi/vor-2-error</property>
@ -1049,8 +1105,8 @@
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>/instrumentation/ddrmi/vor-adf-2</property>
@ -1060,10 +1116,24 @@
<property>/instrumentation/adf[1]/in-range</property>
<value>1</value>
</equals>
<equals>
<property>/systems/navigation/aligned-1</property>
<value>1</value>
</equals>
<or>
<and>
<property>/systems/navigation/aligned-1</property>
<not>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</not>
</and>
<and>
<property>/systems/navigation/aligned-3</property>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</and>
</or>
</and>
</condition>
<property>/instrumentation/adf[1]/indicated-bearing-deg</property>
@ -1081,13 +1151,27 @@
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>/systems/navigation/aligned-1</property>
<value>1</value>
</equals>
<or>
<and>
<property>/systems/navigation/aligned-1</property>
<not>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</not>
</and>
<and>
<property>/systems/navigation/aligned-3</property>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</and>
</or>
<or>
<and>
<equals>
@ -1127,13 +1211,27 @@
<condition>
<and>
<greater-than-equals>
<property>/systems/electrical/bus/dc-ess</property>
<value>25</value>
<property>/systems/electrical/bus/ac-ess</property>
<value>110</value>
</greater-than-equals>
<equals>
<property>/systems/navigation/aligned-1</property>
<value>1</value>
</equals>
<or>
<and>
<property>/systems/navigation/aligned-1</property>
<not>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</not>
</and>
<and>
<property>/systems/navigation/aligned-3</property>
<equals>
<property>/controls/navigation/switching/att-hdg</property>
<value>-1</value>
</equals>
</and>
</or>
<or>
<and>
<equals>