Don't scale elevator by 0.5.

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

diff --git a/src/Cockpit/kr_87.hxx b/src/Cockpit/kr_87.hxx
index c0b482e5ae6533320f8e3df7e92eec093b322099..b056f5e8dcc5ff6466acc4d59cebdba2c0248f76 100644 (file)
--- a/src/Cockpit/kr_87.hxx
+++ b/src/Cockpit/kr_87.hxx
@@ -25,18 +25,17 @@
 #define _FG_KR_87_HXX
 
 
-#include <Main/fgfs.hxx>
 #include <Main/fg_props.hxx>
 
 #include <simgear/compiler.h>
-
+#include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/timing/timestamp.hxx>
 
 #include <Navaids/navlist.hxx>
 #include <Sound/morse.hxx>
 
 
-class FGKR_87 : public FGSubsystem
+class FGKR_87 : public SGSubsystem
 {
     FGMorse morse;
 
@@ -44,6 +43,7 @@ class FGKR_87 : public FGSubsystem
     SGPropertyNode *lat_node;
     SGPropertyNode *alt_node;
     SGPropertyNode *bus_power;
+    SGPropertyNode *serviceable;
 
     bool need_update;
 
@@ -76,6 +76,7 @@ class FGKR_87 : public FGSubsystem
     // input and buttons
     double rotation;            // compass faceplace rotation
     bool power_btn;             // 0 = off, 1 = powered
+    bool audio_btn;             // 0 = off, 1 = on
     double vol_btn;
     bool adf_btn;               // 0 = normal, 1 = depressed
     bool bfo_btn;               // 0 = normal, 1 = depressed
@@ -85,7 +86,6 @@ class FGKR_87 : public FGSubsystem
     bool last_flt_et_btn;
     bool set_rst_btn;           // 0 = normal, 1 = depressed
     bool last_set_rst_btn;      // 0 = normal, 1 = depressed
-    bool ident_btn;             // turn audio morse code on/off
 
     // outputs
     double freq;
@@ -141,6 +141,10 @@ public:
     inline void set_power_btn( bool val ) {
        power_btn = val;
     }
+    inline bool get_audio_btn() const { return audio_btn; }
+    inline void set_audio_btn( bool val ) {
+       audio_btn = val;
+    }
     inline double get_vol_btn() const { return vol_btn; }
     inline void set_vol_btn( double val ) {
        if ( val < 0.0 ) val = 0.0;
@@ -157,8 +161,6 @@ public:
     inline void set_flt_et_btn( bool val ) { flt_et_btn = val; }
     inline bool get_set_rst_btn() const { return set_rst_btn; }
     inline void set_set_rst_btn( bool val ) { set_rst_btn = val; }
-    inline bool get_ident_btn() const { return ident_btn; }
-    inline void set_ident_btn( bool val ) { ident_btn = val; }
 
     // outputs
     inline double get_freq () const { return freq; }