Get rid of the double comma's for the file section of the generic protocol also.

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

diff --git a/src/Cockpit/kr_87.cxx b/src/Cockpit/kr_87.cxx
index 9c06f9a491968290c22d87464032793af1e714c6..b297055a86228a6528755cb13dfbfd75738729cb 100644 (file)
--- 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
@@ -74,7 +73,7 @@ FGKR_87::FGKR_87() :
     lat_node(fgGetNode("/position/latitude-deg", true)),
     alt_node(fgGetNode("/position/altitude-ft", true)),
     bus_power(fgGetNode("/systems/electrical/outputs/adf", true)),
-    servicable(fgGetNode("/instrumentation/adf/servicable", true)),
+    serviceable(fgGetNode("/instrumentation/adf/serviceable", true)),
     need_update(true),
     valid(false),
     inrange(false),
@@ -98,8 +97,8 @@ FGKR_87::FGKR_87() :
     last_flt_et_btn(false),
     set_rst_btn(false),
     last_set_rst_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),
@@ -114,7 +113,7 @@ FGKR_87::~FGKR_87() {
 
 
 void FGKR_87::init () {
-    servicable->setBoolValue( true );
+    serviceable->setBoolValue( true );
     morse.init();
 }
 
@@ -249,16 +248,17 @@ void FGKR_87::update( double dt ) {
     // Radio
     ////////////////////////////////////////////////////////////////////////
 
-    if ( has_power() && servicable->getBoolValue() ) {
+    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 ) {
@@ -284,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;
@@ -324,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;
@@ -343,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 );
@@ -368,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");
@@ -441,11 +444,11 @@ void FGKR_87::update( double dt ) {
     // cout << "flt = " << flight_timer << " et = " << elapsed_timer 
     //      << " needle = " << needle_deg << endl;
 
-    if ( valid && inrange && servicable->getBoolValue() ) {
+    if ( valid && inrange && serviceable->getBoolValue() ) {
        // play station ident via audio system if on + ant mode,
        // otherwise turn it off
        if ( vol_btn >= 0.01 && audio_btn ) {
-           FGSimpleSound *sound;
+           SGSoundSample *sound;
            sound = globals->get_soundmgr()->find( "adf-ident" );
             if ( sound != NULL ) {
                 if ( !adf_btn ) {
@@ -488,33 +491,33 @@ void FGKR_87::search() {
     // ADF.
     ////////////////////////////////////////////////////////////////////////
 
-    FGNav *nav
-        = current_navlist->findByFreq(freq, acft_lon, acft_lat, acft_elev);
-
-    if ( nav != NULL ) {
+    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();
+       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();
 
            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" );
@@ -542,14 +545,14 @@ void FGKR_87::search() {
 }
 
 
-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;
         }
     }
 }