Changeset 1073:a5a22d24f890 for src

Timestamp:

12/24/22 08:47:04 (2 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

New constant for X-Plane 12

Location:

src/mlx

Files:

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

src/mlx/checks.py

@@ -1026 +1026 @@
         isXPlane = (flight.aircraftType==const.AIRCRAFT_DH8D or
                     flight.aircraftType==const.AIRCRAFT_B733) and \
-                    (flight.fsType==const.SIM_XPLANE11 or
+                    (flight.fsType==const.SIM_XPLANE12 or
+                     flight.fsType==const.SIM_XPLANE11 or
                      flight.fsType==const.SIM_XPLANE10 or
                      flight.fsType==const.SIM_XPLANE9)

src/mlx/const.py

@@ -52 +52 @@
 ## Flight simulator type: X-Plane 11
 SIM_XPLANE11 = 6
+
+## Flight simulator type: X-Plane 12
+SIM_XPLANE12 = 7
 
 #-------------------------------------------------------------------------------

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, const.SIM_XPLANE11]:
+    elif type in [const.SIM_XPLANE9, const.SIM_XPLANE10, const.SIM_XPLANE11,
+                  const.SIM_XPLANE12]:
         return xplane.Simulator(connectionListener, connectAttempts = 3)
     else:

src/mlx/xplane.py

@@ -523 +523 @@
                   (xplaneVersion, xplmVersion, xplraVersion)
                 if not autoReconnection:
-                    fsType = const.SIM_XPLANE11 if xplaneVersion>=11000 else \
-                      (const.SIM_XPLANE10 if xplaneVersion>=10000 else const.SIM_XPLANE9)
+                    fsType = \
+                      const.SIM_XPLANE12 if xplaneVersion>=12000 else \
+                      const.SIM_XPLANE11 if xplaneVersion>=11000 else \
+                      const.SIM_XPLANE10 if xplaneVersion>=10000 else \
+                      const.SIM_XPLANE9
+
+                    print("xplane.Handler._connect: fsType:", fsType)
 
                     Handler._callSafe(lambda: