Changeset 541:0369dcfecaae

Timestamp:

09/19/13 09:19:19 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The NAV2 frequency is logged only when not using the FMS as the NAV source

File:

• src/mlx/xplane.py (modified) (9 diffs)

src/mlx/xplane.py

@@ -733 +733 @@
         self._fuelCallback = None
 
-        self._hasXFMC = None
-
-    @property
-    def hasXFMC(self):
-        """Indicate if the simulator has the X-FMC plugin."""
-        return self._hasXFMC
-
     def connect(self, aircraft):
         """Initiate a connection to the simulator."""
@@ -915 +908 @@
         self._fsType = fsType
 
-        self._handler.requestRead([("xfmc/Status", TYPE_INT)],
-                                  self._xfmcStatusRead)
-
         with self._hotkeyLock:
             if self._hotkeyCodes is not None:
@@ -937 +927 @@
     def disconnected(self):
         """Called when a connection to the flight simulator has been broken."""
-        self._hasXFMC = None
         with self._hotkeyLock:
             self._clearHotkeyRequest()
@@ -956 +945 @@
         self._normalRequestID = None
         self._monitoring = False
-
-    def _xfmcStatusRead(self, data, extra):
-        """Called when the xfmc/Status dataref is read or not."""
-        self._hasXFMC = data is not None
-        print "xplane.Simulator: XFMC is %savailable" % \
-          ("" if self._hasXFMC else "not ")
 
     def _handleNormal(self, data, extra):
@@ -1291 +1274 @@
                         "sim/cockpit/switches/anti_ice_surf_heat", TYPE_INT),
                        ("propHeat",
-                        "sim/cockpit/switches/anti_ice_prop_heat", TYPE_INT) ]
+                        "sim/cockpit/switches/anti_ice_prop_heat", TYPE_INT),
+                       ("autopilotOn",
+                        "sim/cockpit2/autopilot/autopilot_on", TYPE_INT),
+                       ("apHeadingMode",
+                        "sim/cockpit2/autopilot/heading_mode", TYPE_INT)]
+
 
     specialModels = []
@@ -1385 +1373 @@
         self._addDataWithIndexMembers(data, "_monidx_",
                                       AircraftModel.monitoringData)
-        if self.simulator.hasXFMC:
-            print "xplane.AircraftModel.addMonitoringData: adding XFMC status dataref"""
-            self._addDatarefWithIndexMember(data, "xfmc/Status", TYPE_INT,
-                                            attrName = "_monidx_xfmcStatus")
 
     def getAircraftState(self, aircraft, timestamp, data):
@@ -1394 +1378 @@
         state = fs.AircraftState()
 
-        xfmcLNAVOn = self.simulator.hasXFMC and \
-                     (data[self._monidx_xfmcStatus]&0x03==0x03)
+        lnavOn = data[self._monidx_autopilotOn]!=0 and \
+                 data[self._monidx_apHeadingMode]==2
 
         state.timestamp = timestamp
@@ -1464 +1448 @@
         state.nav2 = self._convertFrequency(data[self._monidx_nav2])
         state.nav2_obs = self._convertOBS(data[self._monidx_nav2_obs])
-        state.nav2_manual = not xfmcLNAVOn
+        state.nav2_manual = not lnavOn
         state.adf1 = str(data[self._monidx_adf1])
         state.adf2 = str(data[self._monidx_adf2])
@@ -1483 +1467 @@
         state.apMaster = data[self._monidx_apMaster]==2
         apState = data[self._monidx_apState]
-        if xfmcLNAVOn:
+        if lnavOn:
            state.apHeadingHold = None
            state.apHeading = None