Changeset 424:3512d665bdfe

Timestamp:

02/16/13 16:39:14 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

xplane

hg-Phase:

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

Message:

Weight query for the help window works too

File:

• src/mlx/xplane.py (modified) (2 diffs)

src/mlx/xplane.py

@@ -746 +746 @@
         These values will be passed to the callback function in this order, as
         separate arguments."""
-        # TODO: implement this for X-Plane
-        self._handler.requestRead([(0x13fc, "d")], self._handlePayloadCount,
+        data = [ ("sim/aircraft/weight/acf_m_empty", TYPE_FLOAT),
+                 ("sim/flightmodel/weight/m_fixed", TYPE_FLOAT),
+                 ("sim/flightmodel/weight/m_total", TYPE_FLOAT) ]
+        self._handler.requestRead(data, self._handleWeights,
                                   extra = callback)
 
@@ -1087 +1089 @@
         callback(Simulator._getTimestamp(data))
 
-    def _handlePayloadCount(self, data, callback):
-        """Callback for the payload count retrieval request."""
-        payloadCount = data[0]
-        data = [(0x3bfc, "d"), (0x30c0, "f")]
-        for i in range(0, payloadCount):
-            data.append((0x1400 + i*48, "f"))
-
-        self._handler.requestRead(data, self._handleWeights,
-                                  extra = callback)
-
     def _handleWeights(self, data, callback):
         """Callback for the weights retrieval request."""
-        zfw = data[0] * const.LBSTOKG / 256.0
-        grossWeight = data[1] * const.LBSTOKG
-        payload = sum(data[2:]) * const.LBSTOKG
-        dow = zfw - payload
+        dow = data[0]
+        payload = data[1]
+        zfw = dow + payload
+        grossWeight = data[2]
         callback(dow, payload, zfw, grossWeight)