Changeset 1078:a1e7d4f63210 for src/mlx

Timestamp:

02/14/23 15:15:42 (22 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

PMDG on MSFS 2020 support (re #364)

File:

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

src/mlx/fsuipc.py

@@ -1745 +1745 @@
         super(PMDGBoeing737NGModel, self).addMonitoringData(data, fsType)
 
-        if fsType==const.SIM_MSFSX or fsType==const.SIM_P3D:
+        if fsType==const.SIM_MSFSX or fsType==const.SIM_P3D or fsType==const.SIM_MSFS2020:
             print("%s detected, adding PMDG 737 NGX-specific offsets" % \
-                  ("FSX" if fsType==const.SIM_MSFSX else "P3D",))
+                  ("FSX" if fsType==const.SIM_MSFSX else
+                   "P3D" if fsType==const.SIM_P3D else "MSFS 2020",))
             self._addOffsetWithIndexMember(data, 0x6500, "b",
                                            "_pmdgidx_lts_positionsw")
@@ -1755 +1756 @@
             self._addOffsetWithIndexMember(data, 0x652c, "H", "_pmdgidx_aphdg")
             self._addOffsetWithIndexMember(data, 0x652e, "H", "_pmdgidx_apalt")
-            self._addOffsetWithIndexMember(data, 0x65cd, "b", "_pmdgidx_xpdr")
+            if fsType==const.SIM_MSFS2020:
+                self._addOffsetWithIndexMember(data, 0x0b46, "b", "_pmdgidx_xpdr")
+            else:
+                self._addOffsetWithIndexMember(data, 0x65cd, "b", "_pmdgidx_xpdr")
         else:
             print("FS9 detected, adding PMDG 737 NG-specific offsets")
@@ -1773 +1777 @@
                                                                    timestamp,
                                                                    data)
-        if self._fsType==const.SIM_MSFS9:
+
+        fsType = self._fsType
+        if fsType==const.SIM_MSFSX or fsType==const.SIM_P3D or \
+           fsType==const.SIM_MSFS2020:
+            state.apMaster = data[self._pmdgidx_cmda]!=0
+            state.apHeadingHold = data[self._pmdgidx_aphdgsel]!=0
+            state.apAltitudeHold = data[self._pmdgidx_apalthold]!=0
+
+            # state.strobeLightsOn = data[self._pmdgidx_lts_positionsw]==0x02
+            # state.xpdrC = data[self._pmdgidx_xpdr]==4
+            if fsType==const.SIM_MSFS2020:
+                state.xpdrC = data[self._pmdgidx_xpdr]==4
+            else:
+                state.strobeLightsOn = None
+                state.xpdrC = None
+        else:
             if data[self._pmdgidx_switches]&0x01==0x01:
                 state.altimeter = 1013.25
@@ -1785 +1804 @@
             # state.strobeLightsOn = None
             # state.xpdrC = None
-        else:
-            state.apMaster = data[self._pmdgidx_cmda]!=0
-            state.apHeadingHold = data[self._pmdgidx_aphdgsel]!=0
-            state.apAltitudeHold = data[self._pmdgidx_apalthold]!=0
-
-            # state.strobeLightsOn = data[self._pmdgidx_lts_positionsw]==0x02
-            # state.xpdrC = data[self._pmdgidx_xpdr]==4
-            state.strobeLightsOn = None
-            state.xpdrC = None
 
         state.apHeading = data[self._pmdgidx_aphdg]