Changeset 340:36455b73b24f for src/mlx

Timestamp:

11/17/12 13:08:43 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

#142: added the reading and logging of the elevator trim

Location:

src/mlx

Files:

• acft.py (modified) (1 diff)
• checks.py (modified) (1 diff)
• fs.py (modified) (1 diff)
• fsuipc.py (modified) (3 diffs)
• gui/monitor.py (modified) (6 diffs)

src/mlx/acft.py

@@ -345 +345 @@
                             "Touchdown heading: %03.0f degrees" % (heading,))
         self.logger.message(self._aircraftState.timestamp,
-                           "Centre of gravity:  %.1f%%" % \
+                           "CG: %.1f%%" % \
                             (self._aircraftState.cog*100.0,))
 

src/mlx/checks.py

@@ -157 +157 @@
                            "Takeoff pitch: %.1f degrees" % (state.pitch,))
             logger.message(state.timestamp,
-                           "Centre of gravity:  %.1f%%" % (state.cog*100.0,))
+                           "CG/Trim: %.1f%%/%.2f" % \
+                           (state.cog*100.0, state.elevatorTrim))
             self._onTheGround = False
 

src/mlx/fs.py

@@ -258 +258 @@
     - apAltitude: the autopilot altitude value in feet (float),
       or None, if the state cannot be read properly
+    - elevatorTrim: a float value indicating the deflection of the elevator
+      trim in degrees
     """
-

src/mlx/fsuipc.py

@@ -11 +11 @@
 import sys
 import codecs
+import math
 
 if os.name == "nt" and "FORCE_PYUIPC_SIM" not in os.environ:
@@ -1194 +1195 @@
                       ("apHeading", 0x07cc, "H"),
                       ("apAltitudeHold", 0x07d0, "d"),
-                      ("apAltitude", 0x07d4, "u")]
+                      ("apAltitude", 0x07d4, "u"),
+                      ("elevatorTrim", 0x2ea0, "f")]
 
     specialModels = []
@@ -1399 +1401 @@
         state.apAltitude = data[self._monidx_apAltitude] / \
                            const.FEETTOMETRES / 65536.0
+
+
+        state.elevatorTrim = data[self._monidx_elevatorTrim] * 180.0 / math.pi
 
         return state

src/mlx/gui/monitor.py

@@ -188 +188 @@
         table.attach(self._position, 7, 10, 6, 7)
 
-        self._xpdrC = gtk.Label("XPDR CHARLIE")
-        table.attach(self._xpdrC, 10, 12, 6, 7)
+        (label, self._elevatorTrim) = self._createLabeledEntry("Trim:", 5)
+        table.attach(label, 10, 11, 6, 7)
+        table.attach(self._elevatorTrim, 11, 12, 6, 7)
 
         self._apMaster = gtk.Label("AP MASTER")
@@ -207 +208 @@
         table.attach(label, 6, 7, 7, 8)
         table.attach(self._apAltitude, 7, 8, 7, 8)
+
+        self._xpdrC = gtk.Label("XPDR CHARLIE")
+        table.attach(self._xpdrC, 10, 12, 7, 8)
 
         alignment.add(table)
@@ -282 +286 @@
             self._windDirection.set_text("-")
             self._position.set_text("-")
-            self._xpdrC.set_sensitive(False)
+            self._elevatorTrim.set_text("-")
             self._apMaster.set_sensitive(False)
             self._apHeadingHold.set_sensitive(False)
@@ -288 +292 @@
             self._apAltitudeHold.set_sensitive(False)
             self._apAltitude.set_text("-")
+            self._xpdrC.set_sensitive(False)
         else:
             self._timestamp.set_text(time.strftime("%H:%M:%S",
@@ -366 +371 @@
             self._position.set_text(util.getCoordinateString((aircraftState.latitude,
                                                               aircraftState.longitude)))
-            self._xpdrC.set_sensitive(aircraftState.xpdrC)
-
+            self._elevatorTrim.set_text("%.2f" % (aircraftState.elevatorTrim,))
             self._apMaster.set_sensitive(aircraftState.apMaster)
             self._apHeadingHold.set_sensitive(aircraftState.apHeadingHold)
@@ -374 +378 @@
             self._apAltitude.set_text("%5.0f" % (aircraftState.apAltitude,))
 
+            self._xpdrC.set_sensitive(aircraftState.xpdrC)
+
 #------------------------------------------------------------------------------