Merge branch 'maint2' into next

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

diff --git a/src/Instrumentation/kr_87.hxx b/src/Instrumentation/kr_87.hxx
index bc2f3d569323d84bb503cf12c9c584a1a45edb7b..0b57a8e5f1b0e3b30b8edb85ecf004d6d81bff5e 100644 (file)
--- a/src/Instrumentation/kr_87.hxx
+++ b/src/Instrumentation/kr_87.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started June 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
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -39,11 +39,11 @@ class FGKR_87 : public SGSubsystem
 {
     FGMorse morse;
 
-    SGPropertyNode *lon_node;
-    SGPropertyNode *lat_node;
-    SGPropertyNode *alt_node;
-    SGPropertyNode *bus_power;
-    SGPropertyNode *serviceable;
+    SGPropertyNode_ptr lon_node;
+    SGPropertyNode_ptr lat_node;
+    SGPropertyNode_ptr alt_node;
+    SGPropertyNode_ptr bus_power;
+    SGPropertyNode_ptr serviceable;
 
     bool need_update;
 
@@ -59,9 +59,7 @@ class FGKR_87 : public SGSubsystem
     double effective_range;
     double dist;
     double heading;
-    double x;
-    double y;
-    double z;
+    SGVec3d xyz;
     double goal_needle_deg;
     double et_flash_time;
 
@@ -103,6 +101,9 @@ class FGKR_87 : public SGSubsystem
     bool flt_ann;
     bool et_ann;
 
+    // internal periodic station search timer
+    double _time_before_search_sec;
+
 public:
 
     FGKR_87( SGPropertyNode *node );
@@ -111,13 +112,13 @@ public:
     void init ();
     void bind ();
     void unbind ();
-    void update (double dt);
+    void update (double dt_sec);
 
     // Update nav/adf radios based on current postition
     void search ();
 
     // internal values
-    inline string get_ident() const { return ident; }
+    inline const string& get_ident() const { return ident; }
     inline bool get_valid() const { return valid; }
     inline bool get_inrange() const { return inrange; }
     inline double get_stn_lon() const { return stn_lon; }