Changeset 476:32423909dfdb

Timestamp:

03/16/13 06:15:01 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Added the PMDG 737NGX-specific offsets (re #116)

File:

• src/mlx/fsuipc.py (modified) (2 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 position lights switch offset"
+            print "FSX detected, adding PMDG 737 NGX-specific offsets"
             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):
@@ -1666 +1673 @@
                                                                    timestamp,
                                                                    data)
-        if data[self._pmdgidx_switches]&0x01==0x01:
-            state.altimeter = 1013.25
+        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
 
         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