Changeset 559:54fa2efc1dc2

Timestamp:

02/06/14 16:47:52 (10 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Added debug printout to see what is read from FS when the flaps settings change (re #225)

Location:

src/mlx

Files:

• fsuipc.py (modified) (3 diffs)
• pyuipc_sim.py (modified) (3 diffs)

src/mlx/fsuipc.py

@@ -1178 +1178 @@
                       ("flapsLeft", 0x0be0, "d"),
                       ("flapsRight", 0x0be4, "d"),
+                      ("flapsAxis", 0x3414, "H"),
+                      ("flapsIncrement", 0x3bfa, "H"),
                       ("lights", 0x0d0c, "H"),
                       ("pitot", 0x029c, "b"),
@@ -1270 +1272 @@
         self._flapsNotches = flapsNotches
         self._xpdrReliable = False
+        self._flapsSet = -1
 
     @property
@@ -1358 +1361 @@
                 flapsIndex += 1
         state.flapsSet = self._flapsNotches[flapsIndex]
+        if state.flapsSet != self._flapsSet:
+            print "flapsControl: %d, flapsLeft: %d, flapsRight: %d, flapsAxis: %d, flapsIncrement: %d, flapsSet: %d, numNotchesM1: %d" % \
+                  (flapsControl, data[self._monidx_flapsLeft],
+                   data[self._monidx_flapsRight], data[self._monidx_flapsAxis],
+                   data[self._monidx_flapsIncrement], state.flapsSet, numNotchesM1)
+            self._flapsSet = state.flapsSet
 
         flapsLeft = data[self._monidx_flapsLeft]

src/mlx/pyuipc_sim.py

@@ -342 +342 @@
             print "failed to read offset %04x: %s" % (offset, str(e))
             raise FSUIPCException(ERR_DATA)
+
+    def _getFlapsControl(self):
+        """Get the flaps control value"""
+        numNotchesM1 = len(self.flapsNotches) - 1
+        flapsIncrement = 16383.0 / numNotchesM1
+        index = 0
+        while index<numNotchesM1 and \
+              self.flapsControl>self.flapsNotches[index]:
+            index += 1
+
+        if index==numNotchesM1:
+            return 16383
+        else:
+            return int(index * flapsIncrement +
+                       (self.flapsControl-self.flapsNotches[index]) *
+                       flapsIncrement /
+                       (self.flapsNotches[index+1] - self.flapsNotches[index]))
 
     def _read(self, offset, type):
@@ -473 +490 @@
                 else int(self.spoilers * (16383 - 4800) + 4800)
         elif offset==0x0bdc:       # Flaps control
-            numNotchesM1 = len(self.flapsNotches) - 1
-            flapsIncrement = 16383.0 / numNotchesM1
-            index = 0
-            while index<numNotchesM1 and \
-                  self.flapsControl>self.flapsNotches[index]:
-                index += 1
-
-            if index==numNotchesM1:
-                return 16383
-            else:
-                return int(index * flapsIncrement +
-                           (self.flapsControl-self.flapsNotches[index]) *
-                           flapsIncrement /
-                           (self.flapsNotches[index+1] - self.flapsNotches[index]))
+            return self._getFlapsControl()
         elif offset==0x0be0 or offset==0x0be4:    # Flaps left and  right
             return self.flaps * 16383.0 / self.flapsNotches[-1]
@@ -592 +596 @@
         elif offset==0x3364:       # Frozen
             return 1 if self.frozen else 0
+        elif offset==0x3414:       # Flaps axis
+            return self._getFlapsControl()
+        elif offset==0x3bfa:       # Flaps increment
+            return 16383 / (len(self.flapsNotches)-1)
         elif offset==0x3bfc:       # ZFW
             return int(self.zfw * 256.0 * const.KGSTOLB)