Changeset 408:1e2202fe006b

Timestamp:

12/28/12 12:13:29 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for querying, displaying and simulating the QNH value (re #175)

Location:

src/mlx

Files:

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

src/mlx/fs.py

@@ -229 +229 @@
     (float)
     - altimeter: the altimeter setting in hPa (float)
+    - qnh: the QNH in hPa (float)
     - altimeterReliable: a boolean indicating if the altimeter setting is
     reliable

src/mlx/fsuipc.py

@@ -1181 +1181 @@
                       ("spoilers", 0x0bd0, "d"),
                       ("altimeter", 0x0330, "H"),
+                      ("qnh", 0x0ec6, "H"),
                       ("nav1", 0x0350, "H"),
                       ("nav1_obs", 0x0c4e, "H"),
@@ -1379 +1380 @@
         state.altimeter = data[self._monidx_altimeter] / 16.0
         state.altimeterReliable = True
+        state.qnh = data[self._monidx_qnh] / 16.0
 
         state.ils = None

src/mlx/gui/monitor.py

@@ -37 +37 @@
                               padding_left = 16, padding_right = 16)
 
-        table = gtk.Table(rows = 7, columns = 14)
+        table = gtk.Table(rows = 9, columns = 14)
         table.set_homogeneous(False)
         table.set_row_spacings(4)
@@ -222 +222 @@
         table.attach(label, 10, 11, 7, 8)
         table.attach(self._adf2, 11, 12, 7, 8)
+
+        (label, self._qnh) = self._createLabeledEntry("QNH:", 7)
+        table.attach(label, 0, 1, 8, 9)
+        table.attach(self._qnh, 1, 2, 8, 9)
 
         alignment.add(table)
@@ -307 +311 @@
             self._adf1.set_text("-")
             self._adf2.set_text("-")
+            self._qnh.set_text("-")
         else:
             self._timestamp.set_text(time.strftime("%H:%M:%S",
@@ -336 +341 @@
             self._nav1.set_text("-" if aircraftState.nav1 is None else aircraftState.nav1)
             self._nav2.set_text("-" if aircraftState.nav2 is None else aircraftState.nav2)
+            self._qnh.set_text("%.0f" % (aircraftState.qnh,))
 
             fuelStr = ""

src/mlx/pyuipc_sim.py

@@ -281 +281 @@
 
         self.altimeter = 1013.0
+        self.qnh = 1011.2
 
         self.nav1 = 117.3
@@ -501 +502 @@
         elif offset==0x0e92:       # Wind direction
             return int(self.windDirection * 65536.0 / 360.0)
+        elif offset==0x0ec6:       # QNH
+            return int(self.qnh * 16.0)
         elif offset==0x11ba:       # G-Load
             return int(self.gLoad * 625.0)
@@ -761 +764 @@
         elif offset==0x0e92:       # Wind direction
             self.windDirection = value * 360.0 / 65536.0
+        elif offset==0x0ec6:       # QNH
+            self.qnh = value / 16.0
         elif offset==0x11ba:       # G-Load
             self.gLoad = value / 625.0
@@ -1297 +1302 @@
                                            lambda value: value,
                                            lambda word: int(word))
-        self._valueHandlers["qnh"] = ([(0x0330, "H")],
+        self._valueHandlers["altimeter"] = ([(0x0330, "H")],
+                                            lambda value: value / 16.0,
+                                            lambda word: int(float(word)*16.0))
+        self._valueHandlers["qnh"] = ([(0x0ec6, "H")],
                                       lambda value: value / 16.0,
                                       lambda word: int(float(word)*16.0))