Work on nav2_obs tuner.

[flightgear.git] / src / Network / atc610x.hxx

diff --git a/src/Network/atc610x.hxx b/src/Network/atc610x.hxx
index 64b89d4021e57dac02260b3bbb406a3c143669e2..60f763b89bb8a600904f8d74d8cb3f107c2bde65 100644 (file)
--- a/src/Network/atc610x.hxx
+++ b/src/Network/atc610x.hxx
@@ -71,14 +71,18 @@ class FGATC610x : public FGProtocol {
 
     float compass_position;
 
+    SGPropertyNode *adf_bus_power, *dme_bus_power, *xpdr_bus_power;
+    SGPropertyNode *navcom1_bus_power, *navcom2_bus_power;
+
     SGPropertyNode *mag_compass;
     SGPropertyNode *dme_min, *dme_kt, *dme_nm;
+    SGPropertyNode *navcom1_power_btn, *navcom2_power_btn;
     SGPropertyNode *com1_freq, *com1_stby_freq;
     SGPropertyNode *com2_freq, *com2_stby_freq;
-    SGPropertyNode *nav1_freq, *nav1_stby_freq;
-    SGPropertyNode *nav2_freq, *nav2_stby_freq;
+    SGPropertyNode *nav1_freq, *nav1_stby_freq, *nav1_obs;
+    SGPropertyNode *nav2_freq, *nav2_stby_freq, *nav2_obs;
     SGPropertyNode *adf_adf_btn, *adf_bfo_btn;
-    SGPropertyNode *adf_power, *adf_vol;
+    SGPropertyNode *adf_power_btn, *adf_vol;
     SGPropertyNode *adf_freq, *adf_stby_freq;
     SGPropertyNode *adf_stby_mode, *adf_timer_mode;
     SGPropertyNode *adf_count_mode, *adf_flight_timer, *adf_elapsed_timer;
@@ -110,6 +114,28 @@ class FGATC610x : public FGProtocol {
     bool do_steppers();
     bool do_switches();
 
+    // convenience
+    inline bool adf_has_power() const {
+        return (adf_bus_power->getDoubleValue() > 1.0)
+            && adf_power_btn->getBoolValue();
+    }
+    inline bool dme_has_power() const {
+        return (dme_bus_power->getDoubleValue() > 1.0)
+            && dme_switch;
+    }
+    inline bool navcom1_has_power() const {
+        return (navcom1_bus_power->getDoubleValue() > 1.0)
+            && navcom1_power_btn->getBoolValue();
+    }
+    inline bool navcom2_has_power() const {
+        return (navcom2_bus_power->getDoubleValue() > 1.0)
+            && navcom2_power_btn->getBoolValue();
+    }
+    inline bool xpdr_has_power() const {
+        return (xpdr_bus_power->getDoubleValue() > 1.0)
+            && (xpdr_func_knob->getIntValue() > 0);
+    }
+
 public:
 
     FGATC610x() { }