Changeset 212:fab302d5b7f6

Timestamp:

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

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for the lights switches of the PMDG 737 NGX

Location:

src/mlx

Files:

• fsuipc.py (modified) (8 diffs)
• pyuipc_sim.py (modified) (11 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

src/mlx/pyuipc_sim.py

@@ -25 +25 @@
 SIM_FS2K2=6
 SIM_FS2K4=7
+SIM_FSX=8
 
 #------------------------------------------------------------------------------
@@ -260 +261 @@
         for i in range(0, Values.HOTKEY_SIZE):
             self.hotkeyTable.append([0, 0, 0, 0])
+
+        self.pmdg_737ng_switches = 0
+        self.pmdg_737ngx_lts_positionsw = 0
 
     def read(self, offset, type):
@@ -480 +484 @@
         elif offset==0x3d00:       # Name of the current aircraft
             return self.aircraftName
+        elif offset==0x6202:       # PMDG 737NG switches
+            return self.pmdg_737ng_switches
+        elif offset==0x6500:       # PMDG 737NGX lights position SW
+            return self.pmdg_737ngx_lts_positionsw
         else:
             print "Unhandled offset: %04x" % (offset,)
@@ -688 +696 @@
         elif offset==0x3d00:       # Name of the current aircraft
             self.aircraftName = value
+        elif offset==0x6202:       # PMDG 737NG switches
+            self.pmdg_737ng_switches = value
+        elif offset==0x6500:       # PMDG 737NGX lights position SW
+            self.pmdg_737ngx_lts_positionsw = value
         else:
             print "Unhandled offset: %04x" % (offset,)
@@ -808 +820 @@
 CALL_READ=1
 CALL_WRITE=2
-CALL_CLOSE=3
-CALL_FAILOPEN=4
+CALL_SETVERSION=3
+CALL_CLOSE=4
+CALL_FAILOPEN=5
 CALL_QUIT = 99
 
@@ -853 +866 @@
                     elif call==CALL_WRITE:
                         result = write(args[0])
+                    elif call==CALL_SETVERSION:
+                        global fs_version
+                        fs_version = args[0]
+                        result = None
                     elif call==CALL_CLOSE:
                         global opened
@@ -899 +916 @@
         """Write the given data."""
         return self._call(CALL_WRITE, data)
+
+    def setVersion(self, version):
+        """Set the FS version to emulate."""
+        return self._call(CALL_SETVERSION, int(version))
 
     def close(self):
@@ -1231 +1252 @@
                                                       lambda value: "0x%08x" % (value,),
                                                       lambda word: long(word, 16))
+
+        self._valueHandlers["pmdg_737ng_switches"] = (0x6202, "b",
+                                                      lambda value: value,
+                                                      lambda word: int(word))
+
+        self._valueHandlers["pmdg_737ngx_lts_positionsw"] = (0x6500, "b",
+                                                             lambda value: value,
+                                                             lambda word: int(word))
+
     def default(self, line):
         """Handle unhandle commands."""
@@ -1313 +1343 @@
             return [key + "=" for key in self._valueHandlers if key.startswith(text)]
 
+    def do_setversion(self, args):
+        """Set the version number to simulate"""
+        try:
+            value = int(args)
+            self._client.setVersion(value)
+            print "Emulating version %d" % (value,)
+        except Exception, e:
+            print >> sys.stderr, "Failed to set the version: " + str(e)
+
+    def help_setversion(self, usage = False):
+        """Help for the setversion command"""
+        if usage: print "Usage:",
+        print "setversion <number>"
+
     def do_close(self, args):
         """Close an existing connection so that FS will fail."""
@@ -1319 +1363 @@
             print "Connection closed"
         except Exception, e:
-            print >> sys.stderr, "Failed to close the connection: " + str(e)        
+            print >> sys.stderr, "Failed to close the connection: " + str(e)
         
     def do_failopen(self, args):
@@ -1331 +1375 @@
 
     def help_failopen(self, usage = False):
-        """Help for the failopen close"""
+        """Help for the failopen command"""
         if usage: print "Usage:",
         print "failopen yes|no"