Changeset 337:a276a58aaa6e for src

Timestamp:

11/15/12 16:51:42 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

#138: added the reading of the AP data and its displaying in the monitor window

Location:

src/mlx

Files:

• fs.py (modified) (1 diff)
• fsuipc.py (modified) (2 diffs)
• gui/monitor.py (modified) (4 diffs)

src/mlx/fs.py

@@ -248 +248 @@
     - xpdrC: a boolean indicating whether the transponder is in C mode, or
       None, if the state cannot be read properly
-
-    FIXME: needed when taxiing only:
-    - payload weight
-
-    FIXME: needed rarely:
-    - latitude, longitude
-    - transporter
-    - visibility
+    - apMaster: a boolean indicating whether the autopilot is switched on, or
+      None, if the state cannot be read properly
+    - apHeadingHold: a boolean indicating whether the autopilot's heading hold
+      mode is switched on, or None, if the state cannot be read properly
+    - apHeading: the autopilot heading value in degrees (float),
+      or None, if the state cannot be read properly
+    - apAltitudeHold: a boolean indicating whether the autopilot's altitude hold
+      mode is switched on, or None, if the state cannot be read properly
+    - apAltitude: the autopilot altitude value in feet (float),
+      or None, if the state cannot be read properly
     """
+

src/mlx/fsuipc.py

@@ -1189 +1189 @@
                       ("visibility", 0x0e8a, "H"),
                       ("cog", 0x2ef8, "f"),
-                      ("xpdrC", 0x7b91, "b")]
+                      ("xpdrC", 0x7b91, "b"),
+                      ("apMaster", 0x07bc, "d"),
+                      ("apHeadingHold", 0x07c8, "d"),
+                      ("apHeading", 0x07cc, "H"),
+                      ("apAltitudeHold", 0x07d0, "d"),
+                      ("apAltitude", 0x07d4, "u")]
 
     specialModels = []
@@ -1387 +1392 @@
 
         state.xpdrC = data[self._monidx_xpdrC]==0
+
+        state.apMaster = data[self._monidx_apMaster]!=0
+        state.apHeadingHold = data[self._monidx_apHeadingHold]!=0
+        state.apHeading = data[self._monidx_apHeading] * 360.0 / 65536.0
+        state.apAltitudeHold = data[self._monidx_apAltitudeHold]!=0
+        state.apAltitude = data[self._monidx_apAltitude] / \
+                           const.FEETTOMETRES / 65536.0
 
         return state

src/mlx/gui/monitor.py

@@ -37 +37 @@
                               padding_left = 16, padding_right = 16)
 
-        table = gtk.Table(rows = 7, columns = 12)
+        table = gtk.Table(rows = 7, columns = 14)
         table.set_homogeneous(False)
         table.set_row_spacings(4)
@@ -190 +190 @@
         self._xpdrC = gtk.Label("XPDR CHARLIE")
         table.attach(self._xpdrC, 10, 12, 6, 7)
+
+        self._apMaster = gtk.Label("AP MASTER")
+        table.attach(self._apMaster, 0, 1, 7, 8)
+
+        self._apHeadingHold = gtk.Label("AP HDG HOLD")
+        table.attach(self._apHeadingHold, 1, 2, 7, 8)
+
+        (label, self._apHeading) = self._createLabeledEntry("AP HDG:", 5)
+        table.attach(label, 2, 3, 7, 8)
+        table.attach(self._apHeading, 3, 4, 7, 8)
+
+        self._apAltitudeHold = gtk.Label("AP ALT HOLD")
+        table.attach(self._apAltitudeHold, 5, 6, 7, 8)
+
+        (label, self._apAltitude) = self._createLabeledEntry("AP ALT:", 10)
+        table.attach(label, 6, 7, 7, 8)
+        table.attach(self._apAltitude, 7, 8, 7, 8)
 
         alignment.add(table)
@@ -266 +283 @@
             self._position.set_text("-")
             self._xpdrC.set_sensitive(False)
+            self._apMaster.set_sensitive(False)
+            self._apHeadingHold.set_sensitive(False)
+            self._apHeading.set_text("-")
+            self._apAltitudeHold.set_sensitive(False)
+            self._apAltitude.set_text("-")
         else:
             self._timestamp.set_text(time.strftime("%H:%M:%S",
@@ -346 +368 @@
             self._xpdrC.set_sensitive(aircraftState.xpdrC)
 
+            self._apMaster.set_sensitive(aircraftState.apMaster)
+            self._apHeadingHold.set_sensitive(aircraftState.apHeadingHold)
+            self._apHeading.set_text("%03.0f" % (aircraftState.apHeading,))
+            self._apAltitudeHold.set_sensitive(aircraftState.apAltitudeHold)
+            self._apAltitude.set_text("%5.0f" % (aircraftState.apAltitude,))
+
 #------------------------------------------------------------------------------