Changeset 212:fab302d5b7f6 for src/mlx/fsuipc.py

Timestamp:

05/31/12 17:25:32 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Added support for the lights switches of the PMDG 737 NGX

File:

• src/mlx/fsuipc.py (modified) (8 diffs)

src/mlx/fsuipc.py

@@ -343 +343 @@
                      pyuipc.fs_version)
                 if not autoReconnection:
+                    fsType = const.SIM_MSFSX \
+                             if pyuipc.fs_version == pyuipc.SIM_FSX \
+                             else const.SIM_MSFS9
+                
                     Handler._callSafe(lambda:     
-                                      self._connectionListener.connected(const.SIM_MSFS9, 
+                                      self._connectionListener.connected(fsType,
                                                                          description))
                 self._connected = True
@@ -531 +535 @@
          from the simulator or was calculated by the adapter. The other data
          are self-explanatory and expressed in their 'natural' units."""
+        self._fsType = None
         self._aircraft = None
 
@@ -749 +754 @@
         """Called when a connection has been established to the flight
         simulator of the given type."""
+        self._fsType = fsType
         with self._hotkeyLock:
             if self._hotkeys is not None:
@@ -892 +898 @@
         """Start monitoring with the current aircraft model."""
         data = Simulator.normalData[:]
-        self._aircraftModel.addMonitoringData(data)
+        self._aircraftModel.addMonitoringData(data, self._fsType)
         
         self._normalRequestID = \
@@ -1239 +1245 @@
             self._addOffsetWithIndexMember(dest, offset, type, prefix + name)
             
-    def addMonitoringData(self, data):
+    def addMonitoringData(self, data, fsType):
         """Add the model-specific monitoring data to the given array."""
         self._addDataWithIndexMembers(data, "_monidx_",
@@ -1367 +1373 @@
         return True
 
-    def addMonitoringData(self, data):
+    def addMonitoringData(self, data, fsType):
         """Add the model-specific monitoring data to the given array."""
-        super(GenericAircraftModel, self).addMonitoringData(data)
+        super(GenericAircraftModel, self).addMonitoringData(data, fsType)
         
         self._addOffsetWithIndexMember(data, 0x0af4, "H", "_monidx_fuelWeight")
@@ -1464 +1470 @@
     def name(self):
         """Get the name for this aircraft model."""
-        return "FSUIPC/PMDG Boeing 737NG"
-
-    def addMonitoringData(self, data):
+        return "FSUIPC/PMDG Boeing 737NG(X)"
+
+    def addMonitoringData(self, data, fsType):
         """Add the model-specific monitoring data to the given array."""
-        super(PMDGBoeing737NGModel, self).addMonitoringData(data)
+        self._fsType = fsType
+        
+        super(PMDGBoeing737NGModel, self).addMonitoringData(data, fsType)
                 
         self._addOffsetWithIndexMember(data, 0x6202, "b", "_pmdgidx_switches")
+
+        if fsType==const.SIM_MSFSX:
+            print "FSX detected, adding position lights switch offset"
+            self._addOffsetWithIndexMember(data, 0x6500, "b",
+                                           "_pmdgidx_lts_positionsw")
 
     def getAircraftState(self, aircraft, timestamp, data):
@@ -1481 +1494 @@
         if data[self._pmdgidx_switches]&0x01==0x01:
             state.altimeter = 1013.25
+
+        if self._fsType==const.SIM_MSFSX:
+            state.strobeLightsOn = data[self._pmdgidx_lts_positionsw]==0x02
 
         return state