1
0
Fork 0

Merge branch 'dev' into wind

This commit is contained in:
Matthew Maring 2020-06-11 14:43:42 -04:00
commit a35d20da9a
13 changed files with 1344 additions and 357 deletions

View file

@ -91,6 +91,11 @@
<splash type="bool">true</splash> <splash type="bool">true</splash>
<path>Splash/cockpit2.png</path> <path>Splash/cockpit2.png</path>
</preview> </preview>
<preview>
<type>exterior</type>
<splash type="bool">true</splash>
<path>Splash/cockpit3.png</path>
</preview>
<preview> <preview>
<type>exterior</type> <type>exterior</type>
<splash type="bool">true</splash> <splash type="bool">true</splash>

View file

@ -1024,6 +1024,30 @@ var canvas_MCDU_base = {
me["Simple_R3S"].setText("CHAN/ MLS"); me["Simple_R3S"].setText("CHAN/ MLS");
me["Simple_R4S"].setText("SLOPE CRS"); me["Simple_R4S"].setText("SLOPE CRS");
me["Simple_R5S"].setText("FREQ/ADF2"); me["Simple_R5S"].setText("FREQ/ADF2");
if (getprop("systems/radio/rmp[0]/nav") or getprop("systems/radio/rmp[1]/nav")) {
me["Simple_L1"].hide();
me["Simple_L2"].hide();
me["Simple_L3"].hide();
me["Simple_L4"].hide();
me["Simple_L5"].hide();
me["Simple_R1"].hide();
me["Simple_R2"].hide();
me["Simple_R3"].hide();
me["Simple_R4"].hide();
me["Simple_R5"].hide();
} else {
me["Simple_L1"].show();
me["Simple_L2"].show();
me["Simple_L3"].show();
me["Simple_L4"].show();
me["Simple_L5"].show();
me["Simple_R1"].show();
me["Simple_R2"].show();
me["Simple_R3"].show();
me["Simple_R4"].show();
me["Simple_R5"].show();
}
} else if (page == "INITA") { } else if (page == "INITA") {
if (!pageSwitch[i].getBoolValue()) { if (!pageSwitch[i].getBoolValue()) {
me["Simple"].show(); me["Simple"].show();

View file

@ -240,7 +240,6 @@
</animation> </animation>
<!-- Knob --> <!-- Knob -->
<!-- TODO add bindings for VOR, LS and ADF -->
<!-- We use a little hack to get 8.33MHz spacing working: <!-- We use a little hack to get 8.33MHz spacing working:
First we assign our current STBY freq we want to adjust to the default instrument. First we assign our current STBY freq we want to adjust to the default instrument.
Then we change the channel there. Then we change the channel there.
@ -514,6 +513,144 @@
<wrap>true</wrap> <wrap>true</wrap>
</binding> </binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/frequencies/standby-mhz</property>
<step>0.05</step>
<min>108.00</min>
<max>112.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/radials/selected-deg</property>
<step>1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[2]/frequencies/standby-mhz</property>
<step>0.05</step>
<min>108.00</min>
<max>118.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[2]/radials/selected-deg</property>
<step>1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">adf</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/adf[0]/frequencies/standby-khz</property>
<step>1</step>
<min>190</min>
<max>1751</max>
<wrap>true</wrap>
</binding>
</action> </action>
<action> <action>
<button>1</button> <button>1</button>
@ -780,8 +917,147 @@
<wrap>true</wrap> <wrap>true</wrap>
</binding> </binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/frequencies/standby-mhz</property>
<step>-0.05</step>
<min>108.00</min>
<max>112.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/radials/selected-deg</property>
<step>-1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[2]/frequencies/standby-mhz</property>
<step>-0.05</step>
<min>108.00</min>
<max>118.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[2]/radials/selected-deg</property>
<step>-1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">adf</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/adf[0]/frequencies/standby-khz</property>
<step>-1</step>
<min>190</min>
<max>1751</max>
<wrap>true</wrap>
</binding>
</action> </action>
</animation> </animation>
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>radio_rot0</object-name> <object-name>radio_rot0</object-name>
@ -926,6 +1202,63 @@
<mask>integer</mask> <mask>integer</mask>
</binding> </binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/frequencies/standby-mhz</property>
<step>1.00</step>
<min>108.00</min>
<max>112.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[2]/frequencies/standby-mhz</property>
<step>1.00</step>
<min>108.00</min>
<max>118.00</max>
<wrap>true</wrap>
</binding>
</action> </action>
<action> <action>
<button>1</button> <button>1</button>
@ -1068,6 +1401,63 @@
<mask>integer</mask> <mask>integer</mask>
</binding> </binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/frequencies/standby-mhz</property>
<step>-1.00</step>
<min>108.00</min>
<max>112.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[0]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[0]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[2]/frequencies/standby-mhz</property>
<step>-1</step>
<min>108.00</min>
<max>118.00</max>
<wrap>true</wrap>
</binding>
</action> </action>
</animation> </animation>
@ -1076,23 +1466,15 @@
<type>pick</type> <type>pick</type>
<object-name>radio_nav_lit</object-name> <object-name>radio_nav_lit</object-name>
<action> <action>
<button>1</button> <button>0</button>
<binding> <binding>
<command>property-assign</command> <command>property-toggle</command>
<property>controls/radio/rmp[0]/nav-protect</property> <property>controls/radio/rmp[0]/nav-protect</property>
<value>1</value>
</binding> </binding>
<mod-up> <binding>
<binding> <command>nasal</command>
<command>property-assign</command> <script>setprop("sim/sounde/oh-cover", 1);</script>
<property>controls/radio/rmp[0]/nav-protect</property> </binding>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("sim/sounde/oh-cover", 1);</script>
</binding>
</mod-up>
</action> </action>
</animation> </animation>
<animation> <animation>
@ -1111,7 +1493,7 @@
<object-name>radio_nav</object-name> <object-name>radio_nav</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>true</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-toggle</command> <command>property-toggle</command>
<property>systems/radio/rmp[0]/nav</property> <property>systems/radio/rmp[0]/nav</property>
@ -1132,6 +1514,15 @@
</and> </and>
</condition> </condition>
</binding> </binding>
<binding>
<command>property-assign</command>
<property>controls/radio/rmp[0]/nav-protect</property>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("sim/sounde/oh-cover", 1);</script>
</binding>
</action> </action>
</animation> </animation>

View file

@ -240,7 +240,6 @@
</animation> </animation>
<!-- Knob --> <!-- Knob -->
<!-- TODO add bindings for VOR, LS and ADF -->
<!-- We use a little hack to get 8.33MHz spacing working: <!-- We use a little hack to get 8.33MHz spacing working:
First we assign our current STBY freq we want to adjust to the default instrument. First we assign our current STBY freq we want to adjust to the default instrument.
Then we change the channel there. Then we change the channel there.
@ -514,6 +513,145 @@
<wrap>true</wrap> <wrap>true</wrap>
</binding> </binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/frequencies/standby-mhz</property>
<step>0.05</step>
<min>108.00</min>
<max>112.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/radials/selected-deg</property>
<step>1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[3]/frequencies/standby-mhz</property>
<step>0.05</step>
<min>108.00</min>
<max>118.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[3]/radials/selected-deg</property>
<step>1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">adf</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/adf[1]/frequencies/standby-khz</property>
<step>1</step>
<min>190</min>
<max>1751</max>
<wrap>true</wrap>
</binding>
</action> </action>
<action> <action>
<button>1</button> <button>1</button>
@ -780,6 +918,144 @@
<wrap>true</wrap> <wrap>true</wrap>
</binding> </binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/frequencies/standby-mhz</property>
<step>-0.05</step>
<min>108.00</min>
<max>112.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/radials/selected-deg</property>
<step>-1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[3]/frequencies/standby-mhz</property>
<step>-0.05</step>
<min>108.00</min>
<max>118.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>1</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[3]/radials/selected-deg</property>
<step>-1</step>
<min>1</min>
<max>361</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">adf</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/adf[1]/frequencies/standby-khz</property>
<step>-1</step>
<min>190</min>
<max>1751</max>
<wrap>true</wrap>
</binding>
</action> </action>
</animation> </animation>
<animation> <animation>
@ -926,6 +1202,63 @@
<mask>integer</mask> <mask>integer</mask>
</binding> </binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/frequencies/standby-mhz</property>
<step>1.00</step>
<min>108.00</min>
<max>112.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[3]/frequencies/standby-mhz</property>
<step>1.00</step>
<min>108.00</min>
<max>118.00</max>
<wrap>true</wrap>
</binding>
</action> </action>
<action> <action>
<button>1</button> <button>1</button>
@ -1068,6 +1401,63 @@
<mask>integer</mask> <mask>integer</mask>
</binding> </binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">ls</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[0]/frequencies/standby-mhz</property>
<step>-1.00</step>
<min>108.00</min>
<max>112.00</max>
<wrap>true</wrap>
</binding>
<binding>
<condition>
<and>
<greater-than-equals>
<property>systems/electrical/bus/dc-ess</property>
<value>25</value>
</greater-than-equals>
<equals>
<property>controls/radio/rmp[1]/on</property>
<value>1</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/sel_chan</property>
<value type="string">vor</value>
</equals>
<equals>
<property>systems/radio/rmp[1]/select-crs</property>
<value>0</value>
</equals>
</and>
</condition>
<command>property-adjust</command>
<property>instrumentation/nav[3]/frequencies/standby-mhz</property>
<step>-1</step>
<min>108.00</min>
<max>118.00</max>
<wrap>true</wrap>
</binding>
</action> </action>
</animation> </animation>
@ -1076,23 +1466,15 @@
<type>pick</type> <type>pick</type>
<object-name>radio_nav_lit</object-name> <object-name>radio_nav_lit</object-name>
<action> <action>
<button>1</button> <button>0</button>
<binding> <binding>
<command>property-assign</command> <command>property-toggle</command>
<property>controls/radio/rmp[1]/nav-protect</property> <property>controls/radio/rmp[1]/nav-protect</property>
<value>1</value>
</binding> </binding>
<mod-up> <binding>
<binding> <command>nasal</command>
<command>property-assign</command> <script>setprop("sim/sounde/oh-cover", 1);</script>
<property>controls/radio/rmp[1]/nav-protect</property> </binding>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("sim/sounde/oh-cover", 1);</script>
</binding>
</mod-up>
</action> </action>
</animation> </animation>
<animation> <animation>
@ -1111,7 +1493,7 @@
<object-name>radio_nav</object-name> <object-name>radio_nav</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>true</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-toggle</command> <command>property-toggle</command>
<property>systems/radio/rmp[1]/nav</property> <property>systems/radio/rmp[1]/nav</property>
@ -1132,6 +1514,15 @@
</and> </and>
</condition> </condition>
</binding> </binding>
<binding>
<command>property-assign</command>
<property>controls/radio/rmp[1]/nav-protect</property>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("sim/sounde/oh-cover", 1);</script>
</binding>
</action> </action>
</animation> </animation>

View file

@ -3,7 +3,7 @@ MATERIAL "radio" rgb 0.800 0.800 0.800 amb 1.000 1.000 1.000 emis 0.100 0.100
MATERIAL "radio_emit" rgb 0.640 0.640 0.640 amb 1.000 1.000 1.000 emis 0.850 0.850 0.850 spec 0.400 0.400 0.400 shi 12 trans 0.000 MATERIAL "radio_emit" rgb 0.640 0.640 0.640 amb 1.000 1.000 1.000 emis 0.850 0.850 0.850 spec 0.400 0.400 0.400 shi 12 trans 0.000
MATERIAL "DefaultWhite" rgb 1.000 1.000 1.000 amb 0.200 0.200 0.200 emis 0.000 0.000 0.000 spec 0.500 0.500 0.500 shi 10 trans 0.000 MATERIAL "DefaultWhite" rgb 1.000 1.000 1.000 amb 0.200 0.200 0.200 emis 0.000 0.000 0.000 spec 0.500 0.500 0.500 shi 10 trans 0.000
OBJECT world OBJECT world
name "Blender_exporter_v2.26__Radio.ac" name "Blender_exporter_v3.3__Radio.ac"
kids 37 kids 37
OBJECT poly OBJECT poly
name "radio_active.screen" name "radio_active.screen"
@ -14746,9 +14746,9 @@ SURF 0X0
mat 0 mat 0
refs 4 refs 4
5 0.993212 0.944859 5 0.993212 0.944859
4 0.931324 0.944859
10 0.931324 0.943492
11 0.993212 0.943492 11 0.993212 0.943492
10 0.931324 0.943492
4 0.931324 0.944859
SURF 0X0 SURF 0X0
mat 0 mat 0
refs 4 refs 4
@ -14760,9 +14760,9 @@ SURF 0X0
mat 0 mat 0
refs 4 refs 4
1 0.965523 0.925681 1 0.965523 0.925681
0 0.997855 0.925681
4 0.997855 0.935702
5 0.965523 0.935702 5 0.965523 0.935702
4 0.997855 0.935702
0 0.997855 0.925681
SURF 0X0 SURF 0X0
mat 0 mat 0
refs 4 refs 4
@ -14792,9 +14792,9 @@ SURF 0X0
mat 0 mat 0
refs 4 refs 4
0 0.931324 0.94175 0 0.931324 0.94175
1 0.993212 0.94175
3 0.993212 0.942381
2 0.931324 0.942381 2 0.931324 0.942381
3 0.993212 0.942381
1 0.993212 0.94175
kids 0 kids 0
OBJECT poly OBJECT poly
name "radio_nav_lit.axis" name "radio_nav_lit.axis"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 KiB

After

Width:  |  Height:  |  Size: 320 KiB

View file

@ -3,7 +3,7 @@ MATERIAL "radio" rgb 0.800 0.800 0.800 amb 1.000 1.000 1.000 emis 0.100 0.100
MATERIAL "radio_emit" rgb 0.640 0.640 0.640 amb 1.000 1.000 1.000 emis 0.850 0.850 0.850 spec 0.400 0.400 0.400 shi 12 trans 0.000 MATERIAL "radio_emit" rgb 0.640 0.640 0.640 amb 1.000 1.000 1.000 emis 0.850 0.850 0.850 spec 0.400 0.400 0.400 shi 12 trans 0.000
MATERIAL "DefaultWhite" rgb 1.000 1.000 1.000 amb 0.200 0.200 0.200 emis 0.000 0.000 0.000 spec 0.500 0.500 0.500 shi 10 trans 0.000 MATERIAL "DefaultWhite" rgb 1.000 1.000 1.000 amb 0.200 0.200 0.200 emis 0.000 0.000 0.000 spec 0.500 0.500 0.500 shi 10 trans 0.000
OBJECT world OBJECT world
name "Blender_exporter_v2.26__Radio1.ac" name "Blender_exporter_v3.3__Radio1.ac"
kids 37 kids 37
OBJECT poly OBJECT poly
name "radio_active.screen" name "radio_active.screen"
@ -14746,9 +14746,9 @@ SURF 0X0
mat 0 mat 0
refs 4 refs 4
5 0.993212 0.944859 5 0.993212 0.944859
4 0.931324 0.944859
10 0.931324 0.943492
11 0.993212 0.943492 11 0.993212 0.943492
10 0.931324 0.943492
4 0.931324 0.944859
SURF 0X0 SURF 0X0
mat 0 mat 0
refs 4 refs 4
@ -14760,9 +14760,9 @@ SURF 0X0
mat 0 mat 0
refs 4 refs 4
1 0.965523 0.925681 1 0.965523 0.925681
0 0.997855 0.925681
4 0.997855 0.935702
5 0.965523 0.935702 5 0.965523 0.935702
4 0.997855 0.935702
0 0.997855 0.925681
SURF 0X0 SURF 0X0
mat 0 mat 0
refs 4 refs 4
@ -14792,9 +14792,9 @@ SURF 0X0
mat 0 mat 0
refs 4 refs 4
0 0.931324 0.94175 0 0.931324 0.94175
1 0.993212 0.94175
3 0.993212 0.942381
2 0.931324 0.942381 2 0.931324 0.942381
3 0.993212 0.942381
1 0.993212 0.94175
kids 0 kids 0
OBJECT poly OBJECT poly
name "radio_nav_lit.axis" name "radio_nav_lit.axis"

View file

@ -4,70 +4,74 @@
var radnavInput = func(key, i) { var radnavInput = func(key, i) {
var scratchpad = mcdu_scratchpad.scratchpads[i].scratchpad; var scratchpad = mcdu_scratchpad.scratchpads[i].scratchpad;
if (key == "L1") { if (!getprop("systems/radio/rmp[0]/nav") and !getprop("systems/radio/rmp[1]/nav")) {
if (scratchpad == "CLR") { if (key == "L1") {
setprop("/FMGC/internal/vor1freq-set", 0); if (scratchpad == "CLR") {
mcdu_scratchpad.scratchpads[i].empty(); setprop("/FMGC/internal/vor1freq-set", 0);
} else { mcdu_scratchpad.scratchpads[i].empty();
var tfs = size(scratchpad); } else {
if (tfs == 3 or tfs == 5 or tfs == 6) { var tfs = size(scratchpad);
if (scratchpad >= 108.00 and scratchpad <= 111.95) { if (tfs == 3 or tfs == 5 or tfs == 6) {
if (scratchpad == 108.10 or scratchpad == 108.15 or scratchpad == 108.30 or scratchpad == 108.35 or scratchpad == 108.50 or scratchpad == 108.55 or scratchpad == 108.70 or scratchpad == 108.75 or scratchpad == 108.90 or scratchpad == 108.95 if (scratchpad >= 108.00 and scratchpad <= 111.95) {
or scratchpad == 109.10 or scratchpad == 109.15 or scratchpad == 109.30 or scratchpad == 109.35 or scratchpad == 109.50 or scratchpad == 109.55 or scratchpad == 109.70 or scratchpad == 109.75 or scratchpad == 109.90 or scratchpad == 109.95 if (scratchpad == 108.10 or scratchpad == 108.15 or scratchpad == 108.30 or scratchpad == 108.35 or scratchpad == 108.50 or scratchpad == 108.55 or scratchpad == 108.70 or scratchpad == 108.75 or scratchpad == 108.90 or scratchpad == 108.95
or scratchpad == 110.10 or scratchpad == 110.15 or scratchpad == 110.30 or scratchpad == 110.35 or scratchpad == 110.50 or scratchpad == 110.55 or scratchpad == 110.70 or scratchpad == 110.75 or scratchpad == 110.90 or scratchpad == 110.95 or scratchpad == 109.10 or scratchpad == 109.15 or scratchpad == 109.30 or scratchpad == 109.35 or scratchpad == 109.50 or scratchpad == 109.55 or scratchpad == 109.70 or scratchpad == 109.75 or scratchpad == 109.90 or scratchpad == 109.95
or scratchpad == 111.10 or scratchpad == 111.15 or scratchpad == 111.30 or scratchpad == 111.35 or scratchpad == 111.50 or scratchpad == 111.55 or scratchpad == 111.70 or scratchpad == 111.75 or scratchpad == 111.90 or scratchpad == 111.95) { or scratchpad == 110.10 or scratchpad == 110.15 or scratchpad == 110.30 or scratchpad == 110.35 or scratchpad == 110.50 or scratchpad == 110.55 or scratchpad == 110.70 or scratchpad == 110.75 or scratchpad == 110.90 or scratchpad == 110.95
mcdu_message(i, "NOT ALLOWED"); or scratchpad == 111.10 or scratchpad == 111.15 or scratchpad == 111.30 or scratchpad == 111.35 or scratchpad == 111.50 or scratchpad == 111.55 or scratchpad == 111.70 or scratchpad == 111.75 or scratchpad == 111.90 or scratchpad == 111.95) {
} else { mcdu_message(i, "NOT ALLOWED");
} else {
setprop("instrumentation/nav[2]/frequencies/selected-mhz", scratchpad);
setprop("/FMGC/internal/vor1freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
}
} else if (scratchpad >= 112.00 and scratchpad <= 117.95) {
setprop("instrumentation/nav[2]/frequencies/selected-mhz", scratchpad); setprop("instrumentation/nav[2]/frequencies/selected-mhz", scratchpad);
setprop("/FMGC/internal/vor1freq-set", 1); setprop("/FMGC/internal/vor1freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty(); mcdu_scratchpad.scratchpads[i].empty();
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} else if (scratchpad >= 112.00 and scratchpad <= 117.95) {
setprop("instrumentation/nav[2]/frequencies/selected-mhz", scratchpad);
setprop("/FMGC/internal/vor1freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
} else { } else {
mcdu_message(i, "NOT ALLOWED"); mcdu_message(i, "NOT ALLOWED");
} }
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} } else if (key == "L2") {
} else if (key == "L2") { if (scratchpad == "CLR") {
if (scratchpad == "CLR") { setprop("/FMGC/internal/vor1crs-set", 0);
setprop("/FMGC/internal/vor1crs-set", 0); mcdu_scratchpad.scratchpads[i].empty();
mcdu_scratchpad.scratchpads[i].empty();
} else {
var tfs = size(scratchpad);
if (tfs >= 1 and tfs <= 3) {
if (scratchpad >= 0 and scratchpad <= 360) {
setprop("instrumentation/nav[2]/radials/selected-deg", scratchpad);
setprop("/FMGC/internal/vor1crs-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
} else {
mcdu_message(i, "NOT ALLOWED");
}
} else { } else {
mcdu_message(i, "NOT ALLOWED"); var tfs = size(scratchpad);
} if (tfs >= 1 and tfs <= 3) {
} if (scratchpad >= 0 and scratchpad <= 360) {
} else if (key == "L3") { setprop("instrumentation/nav[2]/radials/selected-deg", scratchpad);
if (scratchpad == "CLR") { setprop("/FMGC/internal/vor1crs-set", 1);
setprop("/FMGC/internal/ils1freq-set", 0);
mcdu_scratchpad.scratchpads[i].empty();
} else {
var tfs = size(scratchpad);
if (tfs == 3 or tfs == 5 or tfs == 6) {
if (scratchpad >= 108.00 and scratchpad <= 111.95) {
if (scratchpad == 108.10 or scratchpad == 108.15 or scratchpad == 108.30 or scratchpad == 108.35 or scratchpad == 108.50 or scratchpad == 108.55 or scratchpad == 108.70 or scratchpad == 108.75 or scratchpad == 108.90 or scratchpad == 108.95
or scratchpad == 109.10 or scratchpad == 109.15 or scratchpad == 109.30 or scratchpad == 109.35 or scratchpad == 109.50 or scratchpad == 109.55 or scratchpad == 109.70 or scratchpad == 109.75 or scratchpad == 109.90 or scratchpad == 109.95
or scratchpad == 110.10 or scratchpad == 110.15 or scratchpad == 110.30 or scratchpad == 110.35 or scratchpad == 110.50 or scratchpad == 110.55 or scratchpad == 110.70 or scratchpad == 110.75 or scratchpad == 110.90 or scratchpad == 110.95
or scratchpad == 111.10 or scratchpad == 111.15 or scratchpad == 111.30 or scratchpad == 111.35 or scratchpad == 111.50 or scratchpad == 111.55 or scratchpad == 111.70 or scratchpad == 111.75 or scratchpad == 111.90 or scratchpad == 111.95) {
setprop("instrumentation/nav[0]/frequencies/selected-mhz", scratchpad);
setprop("/FMGC/internal/ils1freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty(); mcdu_scratchpad.scratchpads[i].empty();
if (num(getprop("/FMGC/internal/ils1freq-calculated")) != 0 and num(getprop("/FMGC/internal/ils1freq-calculated")) != num(getprop("instrumentation/nav[0]/frequencies/selected-mhz"))) { } else {
genericMessage(i, "RWY/LS MISMATCH", "amb"); mcdu_message(i, "NOT ALLOWED");
}
} else {
mcdu_message(i, "NOT ALLOWED");
}
}
} else if (key == "L3") {
if (scratchpad == "CLR") {
setprop("/FMGC/internal/ils1freq-set", 0);
mcdu_scratchpad.scratchpads[i].empty();
} else {
var tfs = size(scratchpad);
if (tfs == 3 or tfs == 5 or tfs == 6) {
if (scratchpad >= 108.00 and scratchpad <= 111.95) {
if (scratchpad == 108.10 or scratchpad == 108.15 or scratchpad == 108.30 or scratchpad == 108.35 or scratchpad == 108.50 or scratchpad == 108.55 or scratchpad == 108.70 or scratchpad == 108.75 or scratchpad == 108.90 or scratchpad == 108.95
or scratchpad == 109.10 or scratchpad == 109.15 or scratchpad == 109.30 or scratchpad == 109.35 or scratchpad == 109.50 or scratchpad == 109.55 or scratchpad == 109.70 or scratchpad == 109.75 or scratchpad == 109.90 or scratchpad == 109.95
or scratchpad == 110.10 or scratchpad == 110.15 or scratchpad == 110.30 or scratchpad == 110.35 or scratchpad == 110.50 or scratchpad == 110.55 or scratchpad == 110.70 or scratchpad == 110.75 or scratchpad == 110.90 or scratchpad == 110.95
or scratchpad == 111.10 or scratchpad == 111.15 or scratchpad == 111.30 or scratchpad == 111.35 or scratchpad == 111.50 or scratchpad == 111.55 or scratchpad == 111.70 or scratchpad == 111.75 or scratchpad == 111.90 or scratchpad == 111.95) {
setprop("instrumentation/nav[0]/frequencies/selected-mhz", scratchpad);
setprop("/FMGC/internal/ils1freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
if (num(getprop("/FMGC/internal/ils1freq-calculated")) != 0 and num(getprop("/FMGC/internal/ils1freq-calculated")) != num(getprop("instrumentation/nav[0]/frequencies/selected-mhz"))) {
genericMessage(i, "RWY/LS MISMATCH", "amb");
}
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} else { } else {
mcdu_message(i, "NOT ALLOWED"); mcdu_message(i, "NOT ALLOWED");
@ -75,110 +79,110 @@ var radnavInput = func(key, i) {
} else { } else {
mcdu_message(i, "NOT ALLOWED"); mcdu_message(i, "NOT ALLOWED");
} }
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} } else if (key == "L4") {
} else if (key == "L4") { if (scratchpad == "CLR") {
if (scratchpad == "CLR") { setprop("/FMGC/internal/ils1crs-set", 0);
setprop("/FMGC/internal/ils1crs-set", 0); mcdu_scratchpad.scratchpads[i].empty();
mcdu_scratchpad.scratchpads[i].empty();
} else {
var tfs = size(scratchpad);
if (tfs >= 1 and tfs <= 3) {
if (scratchpad >= 0 and scratchpad <= 360) {
setprop("instrumentation/nav[0]/radials/selected-deg", scratchpad);
setprop("/FMGC/internal/ils1crs-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
} else {
mcdu_message(i, "NOT ALLOWED");
}
} else { } else {
mcdu_message(i, "NOT ALLOWED"); var tfs = size(scratchpad);
} if (tfs >= 1 and tfs <= 3) {
} if (scratchpad >= 0 and scratchpad <= 360) {
} else if (key == "L5") { setprop("instrumentation/nav[0]/radials/selected-deg", scratchpad);
if (scratchpad == "CLR") { setprop("/FMGC/internal/ils1crs-set", 1);
setprop("/FMGC/internal/adf1freq-set", 0); mcdu_scratchpad.scratchpads[i].empty();
mcdu_scratchpad.scratchpads[i].empty();
} else {
var tfs = size(scratchpad);
if (tfs == 3 or tfs == 4) {
if (scratchpad >= 190 and scratchpad <= 1750) {
setprop("instrumentation/adf[0]/frequencies/selected-khz", scratchpad);
setprop("/FMGC/internal/adf1freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
} else {
mcdu_message(i, "NOT ALLOWED");
}
} else {
mcdu_message(i, "NOT ALLOWED");
}
}
} else if (key == "R1") {
if (scratchpad == "CLR") {
setprop("/FMGC/internal/vor2freq-set", 0);
mcdu_scratchpad.scratchpads[i].empty();
} else {
var tfs = size(scratchpad);
if (tfs == 3 or tfs == 5 or tfs == 6) {
if (scratchpad >= 108.10 and scratchpad <= 111.95) {
if (scratchpad == 108.10 or scratchpad == 108.15 or scratchpad == 108.30 or scratchpad == 108.35 or scratchpad == 108.50 or scratchpad == 108.55 or scratchpad == 108.70 or scratchpad == 108.75 or scratchpad == 108.90 or scratchpad == 108.95
or scratchpad == 109.10 or scratchpad == 109.15 or scratchpad == 109.30 or scratchpad == 109.35 or scratchpad == 109.50 or scratchpad == 109.55 or scratchpad == 109.70 or scratchpad == 109.75 or scratchpad == 109.90 or scratchpad == 109.95
or scratchpad == 110.10 or scratchpad == 110.15 or scratchpad == 110.30 or scratchpad == 110.35 or scratchpad == 110.50 or scratchpad == 110.55 or scratchpad == 110.70 or scratchpad == 110.75 or scratchpad == 110.90 or scratchpad == 110.95
or scratchpad == 111.10 or scratchpad == 111.15 or scratchpad == 111.30 or scratchpad == 111.35 or scratchpad == 111.50 or scratchpad == 111.55 or scratchpad == 111.70 or scratchpad == 111.75 or scratchpad == 111.90 or scratchpad == 111.95) {
mcdu_message(i, "NOT ALLOWED");
} else { } else {
mcdu_message(i, "NOT ALLOWED");
}
} else {
mcdu_message(i, "NOT ALLOWED");
}
}
} else if (key == "L5") {
if (scratchpad == "CLR") {
setprop("/FMGC/internal/adf1freq-set", 0);
mcdu_scratchpad.scratchpads[i].empty();
} else {
var tfs = size(scratchpad);
if (tfs == 3 or tfs == 4) {
if (scratchpad >= 190 and scratchpad <= 1750) {
setprop("instrumentation/adf[0]/frequencies/selected-khz", scratchpad);
setprop("/FMGC/internal/adf1freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
} else {
mcdu_message(i, "NOT ALLOWED");
}
} else {
mcdu_message(i, "NOT ALLOWED");
}
}
} else if (key == "R1") {
if (scratchpad == "CLR") {
setprop("/FMGC/internal/vor2freq-set", 0);
mcdu_scratchpad.scratchpads[i].empty();
} else {
var tfs = size(scratchpad);
if (tfs == 3 or tfs == 5 or tfs == 6) {
if (scratchpad >= 108.10 and scratchpad <= 111.95) {
if (scratchpad == 108.10 or scratchpad == 108.15 or scratchpad == 108.30 or scratchpad == 108.35 or scratchpad == 108.50 or scratchpad == 108.55 or scratchpad == 108.70 or scratchpad == 108.75 or scratchpad == 108.90 or scratchpad == 108.95
or scratchpad == 109.10 or scratchpad == 109.15 or scratchpad == 109.30 or scratchpad == 109.35 or scratchpad == 109.50 or scratchpad == 109.55 or scratchpad == 109.70 or scratchpad == 109.75 or scratchpad == 109.90 or scratchpad == 109.95
or scratchpad == 110.10 or scratchpad == 110.15 or scratchpad == 110.30 or scratchpad == 110.35 or scratchpad == 110.50 or scratchpad == 110.55 or scratchpad == 110.70 or scratchpad == 110.75 or scratchpad == 110.90 or scratchpad == 110.95
or scratchpad == 111.10 or scratchpad == 111.15 or scratchpad == 111.30 or scratchpad == 111.35 or scratchpad == 111.50 or scratchpad == 111.55 or scratchpad == 111.70 or scratchpad == 111.75 or scratchpad == 111.90 or scratchpad == 111.95) {
mcdu_message(i, "NOT ALLOWED");
} else {
setprop("instrumentation/nav[3]/frequencies/selected-mhz", scratchpad);
setprop("/FMGC/internal/vor2freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
}
} else if (scratchpad >= 112.00 and scratchpad <= 117.95) {
setprop("instrumentation/nav[3]/frequencies/selected-mhz", scratchpad); setprop("instrumentation/nav[3]/frequencies/selected-mhz", scratchpad);
setprop("/FMGC/internal/vor2freq-set", 1); setprop("/FMGC/internal/vor2freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty(); mcdu_scratchpad.scratchpads[i].empty();
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} else if (scratchpad >= 112.00 and scratchpad <= 117.95) {
setprop("instrumentation/nav[3]/frequencies/selected-mhz", scratchpad);
setprop("/FMGC/internal/vor2freq-set", 1);
mcdu_scratchpad.scratchpads[i].empty();
} else { } else {
mcdu_message(i, "NOT ALLOWED"); mcdu_message(i, "NOT ALLOWED");
} }
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} } else if (key == "R2") {
} else if (key == "R2") { if (scratchpad == "CLR") {
if (scratchpad == "CLR") { setprop("/FMGC/internal/vor2crs-set", 0);
setprop("/FMGC/internal/vor2crs-set", 0); mcdu_scratchpad.scratchpads[i].empty();
mcdu_scratchpad.scratchpads[i].empty(); } else {
} else { var tfs = size(scratchpad);
var tfs = size(scratchpad); if (tfs >= 1 and tfs <= 3) {
if (tfs >= 1 and tfs <= 3) { if (scratchpad >= 0 and scratchpad <= 360) {
if (scratchpad >= 0 and scratchpad <= 360) { setprop("instrumentation/nav[3]/radials/selected-deg", scratchpad);
setprop("instrumentation/nav[3]/radials/selected-deg", scratchpad); setprop("/FMGC/internal/vor2crs-set", 1);
setprop("/FMGC/internal/vor2crs-set", 1); mcdu_scratchpad.scratchpads[i].empty();
mcdu_scratchpad.scratchpads[i].empty(); } else {
mcdu_message(i, "NOT ALLOWED");
}
} else { } else {
mcdu_message(i, "NOT ALLOWED"); mcdu_message(i, "NOT ALLOWED");
} }
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} } else if (key == "R5") {
} else if (key == "R5") { if (scratchpad == "CLR") {
if (scratchpad == "CLR") { setprop("/FMGC/internal/adf2freq-set", 0);
setprop("/FMGC/internal/adf2freq-set", 0); mcdu_scratchpad.scratchpads[i].empty();
mcdu_scratchpad.scratchpads[i].empty(); } else {
} else { var tfs = size(scratchpad);
var tfs = size(scratchpad); if (tfs == 3 or tfs == 4) {
if (tfs == 3 or tfs == 4) { if (scratchpad >= 190 and scratchpad <= 1750) {
if (scratchpad >= 190 and scratchpad <= 1750) { setprop("instrumentation/adf[1]/frequencies/selected-khz", scratchpad);
setprop("instrumentation/adf[1]/frequencies/selected-khz", scratchpad); setprop("/FMGC/internal/adf2freq-set", 1);
setprop("/FMGC/internal/adf2freq-set", 1); mcdu_scratchpad.scratchpads[i].empty();
mcdu_scratchpad.scratchpads[i].empty(); } else {
mcdu_message(i, "NOT ALLOWED");
}
} else { } else {
mcdu_message(i, "NOT ALLOWED"); mcdu_message(i, "NOT ALLOWED");
} }
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} }
} else {
mcdu_message(i, "NOT ALLOWED");
} }
} }

View file

@ -31,6 +31,20 @@ var act_vhf1 = props.globals.getNode("instrumentation/comm[0]/frequencies/select
var act_vhf2 = props.globals.getNode("instrumentation/comm[1]/frequencies/selected-mhz"); var act_vhf2 = props.globals.getNode("instrumentation/comm[1]/frequencies/selected-mhz");
var act_vhf3 = props.globals.getNode("instrumentation/comm[2]/frequencies/selected-mhz"); var act_vhf3 = props.globals.getNode("instrumentation/comm[2]/frequencies/selected-mhz");
var act_ls1 = props.globals.getNode("instrumentation/nav[0]/frequencies/selected-mhz");
var act_vor1 = props.globals.getNode("instrumentation/nav[2]/frequencies/selected-mhz");
var act_vor2 = props.globals.getNode("instrumentation/nav[3]/frequencies/selected-mhz");
var act_adf1 = props.globals.getNode("instrumentation/adf[0]/frequencies/selected-khz");
var act_adf2 = props.globals.getNode("instrumentation/adf[1]/frequencies/selected-khz");
var stby_ls1 = props.globals.getNode("instrumentation/nav[0]/frequencies/standby-mhz");
var stby_vor1 = props.globals.getNode("instrumentation/nav[2]/frequencies/standby-mhz");
var stby_vor2 = props.globals.getNode("instrumentation/nav[3]/frequencies/standby-mhz");
var stby_adf1 = props.globals.getNode("instrumentation/adf[0]/frequencies/standby-khz");
var stby_adf2 = props.globals.getNode("instrumentation/adf[1]/frequencies/standby-khz");
var act_ls1_crs = props.globals.getNode("instrumentation/nav[0]/radials/selected-deg");
var act_vor1_crs = props.globals.getNode("instrumentation/nav[2]/radials/selected-deg");
var act_vor2_crs = props.globals.getNode("instrumentation/nav[3]/radials/selected-deg");
if (rand() > 0.5) { if (rand() > 0.5) {
var hf1 = genFourRand(); var hf1 = genFourRand();
var hf2 = genFiveRand(); var hf2 = genFiveRand();
@ -79,6 +93,9 @@ var am_mode_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/am-active", 0,
var am_mode_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/am-active", 0, "BOOL"); var am_mode_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/am-active", 0, "BOOL");
var am_mode_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/am-active", 0, "BOOL"); var am_mode_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/am-active", 0, "BOOL");
var sel_crs_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/select-crs", 1, "BOOL");
var sel_crs_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/select-crs", 1, "BOOL");
var init = func() { var init = func() {
chan_rmp1.setValue("vhf1"); chan_rmp1.setValue("vhf1");
chan_rmp2.setValue("vhf2"); chan_rmp2.setValue("vhf2");
@ -218,7 +235,52 @@ var update_active_vhf = func(vhf) {
} }
} }
} }
}; }
var update_displays_nav = func(nav) {
var chan1 = chan_rmp1.getValue();
var chan2 = chan_rmp2.getValue();
if (nav == 1) {
if (chan1 == "ls") {
act_display_rmp1.setValue(sprintf("%3.2f", act_ls1.getValue()));
if (sel_crs_rmp1.getBoolValue()) {
stby_display_rmp1.setValue("C-" ~ sprintf("%3.0f", act_ls1_crs.getValue()));
} else {
stby_display_rmp1.setValue(sprintf("%3.2f", stby_ls1.getValue()));
}
}
if (chan2 == "ls") {
act_display_rmp2.setValue(sprintf("%3.2f", act_ls1.getValue()));
if (sel_crs_rmp2.getBoolValue()) {
stby_display_rmp2.setValue("C-" ~ sprintf("%3.0f", act_ls1_crs.getValue()));
} else {
stby_display_rmp2.setValue(sprintf("%3.2f", stby_ls1.getValue()));
}
}
} else if (nav == 3 and chan1 == "vor") {
act_display_rmp1.setValue(sprintf("%3.2f", act_vor1.getValue()));
if (sel_crs_rmp1.getBoolValue()) {
stby_display_rmp1.setValue("C-" ~ sprintf("%3.0f", act_vor1_crs.getValue()));
} else {
stby_display_rmp1.setValue(sprintf("%3.2f", stby_vor1.getValue()));
}
} else if (nav == 4 and chan2 == "vor") {
act_display_rmp2.setValue(sprintf("%3.2f", act_vor2.getValue()));
if (sel_crs_rmp2.getBoolValue()) {
stby_display_rmp2.setValue("C-" ~ sprintf("%3.0f", act_vor2_crs.getValue()));
} else {
stby_display_rmp2.setValue(sprintf("%3.2f", stby_vor2.getValue()));
}
} else if (nav == 5 and chan1 == "adf") {
act_display_rmp1.setValue(sprintf("%4.0f", act_adf1.getValue()));
stby_display_rmp1.setValue(sprintf("%4.0f", stby_adf1.getValue()));
} else if (nav == 6 and chan2 == "adf") {
act_display_rmp2.setValue(sprintf("%4.0f", act_adf2.getValue()));
stby_display_rmp2.setValue(sprintf("%4.0f", stby_adf2.getValue()));
}
}
var update_stby_freq = func(rmp_no, freq) { var update_stby_freq = func(rmp_no, freq) {
if (rmp_no == 0) { if (rmp_no == 0) {
@ -285,6 +347,10 @@ var update_chan_sel = func(rmp_no) {
update_active_vhf(4); update_active_vhf(4);
update_active_vhf(5); update_active_vhf(5);
update_displays_nav(1);
update_displays_nav(rmp_no + 3);
update_displays_nav(rmp_no + 5);
if (rmp_no == 0) { if (rmp_no == 0) {
var chan = chan_rmp1.getValue(); var chan = chan_rmp1.getValue();
if (chan == "vhf1") { if (chan == "vhf1") {
@ -330,6 +396,7 @@ var update_chan_sel = func(rmp_no) {
var transfer = func(rmp_no) { var transfer = func(rmp_no) {
rmp_no = rmp_no - 1; rmp_no = rmp_no - 1;
var sel_chan = getprop("systems/radio/rmp[" ~ rmp_no ~ "]/sel_chan"); var sel_chan = getprop("systems/radio/rmp[" ~ rmp_no ~ "]/sel_chan");
var sel_crs = getprop("systems/radio/rmp[" ~ rmp_no ~ "]/select-crs");
if (string.match(sel_chan, "vhf[1-3]")) { if (string.match(sel_chan, "vhf[1-3]")) {
var mod1 = int(string.replace(sel_chan, "vhf", "")); var mod1 = int(string.replace(sel_chan, "vhf", ""));
@ -345,6 +412,50 @@ var transfer = func(rmp_no) {
var mem = systems.HFS[mod].selectedChannelKhz; var mem = systems.HFS[mod].selectedChannelKhz;
systems.HFS[mod].selectChannel(getprop("systems/radio/rmp[" ~ rmp_no ~ "]/hf" ~ mod1 ~ "-standby")); systems.HFS[mod].selectChannel(getprop("systems/radio/rmp[" ~ rmp_no ~ "]/hf" ~ mod1 ~ "-standby"));
setprop("systems/radio/rmp[" ~ rmp_no ~ "]/hf" ~ mod1 ~ "-standby", mem); setprop("systems/radio/rmp[" ~ rmp_no ~ "]/hf" ~ mod1 ~ "-standby", mem);
} elsif (sel_chan == "adf") {
var mem = getprop("instrumentation/adf[" ~ rmp_no ~ "]/frequencies/selected-khz");
setprop("instrumentation/adf[" ~ rmp_no ~ "]/frequencies/selected-khz", getprop("instrumentation/adf[" ~ rmp_no ~ "]/frequencies/standby-khz"));
setprop("instrumentation/adf[" ~ rmp_no ~ "]/frequencies/standby-khz", mem);
update_displays_nav(rmp_no + 5);
} elsif (sel_chan == "vor") {
if (sel_crs) {
setprop("instrumentation/nav[" ~ (rmp_no + 2) ~ "]/frequencies/standby-mhz", getprop("instrumentation/nav[" ~ (rmp_no + 2) ~ "]/frequencies/selected-mhz"));
setprop("systems/radio/rmp[" ~ rmp_no ~ "]/select-crs", 0);
update_displays_nav(rmp_no + 3);
} else {
setprop("instrumentation/nav[" ~ (rmp_no + 2) ~ "]/frequencies/selected-mhz", getprop("instrumentation/nav[" ~ (rmp_no + 2) ~ "]/frequencies/standby-mhz"));
setprop("systems/radio/rmp[" ~ rmp_no ~ "]/select-crs", 1);
update_displays_nav(rmp_no + 3);
}
} elsif (sel_chan == "ls") {
if (sel_crs) {
setprop("instrumentation/nav[0]/frequencies/standby-mhz", getprop("instrumentation/nav[0]/frequencies/selected-mhz"));
setprop("systems/radio/rmp[" ~ rmp_no ~ "]/select-crs", 0);
update_displays_nav(1);
} else {
setprop("instrumentation/nav[0]/frequencies/selected-mhz", getprop("instrumentation/nav[0]/frequencies/standby-mhz"));
setprop("systems/radio/rmp[" ~ rmp_no ~ "]/select-crs", 1);
update_displays_nav(1);
}
}
}
var change_nav_mode = func(rmp_nr, nav_mode) {
if (!nav_mode.getBoolValue()) {
if (rmp_nr == 1 and (chan_rmp1.getValue() == "vor" or chan_rmp1.getValue() == "ls" or chan_rmp1.getValue() == "adf")) {
chan_rmp1.setValue("vhf1");
}
if (rmp_nr == 2 and (chan_rmp2.getValue() == "vor" or chan_rmp2.getValue() == "ls" or chan_rmp2.getValue() == "adf")) {
chan_rmp2.setValue("vhf2");
}
setprop("/FMGC/internal/ils1freq-set", 1);
setprop("/FMGC/internal/ils1crs-set", 1);
setprop("/FMGC/internal/vor1freq-set", 1);
setprop("/FMGC/internal/vor1crs-set", 1);
setprop("/FMGC/internal/vor2freq-set", 1);
setprop("/FMGC/internal/vor2crs-set", 1);
setprop("/FMGC/internal/adf1freq-set", 1);
setprop("/FMGC/internal/adf2freq-set", 1);
} }
} }
@ -431,3 +542,64 @@ setlistener("/systems/radio/rmp[1]/sel_chan", func {
setlistener("/systems/radio/rmp[2]/sel_chan", func { setlistener("/systems/radio/rmp[2]/sel_chan", func {
update_chan_sel(2); update_chan_sel(2);
}); });
setlistener("/instrumentation/nav[0]/frequencies/selected-mhz", func {
update_displays_nav(1);
});
setlistener("/instrumentation/nav[0]/frequencies/standby-mhz", func {
update_displays_nav(1);
});
setlistener("/instrumentation/nav[2]/frequencies/selected-mhz", func {
update_displays_nav(3);
});
setlistener("/instrumentation/nav[2]/frequencies/standby-mhz", func {
update_displays_nav(3);
});
setlistener("/instrumentation/nav[3]/frequencies/selected-mhz", func {
update_displays_nav(4);
});
setlistener("/instrumentation/nav[3]/frequencies/standby-mhz", func {
update_displays_nav(4);
});
setlistener("/instrumentation/adf[0]/frequencies/selected-khz", func {
update_displays_nav(5);
});
setlistener("/instrumentation/adf[0]/frequencies/standby-khz", func {
update_displays_nav(5);
});
setlistener("/instrumentation/adf[1]/frequencies/selected-khz", func {
update_displays_nav(6);
});
setlistener("/instrumentation/adf[1]/frequencies/standby-khz", func {
update_displays_nav(6);
});
setlistener("/instrumentation/nav[0]/radials/selected-deg", func {
update_displays_nav(1);
});
setlistener("/instrumentation/nav[2]/radials/selected-deg", func {
update_displays_nav(3);
});
setlistener("/instrumentation/nav[3]/radials/selected-deg", func {
update_displays_nav(4);
});
setlistener("/systems/radio/rmp[0]/nav", func(nav_mode) {
change_nav_mode(1, nav_mode);
});
setlistener("/systems/radio/rmp[1]/nav", func(nav_mode) {
change_nav_mode(2, nav_mode);
});

BIN
Splash/cockpit3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

View file

@ -10,9 +10,9 @@
<colors n="0"> <colors n="0">
<background n="0"> <background n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>0.05</blue> <blue>0.213</blue>
<green>0.05</green> <green>0.199</green>
<red>0.05</red> <red>0.191</red>
</background> </background>
<button n="0"> <button n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
@ -22,15 +22,15 @@
</button> </button>
<checkbox-foreground n="0"> <checkbox-foreground n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>0.05</blue> <blue>0.173</blue>
<green>0.05</green> <green>0.169</green>
<red>0.05</red> <red>0.161</red>
</checkbox-foreground> </checkbox-foreground>
<checkbox-highlight n="0"> <checkbox-highlight n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>0.9</blue> <blue>0.8</blue>
<green>0.9</green> <green>0.58</green>
<red>0.9</red> <red>0.44</red>
</checkbox-highlight> </checkbox-highlight>
<checkbox-misc n="0"> <checkbox-misc n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
@ -52,9 +52,9 @@
</dial-misc> </dial-misc>
<hrule n="0"> <hrule n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>1.0</blue> <blue>0.8</blue>
<green>0.0</green> <green>0.58</green>
<red>1.0</red> <red>0.44</red>
</hrule> </hrule>
<input n="0"> <input n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
@ -100,9 +100,9 @@
</textbox-editable> </textbox-editable>
<vrule n="0"> <vrule n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>1.0</blue> <blue>0.8</blue>
<green>0.0</green> <green>0.58</green>
<red>1.0</red> <red>0.44</red>
</vrule> </vrule>
</colors> </colors>
</style> </style>
@ -111,9 +111,9 @@
<colors n="0"> <colors n="0">
<background n="0"> <background n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>0.05</blue> <blue>0.213</blue>
<green>0.05</green> <green>0.199</green>
<red>0.05</red> <red>0.191</red>
</background> </background>
<button n="0"> <button n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
@ -123,15 +123,15 @@
</button> </button>
<checkbox-foreground n="0"> <checkbox-foreground n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>0.05</blue> <blue>0.173</blue>
<green>0.05</green> <green>0.169</green>
<red>0.05</red> <red>0.161</red>
</checkbox-foreground> </checkbox-foreground>
<checkbox-highlight n="0"> <checkbox-highlight n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>0.9</blue> <blue>0.8</blue>
<green>0.9</green> <green>0.58</green>
<red>0.9</red> <red>0.44</red>
</checkbox-highlight> </checkbox-highlight>
<checkbox-misc n="0"> <checkbox-misc n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
@ -153,9 +153,9 @@
</dial-misc> </dial-misc>
<hrule n="0"> <hrule n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>1.0</blue> <blue>0.8</blue>
<green>0.0</green> <green>0.58</green>
<red>1.0</red> <red>0.44</red>
</hrule> </hrule>
<input n="0"> <input n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
@ -201,9 +201,9 @@
</textbox-editable> </textbox-editable>
<vrule n="0"> <vrule n="0">
<alpha>0.95</alpha> <alpha>0.95</alpha>
<blue>1.0</blue> <blue>0.8</blue>
<green>0.0</green> <green>0.58</green>
<red>1.0</red> <red>0.44</red>
</vrule> </vrule>
</colors> </colors>
</style> </style>