Changeset 61:7deb4cf7dd78 for src/mlx/fsuipc.py

Timestamp:

04/07/12 11:03:47 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

The time page is implemented too.

File:

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

src/mlx/fsuipc.py

@@ -428 +428 @@
     via FSUIPC."""
     # The basic data that should be queried all the time once we are connected
-    normalData = [ (0x0240, "H"),            # Year
-                   (0x023e, "H"),            # Number of day in year
-                   (0x023b, "b"),            # UTC hour
-                   (0x023c, "b"),            # UTC minute
-                   (0x023a, "b"),            # seconds
-                   (0x3d00, -256),           # The name of the current aircraft
+    timeData = [ (0x0240, "H"),            # Year
+                 (0x023e, "H"),            # Number of day in year
+                 (0x023b, "b"),            # UTC hour
+                 (0x023c, "b"),            # UTC minute
+                 (0x023a, "b") ]           # seconds
+    
+    normalData = timeData + \
+                 [ (0x3d00, -256),           # The name of the current aircraft
                    (0x3c00, -256) ]          # The path of the current AIR file
 
@@ -452 +454 @@
                    (0x057c, "d"),            # Bank
                    (0x0580, "d") ]           # Heading
+
+    @staticmethod
+    def _getTimestamp(data):
+        """Convert the given data into a timestamp."""
+        timestamp = calendar.timegm(time.struct_time([data[0],
+                                                      1, 1, 0, 0, 0, -1, 1, 0]))
+        timestamp += data[1] * 24 * 3600
+        timestamp += data[2] * 3600
+        timestamp += data[3] * 60
+        timestamp += data[4]        
+
+        return timestamp
 
     def __init__(self, connectionListener, connectAttempts = -1,
@@ -516 +530 @@
         """Send a request for the ZFW."""
         self._handler.requestRead([(0x3bfc, "d")], self._handleZFW, extra = callback)
+
+    def requestTime(self, callback):
+        """Request the time from the simulator."""
+        self._handler.requestRead(Simulator.timeData, self._handleTime,
+                                  extra = callback)
                                                             
     def startMonitoring(self):
@@ -583 +602 @@
         aircraft-specific values.
         """
-        timestamp = calendar.timegm(time.struct_time([data[0],
-                                                      1, 1, 0, 0, 0, -1, 1, 0]))
-        timestamp += data[1] * 24 * 3600
-        timestamp += data[2] * 3600
-        timestamp += data[3] * 60
-        timestamp += data[4]        
+        timestamp = Simulator._getTimestamp(data)
 
         createdNewModel = self._setAircraftName(timestamp, data[5], data[6])
@@ -719 +733 @@
         zfw = data[0] * const.LBSTOKG / 256.0
         callback(zfw)
+                                                  
+    def _handleTime(self, data, callback):
+        """Callback for a time retrieval request."""
+        callback(Simulator._getTimestamp(data))
                                                   
 #------------------------------------------------------------------------------