fly/fgdata
1
0
Fork 0
Code Activity

Roy Vegard Ovesen:

Browse source 
I've finished the emigration of the radiostack, and I've also removed it
completely. It turned out that the comm radio is completely implemented in
the ATC subsystem. I've changed the affected ATC files to point
to /instrumentation/com, but I guess that the maintainer of the ATC code
should decide wether to make it configureable, and how.

I also had to change some files in Network and Main. The changes in network
should be obvious, but the changes in Main were a bit suspect. The files
included radiostack.hxx, but they weren't directly depending on
radiostack-hxx. They were depending on other files that were included by
radiostack.hxx. I got it to compile, but I'm not sure if I included the
correct directly depending file.

For the data directory I changed every occurrence of /radios/
with /instrumentation/ with this simple one-liner that I found on the net:

find -name '*.xml' -type f | xargs perl -pi -e
's/\/radios\//\/instrumentation\//g'

Instead of me sending all the files that got changed by this I suggest that
you execute the one-liner yourself. Of course I can not guarantee that this
will work perfectly, but I considered hand editing to be not an option (I'm
lazy). I don't want to test every aircraft to see if everything still works,
I think it's better to wait and see if anyone complaints about broken nav
radios/instruments.
This commit is contained in:
curt 2004-12-03 21:25:48 +00:00
parent f3a020f20f
commit 789560ea22
17 changed files with 137 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Aircraft/Generic/generic-autopilot.xml
View file

@ -427,7 +427,7 @@
<prop>/velocities/vertical-speed-fps</prop>
</input>
<reference>
<prop>/radios/nav[0]/gs-rate-of-climb</prop>
<prop>/instrumentation/nav[0]/gs-rate-of-climb</prop>
</reference>
<output>
<prop>/controls/flight/elevator-trim</prop>

6
Aircraft/Instruments-3d/vor/vor.xml
View file

@ -8,7 +8,7 @@
<name>LocalizerNeedleTransform</name>
<type>rotate</type>
<object-name>LocalizerNeedle</object-name>
<property>/radios/nav[0]/heading-needle-deflection</property>
<property>/instrumentation/nav[0]/heading-needle-deflection</property>
<factor>-3.2</factor>
<center>
<x-m>0</x-m>
@ -26,7 +26,7 @@
<name>GlidescopeNeedleTransform</name>
<type>rotate</type>
<object-name>GlidescopeNeedle</object-name>
<property>/radios/nav[0]/gs-needle-deflection</property>
<property>/instrumentation/nav[0]/gs-needle-deflection</property>
<factor>-3.2</factor>
<center>
<x-m>0</x-m>
@ -44,7 +44,7 @@
<name>RingTransform</name>
<type>rotate</type>
<object-name>Ring</object-name>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<factor>-1</factor>
<axis>
<x>-1</x>

10
Aircraft/Instruments/dme.xml
View file

@ -371,7 +371,7 @@ properties' values.
</condition>
<command>property-assign</command>
<property>/instrumentation/dme/frequencies/source</property>
<value>/radios/nav[0]/frequencies/selected-mhz</value>
<value>/instrumentation/nav[0]/frequencies/selected-mhz</value>
</binding>
<binding>
<condition>
@ -393,7 +393,7 @@ properties' values.
</condition>
<command>property-assign</command>
<property>/instrumentation/dme/frequencies/selected-mhz</property>
<property>/radios/nav[1]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[1]/frequencies/selected-mhz</property>
</binding>
</action>
@ -421,7 +421,7 @@ properties' values.
</condition>
<command>property-assign</command>
<property>/instrumentation/dme/frequencies/source</property>
<value>/radios/nav[0]/frequencies/selected-mhz</value>
<value>/instrumentation/nav[0]/frequencies/selected-mhz</value>
</binding>
<binding>
<condition>
@ -443,7 +443,7 @@ properties' values.
</condition>
<command>property-assign</command>
<property>/instrumentation/dme/frequencies/selected-mhz</property>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[0]/frequencies/selected-mhz</property>
</binding>
<binding>
<condition>
@ -454,7 +454,7 @@ properties' values.
</condition>
<command>property-assign</command>
<property>/instrumentation/dme/frequencies/source</property>
<value>/radios/nav[1]/frequencies/selected-mhz</value>
<value>/instrumentation/nav[1]/frequencies/selected-mhz</value>
</binding>
</action>

14
Aircraft/Instruments/hsi-bk-hi.xml
View file

@ -18,13 +18,13 @@ Mar 18 2003
<h-base>512</h-base>
<params>
<gs-needle>/radios/nav[0]/gs-needle-deflection</gs-needle>
<vor-needle>/radios/nav[0]/heading-needle-deflection</vor-needle>
<radial-selected-deg>/radios/nav[0]/radials/selected-deg</radial-selected-deg>
<to-flag>/radios/nav[0]/to-flag</to-flag>
<from-flag>/radios/nav[0]/from-flag</from-flag>
<vor-in-range>/radios/nav[0]/in-range</vor-in-range>
<has-gs>/radios/nav[0]/has-gs</has-gs>
<gs-needle>/instrumentation/nav[0]/gs-needle-deflection</gs-needle>
<vor-needle>/instrumentation/nav[0]/heading-needle-deflection</vor-needle>
<radial-selected-deg>/instrumentation/nav[0]/radials/selected-deg</radial-selected-deg>
<to-flag>/instrumentation/nav[0]/to-flag</to-flag>
<from-flag>/instrumentation/nav[0]/from-flag</from-flag>
<vor-in-range>/instrumentation/nav[0]/in-range</vor-in-range>
<has-gs>/instrumentation/nav[0]/has-gs</has-gs>
<heading-deg>/orientation/heading-magnetic-deg</heading-deg>
<autopilot-heading-deg>/autopilot/settings/heading-bug-deg</autopilot-heading-deg>
</params>

24
Aircraft/Instruments/hsi-hi.xml
View file

@ -12,7 +12,7 @@ Started 24-7-01 by Timothy Gale
<h-base>128</h-base>
<params>
<nav-gs-needle-deflection>/radios/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-gs-needle-deflection>/instrumentation/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<hsi-has-gs-needle>/sim/instrument-options/hsi[0]/has-gs-needle</hsi-has-gs-needle>
</params>
@ -45,7 +45,7 @@ Started 24-7-01 by Timothy Gale
<type>switch</type>
<layer>
<condition>
<property>/radios/nav[0]/to-flag</property>
<property>/instrumentation/nav[0]/to-flag</property>
</condition>
<name>TO flag</name>
<texture>
@ -63,7 +63,7 @@ Started 24-7-01 by Timothy Gale
<type>switch</type>
<layer>
<condition>
<property>/radios/nav[0]/from-flag</property>
<property>/instrumentation/nav[0]/from-flag</property>
</condition>
<name>FROM flag</name>
<texture>
@ -99,7 +99,7 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>0.0</min>
<max>360.0</max>
<scale>1.0</scale>
@ -164,7 +164,7 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>0.0</min>
<max>360.0</max>
<scale>1.0</scale>
@ -193,14 +193,14 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>0.0</min>
<max>360</max>
<scale>1.0</scale>
</transformation>
<transformation>
<type>x-shift</type>
<property>/radios/nav[0]/heading-needle-deflection</property>
<property>/instrumentation/nav[0]/heading-needle-deflection</property>
<min>-10.0</min>
<max>10.0</max>
<scale>3.2</scale>
@ -420,7 +420,7 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>0</min>
<max>360</max>
</transformation>
@ -438,7 +438,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>-1.0</step>
<min>0</min>
<max>360</max>
@ -455,7 +455,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>-5.0</step>
<min>0</min>
<max>360</max>
@ -472,7 +472,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>1.0</step>
<min>0</min>
<max>360</max>
@ -489,7 +489,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>5.0</step>
<min>0</min>
<max>360</max>

24
Aircraft/Instruments/hsi.xml
View file

@ -12,7 +12,7 @@ Started 24-7-01 by Timothy Gale
<h-base>128</h-base>
<params>
<nav-gs-needle-deflection>/radios/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-gs-needle-deflection>/instrumentation/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<hsi-has-gs-needle>/sim/instrument-options/hsi[0]/has-gs-needle</hsi-has-gs-needle>
</params>
@ -45,7 +45,7 @@ Started 24-7-01 by Timothy Gale
<type>switch</type>
<layer>
<condition>
<property>/radios/nav[0]/to-flag</property>
<property>/instrumentation/nav[0]/to-flag</property>
</condition>
<name>TO flag</name>
<texture>
@ -63,7 +63,7 @@ Started 24-7-01 by Timothy Gale
<type>switch</type>
<layer>
<condition>
<property>/radios/nav[0]/from-flag</property>
<property>/instrumentation/nav[0]/from-flag</property>
</condition>
<name>FROM flag</name>
<texture>
@ -99,7 +99,7 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>-360.0</min>
<max>360.0</max>
<scale>1.0</scale>
@ -164,7 +164,7 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>-360.0</min>
<max>360.0</max>
<scale>1.0</scale>
@ -193,14 +193,14 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>-360.0</min>
<max>360.0</max>
<scale>1.0</scale>
</transformation>
<transformation>
<type>x-shift</type>
<property>/radios/nav[0]/heading-needle-deflection</property>
<property>/instrumentation/nav[0]/heading-needle-deflection</property>
<min>-10.0</min>
<max>10.0</max>
<scale>3.2</scale>
@ -444,7 +444,7 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>0</min>
<max>360</max>
</transformation>
@ -462,7 +462,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>-1.0</step>
<min>0</min>
<max>360</max>
@ -479,7 +479,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>-5.0</step>
<min>0</min>
<max>360</max>
@ -496,7 +496,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>1.0</step>
<min>0</min>
<max>360</max>
@ -513,7 +513,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>5.0</step>
<min>0</min>
<max>360</max>

26
Aircraft/Instruments/hsi2.xml
View file

@ -12,10 +12,10 @@ Started 24-7-01 by Timothy Gale
<h-base>134</h-base>
<params>
<nav-radial-selected>/radios/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-to-flag>/radios/nav[0]/to-flag</nav-to-flag>
<nav-from-flag>/radios/nav[0]/from-flag</nav-from-flag>
<nav-gs-needle-deflection>/radios/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-radial-selected>/instrumentation/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-to-flag>/instrumentation/nav[0]/to-flag</nav-to-flag>
<nav-from-flag>/instrumentation/nav[0]/from-flag</nav-from-flag>
<nav-gs-needle-deflection>/instrumentation/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<hsi-has-gs-needle>/sim/instrument-options/hsi[0]/has-gs-needle</hsi-has-gs-needle>
<heading-deg>/orientation/heading-magnetic-deg</heading-deg>
<autopilot-heading-deg>/autopilot/settings/heading-bug-deg</autopilot-heading-deg>
@ -148,7 +148,7 @@ Started 24-7-01 by Timothy Gale
<scale>-1.0</scale>
</transformation>
<transformation>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<type>rotation</type>
<scale>1.0</scale>
</transformation>
@ -211,7 +211,7 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<type>rotation</type>
<scale>1.0</scale>
</transformation>
@ -237,13 +237,13 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<type>rotation</type>
<scale>1.0</scale>
</transformation>
<transformation>
<type>x-shift</type>
<property>/radios/nav[0]/heading-needle-deflection</property>
<property>/instrumentation/nav[0]/heading-needle-deflection</property>
<min>-10.0</min>
<max>10.0</max>
<scale>2.2</scale>
@ -450,7 +450,7 @@ Started 24-7-01 by Timothy Gale
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>0</min>
<max>360</max>
</transformation>
@ -468,7 +468,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>-1.0</step>
<min>0</min>
<max>360</max>
@ -485,7 +485,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>-5.0</step>
<min>0</min>
<max>360</max>
@ -502,7 +502,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>1.0</step>
<min>0</min>
<max>360</max>
@ -519,7 +519,7 @@ Started 24-7-01 by Timothy Gale
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>5.0</step>
<min>0</min>
<max>360</max>

10
Aircraft/Instruments/nav1-hi.xml
View file

@ -29,11 +29,11 @@ properties' values.
<h-base>128</h-base>
<params>
<nav-to-flag>/radios/nav[0]/to-flag</nav-to-flag> -->
<nav-from-flag>/radios/nav[0]/from-flag</nav-from-flag> -->
<nav-radial-selected>/radios/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/radios/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/radios/nav[0]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-to-flag>/instrumentation/nav[0]/to-flag</nav-to-flag> -->
<nav-from-flag>/instrumentation/nav[0]/from-flag</nav-from-flag> -->
<nav-radial-selected>/instrumentation/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/instrumentation/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/instrumentation/nav[0]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-has-gs-needle>/sim/instrument-options/nav[0]/has-gs-needle</nav-has-gs-needle>
<nav-needles-pivot>/sim/instrument-options/nav[0]/needles-pivot</nav-needles-pivot>
</params>

10
Aircraft/Instruments/nav1.xml
View file

@ -29,11 +29,11 @@ properties' values.
<h-base>128</h-base>
<params>
<nav-to-flag>/radios/nav[0]/to-flag</nav-to-flag> -->
<nav-from-flag>/radios/nav[0]/from-flag</nav-from-flag> -->
<nav-radial-selected>/radios/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/radios/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/radios/nav[0]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-to-flag>/instrumentation/nav[0]/to-flag</nav-to-flag> -->
<nav-from-flag>/instrumentation/nav[0]/from-flag</nav-from-flag> -->
<nav-radial-selected>/instrumentation/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/instrumentation/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/instrumentation/nav[0]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-has-gs-needle>/sim/instrument-options/nav[0]/has-gs-needle</nav-has-gs-needle>
<nav-needles-pivot>/sim/instrument-options/nav[0]/needles-pivot</nav-needles-pivot>
</params>

32
Aircraft/Instruments/nav3.xml
View file

@ -45,7 +45,7 @@ properties' values.
<transformations>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>0</min>
<max>360</max>
<scale>-1.0</scale>
@ -60,7 +60,7 @@ properties' values.
<h>64</h>
<layer>
<condition>
<property>/radios/dme/in-range</property>
<property>/instrumentation/dme/in-range</property>
</condition>
<name>display</name>
<type>text</type>
@ -73,7 +73,7 @@ properties' values.
<chunks>
<chunk>
<type>number-value</type>
<property>/radios/dme/distance-nm</property>
<property>/instrumentation/dme/distance-nm</property>
<format>%3.1f</format>
</chunk>
</chunks>
@ -118,7 +118,7 @@ properties' values.
<chunks>
<chunk>
<type>number-value</type>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[0]/frequencies/selected-mhz</property>
<format>%3.2f</format>
</chunk>
</chunks>
@ -151,7 +151,7 @@ properties' values.
<type>switch</type>
<layer>
<condition>
<property>/radios/nav[0]/to-flag</property>
<property>/instrumentation/nav[0]/to-flag</property>
</condition>
<name>TO flag</name>
<texture>
@ -169,7 +169,7 @@ properties' values.
<type>switch</type>
<layer>
<condition>
<property>/radios/nav[1]/from-flag</property>
<property>/instrumentation/nav[1]/from-flag</property>
</condition>
<name>FROM flag</name>
<texture>
@ -216,7 +216,7 @@ properties' values.
<transformations>
<transformation>
<type>x-shift</type>
<property>/radios/nav[0]/heading-needle-deflection</property>
<property>/instrumentation/nav[0]/heading-needle-deflection</property>
<min>-10.0</min>
<max>10.0</max>
<scale>3.2</scale>
@ -311,7 +311,7 @@ properties' values.
</transformation>
<transformation>
<type>rotation</type>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<min>0</min>
<max>360</max>
</transformation>
@ -384,7 +384,7 @@ properties' values.
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[0]/frequencies/selected-mhz</property>
<step>-0.05</step>
<min>108.0</min>
<max>118.0</max>
@ -402,7 +402,7 @@ properties' values.
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[0]/frequencies/selected-mhz</property>
<step>-0.5</step>
<min>108.0</min>
<max>118.0</max>
@ -420,7 +420,7 @@ properties' values.
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[0]/frequencies/selected-mhz</property>
<step>-0.05</step>
<min>108.0</min>
<max>118.0</max>
@ -438,7 +438,7 @@ properties' values.
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[0]/frequencies/selected-mhz</property>
<step>-0.5</step>
<min>108.0</min>
<max>118.0</max>
@ -456,7 +456,7 @@ properties' values.
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>-1.0</step>
<min>0</min>
<max>360</max>
@ -473,7 +473,7 @@ properties' values.
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>-5.0</step>
<min>0</min>
<max>360</max>
@ -490,7 +490,7 @@ properties' values.
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>1.0</step>
<min>0</min>
<max>360</max>
@ -507,7 +507,7 @@ properties' values.
<h>24</h>
<binding>
<command>property-adjust</command>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
<step>5.0</step>
<min>0</min>
<max>360</max>

12
Aircraft/Instruments/navcom-kx155.xml
View file

@ -31,12 +31,12 @@ properties' values.
<h-base>86</h-base>
<params>
<comm-freq-selected-prop>/radios/comm[0]/frequencies/selected-mhz</comm-freq-selected-prop>
<comm-freq-standby-prop>/radios/comm[0]/frequencies/standby-mhz</comm-freq-standby-prop>
<nav-freq-selected-prop>/radios/nav[0]/frequencies/selected-mhz</nav-freq-selected-prop>
<nav-freq-standby-prop>/radios/nav[0]/frequencies/standby-mhz</nav-freq-standby-prop>
<nav-morse-id-volume-prop>/radios/nav[0]/volume</nav-morse-id-volume-prop>
<nav-morse-ident-toggle-prop>/radios/nav[0]/ident</nav-morse-ident-toggle-prop>
<comm-freq-selected-prop>/instrumentation/comm[0]/frequencies/selected-mhz</comm-freq-selected-prop>
<comm-freq-standby-prop>/instrumentation/comm[0]/frequencies/standby-mhz</comm-freq-standby-prop>
<nav-freq-selected-prop>/instrumentation/nav[0]/frequencies/selected-mhz</nav-freq-selected-prop>
<nav-freq-standby-prop>/instrumentation/nav[0]/frequencies/standby-mhz</nav-freq-standby-prop>
<nav-morse-id-volume-prop>/instrumentation/nav[0]/volume</nav-morse-id-volume-prop>
<nav-morse-ident-toggle-prop>/instrumentation/nav[0]/ident</nav-morse-ident-toggle-prop>
</params>
<layers>

12
Aircraft/Instruments/navcom-radio.xml
View file

@ -31,12 +31,12 @@ properties' values.
<h-base>64</h-base>
<params>
<comm-freq-selected-prop>/radios/comm[0]/frequencies/selected-mhz</comm-freq-selected-prop>
<comm-freq-standby-prop>/radios/comm[0]/frequencies/standby-mhz</comm-freq-standby-prop>
<nav-freq-selected-prop>/radios/nav[0]/frequencies/selected-mhz</nav-freq-selected-prop>
<nav-freq-standby-prop>/radios/nav[0]/frequencies/standby-mhz</nav-freq-standby-prop>
<nav-morse-id-volume-prop>/radios/nav[0]/volume</nav-morse-id-volume-prop>
<nav-morse-ident-toggle-prop>/radios/nav[0]/ident</nav-morse-ident-toggle-prop>
<comm-freq-selected-prop>/instrumentation/comm[0]/frequencies/selected-mhz</comm-freq-selected-prop>
<comm-freq-standby-prop>/instrumentation/comm[0]/frequencies/standby-mhz</comm-freq-standby-prop>
<nav-freq-selected-prop>/instrumentation/nav[0]/frequencies/selected-mhz</nav-freq-selected-prop>
<nav-freq-standby-prop>/instrumentation/nav[0]/frequencies/standby-mhz</nav-freq-standby-prop>
<nav-morse-id-volume-prop>/instrumentation/nav[0]/volume</nav-morse-id-volume-prop>
<nav-morse-ident-toggle-prop>/instrumentation/nav[0]/ident</nav-morse-ident-toggle-prop>
</params>
<layers>

14
Aircraft/Instruments/vor1-c172s.xml
View file

@ -18,14 +18,14 @@ Jan 26 2003
<h-base>512</h-base>
<params>
<nav-to-flag>/radios/nav[0]/to-flag</nav-to-flag> -->
<nav-from-flag>/radios/nav[0]/from-flag</nav-from-flag> -->
<nav-radial-selected>/radios/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/radios/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/radios/nav[0]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-to-flag>/instrumentation/nav[0]/to-flag</nav-to-flag> -->
<nav-from-flag>/instrumentation/nav[0]/from-flag</nav-from-flag> -->
<nav-radial-selected>/instrumentation/nav[0]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/instrumentation/nav[0]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/instrumentation/nav[0]/heading-needle-deflection</nav-heading-needle-deflection>
<!-- when posible change to nav-gs-in-range -->
<nav-gs-in-range>/radios/nav[0]/in-range</nav-gs-in-range>
<nav-in-range>/radios/nav[0]/in-range</nav-in-range>
<nav-gs-in-range>/instrumentation/nav[0]/in-range</nav-gs-in-range>
<nav-in-range>/instrumentation/nav[0]/in-range</nav-in-range>
</params>
<layers>

10
Aircraft/Instruments/vor2-c172s.xml
View file

@ -18,11 +18,11 @@ Jan 26 2003
<h-base>512</h-base>
<params>
<nav-to-flag>/radios/nav[1]/to-flag</nav-to-flag> -->
<nav-from-flag>/radios/nav[1]/from-flag</nav-from-flag> -->
<nav-radial-selected>/radios/nav[1]/radials/selected-deg</nav-radial-selected>
<nav-heading-needle-deflection>/radios/nav[1]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-in-range>/radios/nav[1]/in-range</nav-in-range>
<nav-to-flag>/instrumentation/nav[1]/to-flag</nav-to-flag> -->
<nav-from-flag>/instrumentation/nav[1]/from-flag</nav-from-flag> -->
<nav-radial-selected>/instrumentation/nav[1]/radials/selected-deg</nav-radial-selected>
<nav-heading-needle-deflection>/instrumentation/nav[1]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-in-range>/instrumentation/nav[1]/in-range</nav-in-range>
</params>
<layers>

22
Aircraft/c172p/Models/c172p-2d-panel.xml
View file

@ -195,11 +195,11 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
<instrument include="../../Instruments/nav1.xml">
<name>VOR 2 Gauge</name>
<params>
<nav-to-flag>/radios/nav[1]/to-flag</nav-to-flag>
<nav-from-flag>/radios/nav[1]/from-flag</nav-from-flag>
<nav-radial-selected>/radios/nav[1]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/radios/nav[1]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/radios/nav[1]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-to-flag>/instrumentation/nav[1]/to-flag</nav-to-flag>
<nav-from-flag>/instrumentation/nav[1]/from-flag</nav-from-flag>
<nav-radial-selected>/instrumentation/nav[1]/radials/selected-deg</nav-radial-selected>
<nav-gs-needle-deflection>/instrumentation/nav[1]/gs-needle-deflection</nav-gs-needle-deflection>
<nav-heading-needle-deflection>/instrumentation/nav[1]/heading-needle-deflection</nav-heading-needle-deflection>
<nav-has-gs-needle>/sim/instrument-options/nav[1]/has-gs-needle</nav-has-gs-needle>
<nav-needles-pivot>/sim/instrument-options/nav[1]/needles-pivot</nav-needles-pivot>
</params>
@ -237,12 +237,12 @@ Legacy 2D instruments and actions for the 3D C172P cockpit.
<instrument include="../../Instruments/navcom-radio.xml">
<name>NavCom 2 Radio</name>
<params>
<comm-freq-selected-prop>/radios/comm[1]/frequencies/selected-mhz</comm-freq-selected-prop>
<comm-freq-standby-prop>/radios/comm[1]/frequencies/standby-mhz</comm-freq-standby-prop>
<nav-freq-selected-prop>/radios/nav[1]/frequencies/selected-mhz</nav-freq-selected-prop>
<nav-freq-standby-prop>/radios/nav[1]/frequencies/standby-mhz</nav-freq-standby-prop>
<nav-morse-id-volume-prop>/radios/nav[1]/volume</nav-morse-id-volume-prop>
<nav-morse-ident-toggle-prop>/radios/nav[1]/ident</nav-morse-ident-toggle-prop>
<comm-freq-selected-prop>/instrumentation/comm[1]/frequencies/selected-mhz</comm-freq-selected-prop>
<comm-freq-standby-prop>/instrumentation/comm[1]/frequencies/standby-mhz</comm-freq-standby-prop>
<nav-freq-selected-prop>/instrumentation/nav[1]/frequencies/selected-mhz</nav-freq-selected-prop>
<nav-freq-standby-prop>/instrumentation/nav[1]/frequencies/standby-mhz</nav-freq-standby-prop>
<nav-morse-id-volume-prop>/instrumentation/nav[1]/volume</nav-morse-id-volume-prop>
<nav-morse-ident-toggle-prop>/instrumentation/nav[1]/ident</nav-morse-ident-toggle-prop>
</params>
<x>880</x>
<y>150</y>

8
Aircraft/c172p/Systems/KAP140.xml
View file

@ -23,7 +23,7 @@
<value>nav</value>
</enable>
<input>
<prop>/radios/nav/heading-needle-deflection</prop>
<prop>/instrumentation/nav/heading-needle-deflection</prop>
</input>
<reference>
<value>0.0</value>
@ -53,7 +53,7 @@
<value>apr</value>
</enable>
<input>
<prop>/radios/nav/heading-needle-deflection</prop>
<prop>/instrumentation/nav/heading-needle-deflection</prop>
</input>
<reference>
<value>0.0</value>
@ -83,7 +83,7 @@
<value>rev</value>
</enable>
<input>
<prop>/radios/nav/heading-needle-deflection</prop>
<prop>/instrumentation/nav/heading-needle-deflection</prop>
<scale>-1.0</scale>
</input>
<reference>
@ -211,7 +211,7 @@
<value>gs</value>
</enable>
<input>
<prop>/radios/nav/gs-needle-deflection</prop>
<prop>/instrumentation/nav/gs-needle-deflection</prop>
</input>
<reference>
<value>0.0</value>

38
gui/dialogs/radios.xml
View file

@ -46,7 +46,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/comm[0]/frequencies/selected-mhz</property>
<property>/instrumentation/comm[0]/frequencies/selected-mhz</property>
</input>
<button>
@ -63,8 +63,8 @@
</binding>
<binding>
<command>property-swap</command>
<property>/radios/comm[0]/frequencies/selected-mhz</property>
<property>/radios/comm[0]/frequencies/standby-mhz</property>
<property>/instrumentation/comm[0]/frequencies/selected-mhz</property>
<property>/instrumentation/comm[0]/frequencies/standby-mhz</property>
</binding>
<binding>
<command>dialog-update</command>
@ -83,7 +83,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/comm[0]/frequencies/standby-mhz</property>
<property>/instrumentation/comm[0]/frequencies/standby-mhz</property>
</input>
</group>
@ -103,7 +103,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/comm[1]/frequencies/selected-mhz</property>
<property>/instrumentation/comm[1]/frequencies/selected-mhz</property>
</input>
<button>
@ -120,8 +120,8 @@
</binding>
<binding>
<command>property-swap</command>
<property>/radios/comm[1]/frequencies/selected-mhz</property>
<property>/radios/comm[1]/frequencies/standby-mhz</property>
<property>/instrumentation/comm[1]/frequencies/selected-mhz</property>
<property>/instrumentation/comm[1]/frequencies/standby-mhz</property>
</binding>
<binding>
<command>dialog-update</command>
@ -140,7 +140,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/comm[1]/frequencies/standby-mhz</property>
<property>/instrumentation/comm[1]/frequencies/standby-mhz</property>
</input>
</group>
@ -160,7 +160,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[0]/frequencies/selected-mhz</property>
</input>
<button>
@ -177,8 +177,8 @@
</binding>
<binding>
<command>property-swap</command>
<property>/radios/nav[0]/frequencies/selected-mhz</property>
<property>/radios/nav[0]/frequencies/standby-mhz</property>
<property>/instrumentation/nav[0]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[0]/frequencies/standby-mhz</property>
</binding>
<binding>
<command>dialog-update</command>
@ -197,7 +197,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/nav[0]/frequencies/standby-mhz</property>
<property>/instrumentation/nav[0]/frequencies/standby-mhz</property>
</input>
<input>
@ -207,7 +207,7 @@
<width>75</width>
<height>25</height>
<label>deg</label>
<property>/radios/nav[0]/radials/selected-deg</property>
<property>/instrumentation/nav[0]/radials/selected-deg</property>
</input>
</group>
@ -227,7 +227,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/nav[1]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[1]/frequencies/selected-mhz</property>
</input>
<button>
@ -244,8 +244,8 @@
</binding>
<binding>
<command>property-swap</command>
<property>/radios/nav[1]/frequencies/selected-mhz</property>
<property>/radios/nav[1]/frequencies/standby-mhz</property>
<property>/instrumentation/nav[1]/frequencies/selected-mhz</property>
<property>/instrumentation/nav[1]/frequencies/standby-mhz</property>
</binding>
<binding>
<command>dialog-update</command>
@ -264,7 +264,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/nav[1]/frequencies/standby-mhz</property>
<property>/instrumentation/nav[1]/frequencies/standby-mhz</property>
</input>
<input>
@ -274,7 +274,7 @@
<width>75</width>
<height>25</height>
<label>deg</label>
<property>/radios/nav[1]/radials/selected-deg</property>
<property>/instrumentation/nav[1]/radials/selected-deg</property>
</input>
</group>
@ -361,7 +361,7 @@
<width>75</width>
<height>25</height>
<label>MHz</label>
<property>/radios/dme/frequencies/selected-khz</property>
<property>/instrumentation/dme/frequencies/selected-khz</property>
</input>
</group>