Add back power button binding, but move the location to /instrumentation/nav

[flightgear.git] / src / Instrumentation / kr_87.cxx

diff --git a/src/Instrumentation/kr_87.cxx b/src/Instrumentation/kr_87.cxx
index 58e358d7a2c2a980973958e772849594b40d64ab..5466ac8cf568fcfa1fcdc5ad20961318a9a9e167 100644 (file)
--- a/src/Instrumentation/kr_87.cxx
+++ b/src/Instrumentation/kr_87.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started April 2002.
 //
-// Copyright (C) 2002  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2002  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -120,115 +120,125 @@ void FGKR_87::init () {
 
 void FGKR_87::bind () {
     // internal values
-    fgTie("/radios/kr-87/internal/valid", this, &FGKR_87::get_valid);
-    fgTie("/radios/kr-87/internal/inrange", this, &FGKR_87::get_inrange);
-    fgTie("/radios/kr-87/internal/dist", this, &FGKR_87::get_dist);
-    fgTie("/radios/kr-87/internal/heading", this, &FGKR_87::get_heading);
+    fgTie("/instrumentation/kr-87/internal/valid", this, &FGKR_87::get_valid);
+    fgTie("/instrumentation/kr-87/internal/inrange", this,
+          &FGKR_87::get_inrange);
+    fgTie("/instrumentation/kr-87/internal/dist", this,
+          &FGKR_87::get_dist);
+    fgTie("/instrumentation/kr-87/internal/heading", this,
+          &FGKR_87::get_heading);
 
     // modes
-    fgTie("/radios/kr-87/modes/ant", this,
+    fgTie("/instrumentation/kr-87/modes/ant", this,
          &FGKR_87::get_ant_mode);
-    fgTie("/radios/kr-87/modes/stby", this,
+    fgTie("/instrumentation/kr-87/modes/stby", this,
          &FGKR_87::get_stby_mode);
-    fgTie("/radios/kr-87/modes/timer", this,
+    fgTie("/instrumentation/kr-87/modes/timer", this,
          &FGKR_87::get_timer_mode);
-    fgTie("/radios/kr-87/modes/count", this,
+    fgTie("/instrumentation/kr-87/modes/count", this,
          &FGKR_87::get_count_mode);
 
     // input and buttons
-    fgTie("/radios/kr-87/inputs/rotation-deg", this,
+    fgTie("/instrumentation/kr-87/inputs/rotation-deg", this,
          &FGKR_87::get_rotation, &FGKR_87::set_rotation);
-    fgSetArchivable("/radios/kr-87/inputs/rotation-deg");
-    fgTie("/radios/kr-87/inputs/power-btn", this,
+    fgSetArchivable("/instrumentation/kr-87/inputs/rotation-deg");
+    fgTie("/instrumentation/kr-87/inputs/power-btn", this,
          &FGKR_87::get_power_btn,
          &FGKR_87::set_power_btn);
-    fgSetArchivable("/radios/kr-87/inputs/power-btn");
-    fgTie("/radios/kr-87/inputs/audio-btn", this,
+    fgSetArchivable("/instrumentation/kr-87/inputs/power-btn");
+    fgTie("/instrumentation/kr-87/inputs/audio-btn", this,
          &FGKR_87::get_audio_btn,
          &FGKR_87::set_audio_btn);
-    fgSetArchivable("/radios/kr-87/inputs/audio-btn");
-    fgTie("/radios/kr-87/inputs/volume", this,
+    fgSetArchivable("/instrumentation/kr-87/inputs/audio-btn");
+    fgTie("/instrumentation/kr-87/inputs/volume", this,
          &FGKR_87::get_vol_btn,
          &FGKR_87::set_vol_btn);
-    fgSetArchivable("/radios/kr-87/inputs/volume");
-    fgTie("/radios/kr-87/inputs/adf-btn", this,
+    fgSetArchivable("/instrumentation/kr-87/inputs/volume");
+    fgTie("/instrumentation/kr-87/inputs/adf-btn", this,
          &FGKR_87::get_adf_btn,
          &FGKR_87::set_adf_btn);
-    fgTie("/radios/kr-87/inputs/bfo-btn", this,
+    fgTie("/instrumentation/kr-87/inputs/bfo-btn", this,
          &FGKR_87::get_bfo_btn,
          &FGKR_87::set_bfo_btn);
-    fgTie("/radios/kr-87/inputs/frq-btn", this,
+    fgTie("/instrumentation/kr-87/inputs/frq-btn", this,
          &FGKR_87::get_frq_btn,
          &FGKR_87::set_frq_btn);
-    fgTie("/radios/kr-87/inputs/flt-et-btn", this,
+    fgTie("/instrumentation/kr-87/inputs/flt-et-btn", this,
          &FGKR_87::get_flt_et_btn,
          &FGKR_87::set_flt_et_btn);
-    fgTie("/radios/kr-87/inputs/set-rst-btn", this,
+    fgTie("/instrumentation/kr-87/inputs/set-rst-btn", this,
          &FGKR_87::get_set_rst_btn,
          &FGKR_87::set_set_rst_btn);
 
     // outputs
-    fgTie("/radios/kr-87/outputs/selected-khz", this,
+    fgTie("/instrumentation/kr-87/outputs/selected-khz", this,
          &FGKR_87::get_freq, &FGKR_87::set_freq);
-    fgSetArchivable("/radios/kr-87/outputs/selected-khz");
-    fgTie("/radios/kr-87/outputs/standby-khz", this,
+    fgSetArchivable("/instrumentation/kr-87/outputs/selected-khz");
+    fgTie("/instrumentation/kr-87/outputs/standby-khz", this,
          &FGKR_87::get_stby_freq, &FGKR_87::set_stby_freq);
-    fgSetArchivable("/radios/kr-87/outputs/standby-khz");
-    fgTie("/radios/kr-87/outputs/needle-deg", this,
+    fgSetArchivable("/instrumentation/kr-87/outputs/standby-khz");
+    fgTie("/instrumentation/kr-87/outputs/needle-deg", this,
          &FGKR_87::get_needle_deg);
-    fgTie("/radios/kr-87/outputs/flight-timer", this, &FGKR_87::get_flight_timer);
-    fgTie("/radios/kr-87/outputs/elapsed-timer", this,
+    fgTie("/instrumentation/kr-87/outputs/flight-timer", this,
+          &FGKR_87::get_flight_timer);
+    fgTie("/instrumentation/kr-87/outputs/elapsed-timer", this,
           &FGKR_87::get_elapsed_timer,
           &FGKR_87::set_elapsed_timer);
 
     // annunciators
-    fgTie("/radios/kr-87/annunciators/ant", this, &FGKR_87::get_ant_ann );
-    fgTie("/radios/kr-87/annunciators/adf", this, &FGKR_87::get_adf_ann );
-    fgTie("/radios/kr-87/annunciators/bfo", this, &FGKR_87::get_bfo_ann );
-    fgTie("/radios/kr-87/annunciators/frq", this, &FGKR_87::get_frq_ann );
-    fgTie("/radios/kr-87/annunciators/flt", this, &FGKR_87::get_flt_ann );
-    fgTie("/radios/kr-87/annunciators/et", this, &FGKR_87::get_et_ann );
+    fgTie("/instrumentation/kr-87/annunciators/ant", this,
+          &FGKR_87::get_ant_ann );
+    fgTie("/instrumentation/kr-87/annunciators/adf", this,
+          &FGKR_87::get_adf_ann );
+    fgTie("/instrumentation/kr-87/annunciators/bfo", this,
+          &FGKR_87::get_bfo_ann );
+    fgTie("/instrumentation/kr-87/annunciators/frq", this,
+          &FGKR_87::get_frq_ann );
+    fgTie("/instrumentation/kr-87/annunciators/flt", this,
+          &FGKR_87::get_flt_ann );
+    fgTie("/instrumentation/kr-87/annunciators/et", this,
+          &FGKR_87::get_et_ann );
 }
 
 
 void FGKR_87::unbind () {
     // internal values
-    fgUntie("/radios/kr-87/internal/valid");
-    fgUntie("/radios/kr-87/internal/inrange");
-    fgUntie("/radios/kr-87/internal/dist");
-    fgUntie("/radios/kr-87/internal/heading");
+    fgUntie("/instrumentation/kr-87/internal/valid");
+    fgUntie("/instrumentation/kr-87/internal/inrange");
+    fgUntie("/instrumentation/kr-87/internal/dist");
+    fgUntie("/instrumentation/kr-87/internal/heading");
 
     // modes
-    fgUntie("/radios/kr-87/modes/ant");
-    fgUntie("/radios/kr-87/modes/stby");
-    fgUntie("/radios/kr-87/modes/timer");
-    fgUntie("/radios/kr-87/modes/count");
+    fgUntie("/instrumentation/kr-87/modes/ant");
+    fgUntie("/instrumentation/kr-87/modes/stby");
+    fgUntie("/instrumentation/kr-87/modes/timer");
+    fgUntie("/instrumentation/kr-87/modes/count");
 
     // input and buttons
-    fgUntie("/radios/kr-87/inputs/rotation-deg");
-    fgUntie("/radios/kr-87/inputs/power-btn");
-    fgUntie("/radios/kr-87/inputs/volume");
-    fgUntie("/radios/kr-87/inputs/adf-btn");
-    fgUntie("/radios/kr-87/inputs/bfo-btn");
-    fgUntie("/radios/kr-87/inputs/frq-btn");
-    fgUntie("/radios/kr-87/inputs/flt-et-btn");
-    fgUntie("/radios/kr-87/inputs/set-rst-btn");
-    fgUntie("/radios/kr-87/inputs/ident-btn");
+    fgUntie("/instrumentation/kr-87/inputs/rotation-deg");
+    fgUntie("/instrumentation/kr-87/inputs/power-btn");
+    fgUntie("/instrumentation/kr-87/inputs/volume");
+    fgUntie("/instrumentation/kr-87/inputs/adf-btn");
+    fgUntie("/instrumentation/kr-87/inputs/bfo-btn");
+    fgUntie("/instrumentation/kr-87/inputs/frq-btn");
+    fgUntie("/instrumentation/kr-87/inputs/flt-et-btn");
+    fgUntie("/instrumentation/kr-87/inputs/set-rst-btn");
+    fgUntie("/instrumentation/kr-87/inputs/ident-btn");
 
     // outputs
-    fgUntie("/radios/kr-87/outputs/selected-khz");
-    fgUntie("/radios/kr-87/outputs/standby-khz");
-    fgUntie("/radios/kr-87/outputs/needle-deg");
-    fgUntie("/radios/kr-87/outputs/flight-timer");
-    fgUntie("/radios/kr-87/outputs/elapsed-timer");
+    fgUntie("/instrumentation/kr-87/outputs/selected-khz");
+    fgUntie("/instrumentation/kr-87/outputs/standby-khz");
+    fgUntie("/instrumentation/kr-87/outputs/needle-deg");
+    fgUntie("/instrumentation/kr-87/outputs/flight-timer");
+    fgUntie("/instrumentation/kr-87/outputs/elapsed-timer");
 
     // annunciators
-    fgUntie("/radios/kr-87/annunciators/ant");
-    fgUntie("/radios/kr-87/annunciators/adf");
-    fgUntie("/radios/kr-87/annunciators/bfo");
-    fgUntie("/radios/kr-87/annunciators/frq");
-    fgUntie("/radios/kr-87/annunciators/flt");
-    fgUntie("/radios/kr-87/annunciators/et");
+    fgUntie("/instrumentation/kr-87/annunciators/ant");
+    fgUntie("/instrumentation/kr-87/annunciators/adf");
+    fgUntie("/instrumentation/kr-87/annunciators/bfo");
+    fgUntie("/instrumentation/kr-87/annunciators/frq");
+    fgUntie("/instrumentation/kr-87/annunciators/flt");
+    fgUntie("/instrumentation/kr-87/annunciators/et");
 }
 
 
@@ -432,7 +442,8 @@ void FGKR_87::update( double dt_sec ) {
     char formatted_timer[128];
     // cout << big << ":" << little << endl;
     snprintf(formatted_timer, 6, "%02d:%02d", big, little);
-    fgSetString( "/radios/kr-87/outputs/timer-string", formatted_timer );
+    fgSetString( "/instrumentation/kr-87/outputs/timer-string",
+                 formatted_timer );
 
     while ( goal_needle_deg < 0.0 ) { goal_needle_deg += 360.0; }
     while ( goal_needle_deg >= 360.0 ) { goal_needle_deg -= 360.0; }