X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCockpit%2Fkr_87.cxx;h=b297055a86228a6528755cb13dfbfd75738729cb;hb=2bc09e5268284b4d7009fa66930bcfc937400f3b;hp=a675f1adc57cc4605c004929ae66089eb99c332c;hpb=923805006857f7ae5626acd27ee549e4b2c636d0;p=flightgear.git

diff --git a/src/Cockpit/kr_87.cxx b/src/Cockpit/kr_87.cxx
index a675f1adc..b297055a8 100644
--- a/src/Cockpit/kr_87.cxx
+++ b/src/Cockpit/kr_87.cxx
@@ -32,7 +32,6 @@
 
 #include <Aircraft/aircraft.hxx>
 #include <Navaids/navlist.hxx>
-#include <Time/FGEventMgr.hxx>
 
 #include "kr_87.hxx"
 
@@ -52,7 +51,7 @@ static double kludgeRange ( double stationElev, double aircraftElev,
 				// Assume that the nominal range (usually
 				// 50nm) applies at a 5,000 ft difference.
 				// Just a wild guess!
-  double factor = ((aircraftElev*SG_METER_TO_FEET) - stationElev) / 5000.0;
+  double factor = (aircraftElev - stationElev)*SG_METER_TO_FEET / 5000.0;
   double range = fabs(nominalRange * factor);
 
 				// Clamp the range to keep it sane; for
@@ -73,6 +72,8 @@ FGKR_87::FGKR_87() :
     lon_node(fgGetNode("/position/longitude-deg", true)),
     lat_node(fgGetNode("/position/latitude-deg", true)),
     alt_node(fgGetNode("/position/altitude-ft", true)),
+    bus_power(fgGetNode("/systems/electrical/outputs/adf", true)),
+    serviceable(fgGetNode("/instrumentation/adf/serviceable", true)),
     need_update(true),
     valid(false),
     inrange(false),
@@ -85,7 +86,9 @@ FGKR_87::FGKR_87() :
     timer_mode(0),
     count_mode(0),
     rotation(0),
-    on_off_vol_btn(0.5),
+    power_btn(true),
+    audio_btn(true),
+    vol_btn(0.5),
     adf_btn(true),
     bfo_btn(false),
     frq_btn(false),
@@ -94,40 +97,24 @@ FGKR_87::FGKR_87() :
     last_flt_et_btn(false),
     set_rst_btn(false),
     last_set_rst_btn(false),
-    ident_btn(false),
-    freq(0.0),
-    stby_freq(0.0),
+    freq(0),
+    stby_freq(0),
     needle_deg(0.0),
     flight_timer(0.0),
     elapsed_timer(0.0),
     tmp_timer(0.0)
 {
-    SGPath path( globals->get_fg_root() );
-    SGPath term = path;
-    term.append( "Navaids/range.term" );
-    SGPath low = path;
-    low.append( "Navaids/range.low" );
-    SGPath high = path;
-    high.append( "Navaids/range.high" );
-
-    term_tbl = new SGInterpTable( term.str() );
-    low_tbl = new SGInterpTable( low.str() );
-    high_tbl = new SGInterpTable( high.str() );
 }
 
 
 // Destructor
 FGKR_87::~FGKR_87() {
-    delete term_tbl;
-    delete low_tbl;
-    delete high_tbl;
 }
 
 
 void FGKR_87::init () {
+    serviceable->setBoolValue( true );
     morse.init();
-
-    update(0);			// FIXME: use dt
 }
 
 
@@ -152,10 +139,18 @@ void FGKR_87::bind () {
     fgTie("/radios/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/on-off-volume", this,
-	  &FGKR_87::get_on_off_vol_btn,
-	  &FGKR_87::set_on_off_vol_btn);
-    fgSetArchivable("/radios/kr-87/inputs/on-off-volume");
+    fgTie("/radios/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,
+	  &FGKR_87::get_audio_btn,
+	  &FGKR_87::set_audio_btn);
+    fgSetArchivable("/radios/kr-87/inputs/audio-btn");
+    fgTie("/radios/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,
 	  &FGKR_87::get_adf_btn,
 	  &FGKR_87::set_adf_btn);
@@ -171,8 +166,6 @@ void FGKR_87::bind () {
     fgTie("/radios/kr-87/inputs/set-rst-btn", this,
 	  &FGKR_87::get_set_rst_btn,
 	  &FGKR_87::set_set_rst_btn);
-    fgTie("/radios/kr-87/inputs/ident-btn", this,
-	  &FGKR_87::get_ident_btn, &FGKR_87::set_ident_btn);
 
     // outputs
     fgTie("/radios/kr-87/outputs/selected-khz", this,
@@ -213,7 +206,8 @@ void FGKR_87::unbind () {
 
     // input and buttons
     fgUntie("/radios/kr-87/inputs/rotation-deg");
-    fgUntie("/radios/kr-87/inputs/on-off-volume");
+    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");
@@ -254,16 +248,17 @@ void FGKR_87::update( double dt ) {
     // Radio
     ////////////////////////////////////////////////////////////////////////
 
-    if ( on_off_vol_btn >= 0.05 ) {
+    if ( has_power() && serviceable->getBoolValue() ) {
         // buttons
         if ( adf_btn == 0 ) {
             ant_mode = 1;
         } else {
             ant_mode = 0;
         }
+        // cout << "ant_mode = " << ant_mode << endl;
 
         if ( frq_btn && frq_btn != last_frq_btn && stby_mode == 0 ) {
-            double tmp = freq;
+            int tmp = freq;
             freq = stby_freq;
             stby_freq = tmp;
         } else if ( frq_btn ) {
@@ -289,10 +284,10 @@ void FGKR_87::update( double dt ) {
         if ( set_rst_btn == 1 && set_rst_btn == last_set_rst_btn ) {
             // button depressed and was last iteration too
             tmp_timer += dt;
-            cout << "tmp_timer = " << tmp_timer << endl;
+            // cout << "tmp_timer = " << tmp_timer << endl;
             if ( tmp_timer > 2.0 ) {
                 // button held depressed for 2 seconds
-                cout << "entering elapsed count down mode" << endl;
+                // cout << "entering elapsed count down mode" << endl;
                 timer_mode = 1;
                 count_mode = 2;
                 elapsed_timer = 0.0;
@@ -329,8 +324,8 @@ void FGKR_87::update( double dt ) {
         }
 
         // annunciators
-        ant_ann = adf_btn;
-        adf_ann = !adf_btn;
+        ant_ann = !adf_btn;
+        adf_ann = adf_btn;
         bfo_ann = bfo_btn;
         frq_ann = !stby_mode;
         flt_ann = stby_mode && !timer_mode;
@@ -348,6 +343,7 @@ void FGKR_87::update( double dt ) {
         }
 
         if ( valid ) {
+            // cout << "adf is valid" << endl;
             // staightline distance
             station = Point3D( x, y, z );
             dist = aircraft.distance3D( station );
@@ -373,6 +369,8 @@ void FGKR_87::update( double dt ) {
                 inrange = false;
             }
 
+            // cout << "inrange = " << inrange << endl;
+
             if ( inrange ) {
                 goal_needle_deg = heading
                     - fgGetDouble("/orientation/heading-deg");
@@ -446,15 +444,18 @@ void FGKR_87::update( double dt ) {
     // cout << "flt = " << flight_timer << " et = " << elapsed_timer 
     //      << " needle = " << needle_deg << endl;
 
-#ifdef ENABLE_AUDIO_SUPPORT
-    if ( valid && inrange ) {
-	// play station ident via audio system if on + ident_btn,
+    if ( valid && inrange && serviceable->getBoolValue() ) {
+	// play station ident via audio system if on + ant mode,
 	// otherwise turn it off
-	if ( on_off_vol_btn >= 0.01 && ident_btn ) {
-	    FGSimpleSound *sound;
+	if ( vol_btn >= 0.01 && audio_btn ) {
+	    SGSoundSample *sound;
 	    sound = globals->get_soundmgr()->find( "adf-ident" );
             if ( sound != NULL ) {
-                sound->set_volume( on_off_vol_btn );
+                if ( !adf_btn ) {
+                    sound->set_volume( vol_btn );
+                } else {
+                    sound->set_volume( vol_btn / 4.0 );
+                }
             } else {
                 SG_LOG( SG_COCKPIT, SG_ALERT, "Can't find adf-ident sound" );
             }
@@ -474,7 +475,6 @@ void FGKR_87::update( double dt ) {
 	    globals->get_soundmgr()->stop( "adf-ident" );
 	}
     }
-#endif
 }
 
 
@@ -485,39 +485,39 @@ void FGKR_87::search() {
     double acft_elev = alt_node->getDoubleValue() * SG_FEET_TO_METER;
 
 				// FIXME: the panel should handle this
-    FGNav nav;
-
     static string last_ident = "";
 
     ////////////////////////////////////////////////////////////////////////
     // ADF.
     ////////////////////////////////////////////////////////////////////////
 
-    if ( current_navlist->query( acft_lon, acft_lat, acft_elev, freq, &nav ) ) {
+    FGNavRecord *adf
+        = globals->get_navlist()->findByFreq( freq, acft_lon, acft_lat,
+                                              acft_elev );
+    if ( adf != NULL ) {
 	char sfreq[128];
-	snprintf( sfreq, 10, "%.0f", freq );
+	snprintf( sfreq, 10, "%d", freq );
 	ident = sfreq;
-	ident += nav.get_ident();
-// 	cout << "adf ident = " << ident << endl;
+	ident += adf->get_ident();
+        // cout << "adf ident = " << ident << endl;
 	valid = true;
 	if ( last_ident != ident ) {
 	    last_ident = ident;
 
-	    trans_ident = nav.get_trans_ident();
-	    stn_lon = nav.get_lon();
-	    stn_lat = nav.get_lat();
-	    stn_elev = nav.get_elev();
-	    range = nav.get_range();
+	    trans_ident = adf->get_trans_ident();
+	    stn_lon = adf->get_lon();
+	    stn_lat = adf->get_lat();
+	    stn_elev = adf->get_elev_ft();
+	    range = adf->get_range();
 	    effective_range = kludgeRange(stn_elev, acft_elev, range);
-	    x = nav.get_x();
-	    y = nav.get_y();
-	    z = nav.get_z();
+	    x = adf->get_x();
+	    y = adf->get_y();
+	    z = adf->get_z();
 
-#ifdef ENABLE_AUDIO_SUPPORT
 	    if ( globals->get_soundmgr()->exists( "adf-ident" ) ) {
 		globals->get_soundmgr()->remove( "adf-ident" );
 	    }
-	    FGSimpleSound *sound;
+	    SGSoundSample *sound;
 	    sound = morse.make_ident( trans_ident, LO_FREQUENCY );
 	    sound->set_volume( 0.3 );
 	    globals->get_soundmgr()->add( sound, "adf-ident" );
@@ -530,32 +530,29 @@ void FGKR_87::search() {
 	    //      << play_count << " last_time = "
 	    //      << last_time << " current time = "
 	    //      << globals->get_time_params()->get_cur_time() << endl;
-#endif
 
 	    // cout << "Found an adf station in range" << endl;
-	    // cout << " id = " << nav.get_ident() << endl;
+	    // cout << " id = " << nav->get_ident() << endl;
 	}
     } else {
 	valid = false;
 	ident = "";
 	trans_ident = "";
-#ifdef ENABLE_AUDIO_SUPPORT
 	globals->get_soundmgr()->remove( "adf-ident" );
-#endif
 	last_ident = "";
 	// cout << "not picking up adf. :-(" << endl;
     }
 }
 
 
-double FGKR_87::get_stby_freq() const {
+int FGKR_87::get_stby_freq() const {
     if ( stby_mode == 0 ) {
         return stby_freq;
     } else {
         if ( timer_mode == 0 ) {
-            return flight_timer;
+            return (int)flight_timer;
         } else {
-            return elapsed_timer;
+            return (int)elapsed_timer;
         }
     }
 }