Changes in src/mlx/fsuipc.py [476:32423909dfdb:443:acbe605bb814]

File:

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

src/mlx/fsuipc.py

@@ -1646 +1646 @@
         super(PMDGBoeing737NGModel, self).addMonitoringData(data, fsType)
 
+        self._addOffsetWithIndexMember(data, 0x6202, "b", "_pmdgidx_switches")
+        self._addOffsetWithIndexMember(data, 0x6216, "b", "_pmdgidx_xpdr")
+        self._addOffsetWithIndexMember(data, 0x6227, "b", "_pmdgidx_ap")
+        self._addOffsetWithIndexMember(data, 0x6228, "b", "_pmdgidx_aphdgsel")
+        self._addOffsetWithIndexMember(data, 0x622a, "b", "_pmdgidx_apalthold")
+        self._addOffsetWithIndexMember(data, 0x622c, "H", "_pmdgidx_aphdg")
+        self._addOffsetWithIndexMember(data, 0x622e, "H", "_pmdgidx_apalt")
+
         if fsType==const.SIM_MSFSX:
-            print "FSX detected, adding PMDG 737 NGX-specific offsets"
+            print "FSX detected, adding position lights switch offset"
             self._addOffsetWithIndexMember(data, 0x6500, "b",
                                            "_pmdgidx_lts_positionsw")
-            self._addOffsetWithIndexMember(data, 0x6545, "b", "_pmdgidx_cmda")
-            self._addOffsetWithIndexMember(data, 0x653f, "b", "_pmdgidx_aphdgsel")
-            self._addOffsetWithIndexMember(data, 0x6543, "b", "_pmdgidx_apalthold")
-            self._addOffsetWithIndexMember(data, 0x652c, "H", "_pmdgidx_aphdg")
-            self._addOffsetWithIndexMember(data, 0x652e, "H", "_pmdgidx_apalt")
-            self._addOffsetWithIndexMember(data, 0x65cd, "b", "_pmdgidx_xpdr")
-        else:
-            print "FS9 detected, adding PMDG 737 NG-specific offsets"
-            self._addOffsetWithIndexMember(data, 0x6202, "b", "_pmdgidx_switches")
-            self._addOffsetWithIndexMember(data, 0x6216, "b", "_pmdgidx_xpdr")
-            self._addOffsetWithIndexMember(data, 0x6227, "b", "_pmdgidx_ap")
-            self._addOffsetWithIndexMember(data, 0x6228, "b", "_pmdgidx_aphdgsel")
-            self._addOffsetWithIndexMember(data, 0x622a, "b", "_pmdgidx_apalthold")
-            self._addOffsetWithIndexMember(data, 0x622c, "H", "_pmdgidx_aphdg")
-            self._addOffsetWithIndexMember(data, 0x622e, "H", "_pmdgidx_apalt")
 
     def getAircraftState(self, aircraft, timestamp, data):
@@ -1673 +1666 @@
                                                                    timestamp,
                                                                    data)
-        if self._fsType==const.SIM_MSFS9:
-            if data[self._pmdgidx_switches]&0x01==0x01:
-                state.altimeter = 1013.25
-            state.apMaster = data[self._pmdgidx_ap]&0x02==0x02
-            state.apHeadingHold = data[self._pmdgidx_aphdgsel]==2
-            apalthold = data[self._pmdgidx_apalthold]
-            state.apAltitudeHold = apalthold>=3 and apalthold<=6
-        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.strobeLightsOn = None
+        if data[self._pmdgidx_switches]&0x01==0x01:
+            state.altimeter = 1013.25
 
         state.xpdrC = data[self._pmdgidx_xpdr]==4
+
+        state.apMaster = data[self._pmdgidx_ap]&0x02==0x02
+
+        state.apHeadingHold = data[self._pmdgidx_aphdgsel]==2
         state.apHeading = data[self._pmdgidx_aphdg]
+
+        apalthold = data[self._pmdgidx_apalthold]
+        state.apAltitudeHold = apalthold>=3 and apalthold<=6
         state.apAltitude = data[self._pmdgidx_apalt]
+
+        if self._fsType==const.SIM_MSFSX:
+            state.strobeLightsOn = data[self._pmdgidx_lts_positionsw]==0x02
 
         return state
@@ -1748 +1740 @@
         return "FSUIPC/Dreamwings Bombardier Dash 8-Q400"
 
-    def addMonitoringData(self, data, fsType):
-        """Add the model-specific monitoring data to the given array."""
-        super(DreamwingsDH8DModel, self).addMonitoringData(data, fsType)
-
-        self._addOffsetWithIndexMember(data, 0x132c, "d", "_dwdh8d_navgps")
-
     def getAircraftState(self, aircraft, timestamp, data):
         """Get the aircraft state.
@@ -1761 +1747 @@
                                                                   timestamp,
                                                                   data)
-        if data[self._dwdh8d_navgps]==1:
-            state.apHeading = None
+        state.pitotHeatOn = not state.pitotHeatOn
 
         return state