fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

System: Integrate radios properly into acconfig, and some fixes

Browse source
This commit is contained in:
Joshua Davidson 2018-09-27 14:22:02 -04:00
parent 4fd893cb54
commit 8201bc3dc3
5 changed files with 156 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
AircraftConfig/acconfig.nas
View file

@ -307,6 +307,9 @@ var beforestart_b = func {
setprop("/controls/adirs/mcducbtn", 1); setprop("/controls/adirs/mcducbtn", 1);
setprop("/controls/lighting/beacon", 1); setprop("/controls/lighting/beacon", 1);
setprop("/controls/lighting/nav-lights-switch", 1); setprop("/controls/lighting/nav-lights-switch", 1);
setprop("/controls/radio/rmp[0]/on", 1);
setprop("/controls/radio/rmp[1]/on", 1);
setprop("/controls/radio/rmp[2]/on", 1);
setprop("/controls/gear/brake-left", 0); setprop("/controls/gear/brake-left", 0);
setprop("/controls/gear/brake-right", 0); setprop("/controls/gear/brake-right", 0);
setprop("/systems/acconfig/autoconfig-running", 0); setprop("/systems/acconfig/autoconfig-running", 0);
@ -381,6 +384,9 @@ var taxi_b = func {
setprop("/controls/adirs/mcducbtn", 1); setprop("/controls/adirs/mcducbtn", 1);
setprop("/controls/lighting/beacon", 1); setprop("/controls/lighting/beacon", 1);
setprop("/controls/lighting/nav-lights-switch", 1); setprop("/controls/lighting/nav-lights-switch", 1);
setprop("/controls/radio/rmp[0]/on", 1);
setprop("/controls/radio/rmp[1]/on", 1);
setprop("/controls/radio/rmp[2]/on", 1);
settimer(taxi_c, 2); settimer(taxi_c, 2);
} }
var taxi_c = func { var taxi_c = func {

86
Models/Instruments/Radio/Radio1.xml
View file

@ -1375,7 +1375,7 @@
<!-- Active Display --> <!-- Active Display -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp1-active</object-name> <object-name>rmp-active</object-name>
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
@ -1407,11 +1407,11 @@
</animation> </animation>
<text> <text>
<name>rmp1-active</name> <name>rmp-active</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.21549</y-m> <y-m>-0.21625</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1434,7 +1434,7 @@
<!-- VHF3 Data Mode--> <!-- VHF3 Data Mode-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp1-active-vhf3-data</object-name> <object-name>rmp-active-vhf3-data</object-name>
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
@ -1462,11 +1462,11 @@
</animation> </animation>
<text> <text>
<name>rmp1-active-vhf3-data</name> <name>rmp-active-vhf3-data</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.21549</y-m> <y-m>-0.21625</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1489,7 +1489,7 @@
<!-- Test Illumination--> <!-- Test Illumination-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp1-active-test</object-name> <object-name>rmp-active-test</object-name>
<condition> <condition>
<equals> <equals>
<property>controls/switches/annun-test</property> <property>controls/switches/annun-test</property>
@ -1499,11 +1499,11 @@
</animation> </animation>
<text> <text>
<name>rmp1-active-test</name> <name>rmp-active-test</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.21549</y-m> <y-m>-0.21625</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1526,7 +1526,7 @@
<!-- STBY Display --> <!-- STBY Display -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp1-standby</object-name> <object-name>rmp-standby</object-name>
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
@ -1558,11 +1558,11 @@
</animation> </animation>
<text> <text>
<name>rmp1-standby</name> <name>rmp-standby</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.14896</y-m> <y-m>-0.14896</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1585,7 +1585,7 @@
<!-- VHF3 Data Mode--> <!-- VHF3 Data Mode-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp1-standby-vhf3-data</object-name> <object-name>rmp-standby-vhf3-data</object-name>
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
@ -1613,11 +1613,11 @@
</animation> </animation>
<text> <text>
<name>rmp1-standby-vhf3-data</name> <name>rmp-standby-vhf3-data</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.14896</y-m> <y-m>-0.14896</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1640,7 +1640,7 @@
<!-- Test Illumination--> <!-- Test Illumination-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp1-standby-test</object-name> <object-name>rmp-standby-test</object-name>
<condition> <condition>
<equals> <equals>
<property>controls/switches/annun-test</property> <property>controls/switches/annun-test</property>
@ -1650,11 +1650,11 @@
</animation> </animation>
<text> <text>
<name>rmp1-standby-test</name> <name>rmp-standby-test</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.14896</y-m> <y-m>-0.14896</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1673,4 +1673,36 @@
<height type="int">32</height> <height type="int">32</height>
</font-resolution> </font-resolution>
</text> </text>
<!-- Z Colors/Effects -->
<animation>
<type>material</type>
<object-name>rmp-active</object-name>
<object-name>rmp-active-test</object-name>
<object-name>rmp-active-vhf3-data</object-name>
<object-name>rmp-standby</object-name>
<object-name>rmp-standby-test</object-name>
<object-name>rmp-standby-vhf3-data</object-name>
<diffuse>
<red>0.89</red>
<green>0.37</green>
<blue>0.08</blue>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>0.89</red>
<green>0.37</green>
<blue>0.08</blue>
</emission>
</animation>
</PropertyList> </PropertyList>

86
Models/Instruments/Radio/Radio2.xml
View file

@ -1375,7 +1375,7 @@
<!-- Active Display --> <!-- Active Display -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp2-active</object-name> <object-name>rmp-active</object-name>
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
@ -1407,11 +1407,11 @@
</animation> </animation>
<text> <text>
<name>rmp2-active</name> <name>rmp-active</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.21549</y-m> <y-m>-0.21625</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1434,7 +1434,7 @@
<!-- VHF3 Data Mode--> <!-- VHF3 Data Mode-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp2-active-vhf3-data</object-name> <object-name>rmp-active-vhf3-data</object-name>
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
@ -1462,11 +1462,11 @@
</animation> </animation>
<text> <text>
<name>rmp2-active-vhf3-data</name> <name>rmp-active-vhf3-data</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.21549</y-m> <y-m>-0.21625</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1489,7 +1489,7 @@
<!-- Test Illumination--> <!-- Test Illumination-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp2-active-test</object-name> <object-name>rmp-active-test</object-name>
<condition> <condition>
<equals> <equals>
<property>controls/switches/annun-test</property> <property>controls/switches/annun-test</property>
@ -1499,11 +1499,11 @@
</animation> </animation>
<text> <text>
<name>rmp2-active-test</name> <name>rmp-active-test</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.21549</y-m> <y-m>-0.21625</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1526,7 +1526,7 @@
<!-- STBY Display --> <!-- STBY Display -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp2-standby</object-name> <object-name>rmp-standby</object-name>
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
@ -1558,11 +1558,11 @@
</animation> </animation>
<text> <text>
<name>rmp2-standby</name> <name>rmp-standby</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.14896</y-m> <y-m>-0.14896</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1585,7 +1585,7 @@
<!-- VHF3 Data Mode--> <!-- VHF3 Data Mode-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp2-standby-vhf3-data</object-name> <object-name>rmp-standby-vhf3-data</object-name>
<condition> <condition>
<and> <and>
<not-equals> <not-equals>
@ -1613,11 +1613,11 @@
</animation> </animation>
<text> <text>
<name>rmp2-standby-vhf3-data</name> <name>rmp-standby-vhf3-data</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.14896</y-m> <y-m>-0.14896</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1640,7 +1640,7 @@
<!-- Test Illumination--> <!-- Test Illumination-->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>rmp2-standby-test</object-name> <object-name>rmp-standby-test</object-name>
<condition> <condition>
<equals> <equals>
<property>controls/switches/annun-test</property> <property>controls/switches/annun-test</property>
@ -1650,11 +1650,11 @@
</animation> </animation>
<text> <text>
<name>rmp2-standby-test</name> <name>rmp-standby-test</name>
<offsets> <offsets>
<x-m>-0.22190</x-m> <x-m>-0.22205</x-m>
<y-m>-0.14896</y-m> <y-m>-0.14896</y-m>
<z-m>-0.12613</z-m> <z-m>-0.12582</z-m>
<heading-deg>90</heading-deg> <heading-deg>90</heading-deg>
</offsets> </offsets>
<alignment>center-center</alignment> <alignment>center-center</alignment>
@ -1673,4 +1673,36 @@
<height type="int">32</height> <height type="int">32</height>
</font-resolution> </font-resolution>
</text> </text>
<!-- Z Colors/Effects -->
<animation>
<type>material</type>
<object-name>rmp-active</object-name>
<object-name>rmp-active-test</object-name>
<object-name>rmp-active-vhf3-data</object-name>
<object-name>rmp-standby</object-name>
<object-name>rmp-standby-test</object-name>
<object-name>rmp-standby-vhf3-data</object-name>
<diffuse>
<red>0.89</red>
<green>0.37</green>
<blue>0.08</blue>
</diffuse>
<ambient>
<red>0</red>
<green>0</green>
<blue>0</blue>
</ambient>
<specular>
<red>0</red>
<green>0</green>
<blue>0</blue>
</specular>
<emission>
<red>0.89</red>
<green>0.37</green>
<blue>0.08</blue>
</emission>
</animation>
</PropertyList> </PropertyList>

51
Nasal/rmp.nas
View file

@ -11,36 +11,47 @@ var rmp_update = nil;
var act_vhf1 = props.globals.getNode("/instrumentation/comm[0]/frequencies/selected-mhz"); var act_vhf1 = props.globals.getNode("/instrumentation/comm[0]/frequencies/selected-mhz");
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.initNode("/instrumentation/comm[2]/frequencies/selected-mhz", 0); var act_vhf3 = props.globals.getNode("/instrumentation/comm[2]/frequencies/selected-mhz");
var act_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/active-display", "123.900"); var act_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/active-display", "123.900", "STRING");
var stby_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/standby-display", "118.700"); var stby_display_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/standby-display", "118.700", "STRING");
var stby_rmp1_vhf1 = props.globals.initNode("/systems/radio/rmp[0]/vhf1-standby", 118.7); var stby_rmp1_vhf1 = props.globals.initNode("/systems/radio/rmp[0]/vhf1-standby", 118.7, "DOUBLE");
var stby_rmp1_vhf2 = props.globals.initNode("/systems/radio/rmp[0]/vhf2-standby", 123.12); var stby_rmp1_vhf2 = props.globals.initNode("/systems/radio/rmp[0]/vhf2-standby", 123.12, "DOUBLE");
var stby_rmp1_vhf3 = props.globals.initNode("/systems/radio/rmp[0]/vhf3-standby", 121.5); var stby_rmp1_vhf3 = props.globals.initNode("/systems/radio/rmp[0]/vhf3-standby", 121.5, "DOUBLE");
var act_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/active-display", "127.900"); var act_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/active-display", "127.900", "STRING");
var stby_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/standby-display", "123.125"); var stby_display_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/standby-display", "123.125", "STRING");
var stby_rmp2_vhf1 = props.globals.initNode("/systems/radio/rmp[1]/vhf1-standby", 118.7); var stby_rmp2_vhf1 = props.globals.initNode("/systems/radio/rmp[1]/vhf1-standby", 118.7, "DOUBLE");
var stby_rmp2_vhf2 = props.globals.initNode("/systems/radio/rmp[1]/vhf2-standby", 123.12); var stby_rmp2_vhf2 = props.globals.initNode("/systems/radio/rmp[1]/vhf2-standby", 123.12, "DOUBLE");
var stby_rmp2_vhf3 = props.globals.initNode("/systems/radio/rmp[1]/vhf3-standby", 121.5); var stby_rmp2_vhf3 = props.globals.initNode("/systems/radio/rmp[1]/vhf3-standby", 121.5, "DOUBLE");
var act_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/active-display", "127.900"); var act_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/active-display", "127.900", "STRING");
var stby_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/standby-display", "123.125"); var stby_display_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/standby-display", "123.125", "STRING");
var stby_rmp3_vhf1 = props.globals.initNode("/systems/radio/rmp[2]/vhf1-standby", 118.7); var stby_rmp3_vhf1 = props.globals.initNode("/systems/radio/rmp[2]/vhf1-standby", 118.7, "DOUBLE");
var stby_rmp3_vhf2 = props.globals.initNode("/systems/radio/rmp[2]/vhf2-standby", 123.12); var stby_rmp3_vhf2 = props.globals.initNode("/systems/radio/rmp[2]/vhf2-standby", 123.12, "DOUBLE");
var stby_rmp3_vhf3 = props.globals.initNode("/systems/radio/rmp[2]/vhf3-standby", 121.5); var stby_rmp3_vhf3 = props.globals.initNode("/systems/radio/rmp[2]/vhf3-standby", 121.5, "DOUBLE");
var chan_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/sel_chan", "vhf1"); var chan_rmp1 = props.globals.initNode("/systems/radio/rmp[0]/sel_chan", "vhf1", "STRING");
var chan_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/sel_chan", "vhf2"); var chan_rmp2 = props.globals.initNode("/systems/radio/rmp[1]/sel_chan", "vhf2", "STRING");
var chan_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/sel_chan", "vhf3"); var chan_rmp3 = props.globals.initNode("/systems/radio/rmp[2]/sel_chan", "vhf3", "STRING");
var pwr_sw_rmp1 = props.globals.initNode("/controls/radio/rmp[0]/on", 0, "BOOL");
var pwr_sw_rmp2 = props.globals.initNode("/controls/radio/rmp[1]/on", 0, "BOOL");
var pwr_sw_rmp3 = props.globals.initNode("/controls/radio/rmp[2]/on", 0, "BOOL");
var init = func() { var init = func() {
for(var i = 0; i < 3; i += 1) { for(var i = 0; i < 3; i += 1) {
setprop("/systems/radio/rmp[" ~ i ~ "]/hf1-standby", 510); setprop("/systems/radio/rmp[" ~ i ~ "]/hf1-standby", 510);
setprop("/systems/radio/rmp[" ~ i ~ "]/hf2-standby", 891); setprop("/systems/radio/rmp[" ~ i ~ "]/hf2-standby", 891);
} }
chan_rmp1.setValue("vhf1");
chan_rmp2.setValue("vhf2");
chan_rmp3.setValue("vhf3");
pwr_sw_rmp1.setBoolValue(0);
pwr_sw_rmp2.setBoolValue(0);
pwr_sw_rmp3.setBoolValue(0);
var rmp_update = maketimer(0.2, func { var rmp_update = maketimer(0.2, func {
rmp_refresh.update(); rmp_refresh.update();
}); });

2
revision.txt
View file

@ -1 +1 @@
4652 4653