fly/fgdata
1
0
Fork 0
Code Activity

Melchior FRANZ:

Browse source 
All necessary elements for an ADF gauge had been migrated from
Cockpit/kr_87.cxx to Instrumentation/adf.cxx. Migrating the sound
related elements was apparently planned, but not done yet. This
intermediate state broke the ident morse sound: it couldn't get
turned off and it always indicated "SF", regardless of the tuned-in
frequency. The following patches continue the migration:


adf-radio.diff     => Base/Aircraft/Instruments/adf-radio.xml:
---------------------------------------------------------------
* sets maximum volume to 1 (rather than 2); Not only is 1
  loud enough (and 2 unpleasantly noisy), it also prevents
  the knob from being turned to non-existant positions.  :-)
* fixes wrong use of /instrumentation/adf/ident
* the voice/ident selector(?) remains unchanged, but as it's
  not switched to "IDENT", there'll be no ident sound by default
  this is consistent with other sounds and DME.


radiostack.diff    => src/Cockpit/radiostack.[ch]xx:
---------------------------------------------------------------
* comment out use of FGKR_87 class. kr_87.[ch]xx is now no
  longer used. kr-87adf.xml would no longer work, either, but
  isn't used anywhere, anyway. Future adf radios have to use
  the adf instrument, using xml/Nasal for specific hardware
  implementation details.


adf.diff           => src/Instrumentation/adf.[ch]xx:
---------------------------------------------------------------
* adds ident morse sound capability using two new input
  properties:
  - /instrumentation/adf/volume-norm  (double)
  - /instrumentation/adf/ident-audible  (bool)
This commit is contained in:
ehofman 2004-08-19 11:55:18 +00:00
parent e7da67d023
commit d57e589fde
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Aircraft/Instruments/adf-radio.xml
View file

@ -33,7 +33,7 @@ properties' values.
<adf-freq-selected-prop>/instrumentation/adf/frequencies/selected-khz</adf-freq-selected-prop>
<adf-freq-standby-prop>/instrumentation/adf/frequencies/standby-khz</adf-freq-standby-prop>
<adf-morse-id-volume-prop>/instrumentation/adf/volume-norm</adf-morse-id-volume-prop>
<adf-morse-ident-toggle-prop>/instrumentation/adf/ident</adf-morse-ident-toggle-prop>
<adf-morse-ident-toggle-prop>/instrumentation/adf/ident-audible</adf-morse-ident-toggle-prop>
</params>
<layers>
@ -362,7 +362,7 @@ properties' values.
<property alias="../../../../params/adf-morse-id-volume-prop"/>
<step>0.5</step>
<min>0</min>
<max>2</max>
<max>1</max>
</binding>
</action>
@ -378,7 +378,7 @@ properties' values.
<property alias="../../../../params/adf-morse-id-volume-prop"/>
<step>-0.5</step>
<min>0</min>
<max>2</max>
<max>1</max>
</binding>
</action>