Changeset 909:5df186bc203c for src/mlx

Timestamp:

12/16/18 09:53:06 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

version_0.39_maint

Phase:

public

Message:

Explicit support for X-Plane 11.

Location:

src/mlx

Files:

• const.py (modified) (1 diff)
• fs.py (modified) (1 diff)
• xplane.py (modified) (1 diff)

src/mlx/const.py

@@ -49 +49 @@
 ## Flight simulator type: Prepar3D
 SIM_P3D = 5
+
+## Flight simulator type: X-Plane 11
+SIM_XPLANE11 = 6
 
 #-------------------------------------------------------------------------------

src/mlx/fs.py

@@ -62 +62 @@
     if type in [const.SIM_MSFS9, const.SIM_MSFSX]:
         return fsuipc.Simulator(connectionListener, connectAttempts = 3)
-    elif type in [const.SIM_XPLANE9, const.SIM_XPLANE10]:
+    elif type in [const.SIM_XPLANE9, const.SIM_XPLANE10, const.SIM_XPLANE11]:
         return xplane.Simulator(connectionListener, connectAttempts = 3)
     else:
-        "Only MS Flight Simulator 2004 and X or X-Plane 9 and 10 are supported"
+        "Only MS Flight Simulator 2004 and X or X-Plane 9, 10 and 11 are supported"
 
 #-------------------------------------------------------------------------------

src/mlx/xplane.py

@@ -506 +506 @@
                   (xplaneVersion, xplmVersion, xplraVersion)
                 if not autoReconnection:
-                    fsType = const.SIM_XPLANE10 if xplaneVersion>=10000 else const.SIM_XPLANE9
+                    fsType = const.SIM_XPLANE11 if xplaneVersion>=11000 else \
+                      (const.SIM_XPLANE10 if xplaneVersion>=10000 else const.SIM_XPLANE9)
 
                     Handler._callSafe(lambda: