Changeset 390:7378fc230e10 for src/mlx

Timestamp:

12/22/12 06:43:00 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added the handling of the anti-ice values and extended the simulator to handle them too (re #159)

Location:

src/mlx

Files:

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

src/mlx/fs.py

@@ -269 +269 @@
     - elevatorTrim: a float value indicating the deflection of the elevator
       trim in degrees
+    - antiIceOn: a boolean value indicating if some anti-ice system is turned
+      on. It may be None, if the state of the anti-ice system cannot be read
+      reliably
     """

src/mlx/fsuipc.py

@@ -1196 +1196 @@
                       ("apAltitudeHold", 0x07d0, "d"),
                       ("apAltitude", 0x07d4, "u"),
-                      ("elevatorTrim", 0x2ea0, "f")]
+                      ("elevatorTrim", 0x2ea0, "f"),
+                      ("eng1DeIce", 0x08b2, "H"),
+                      ("eng2DeIce", 0x094a, "H"),
+                      ("propDeIce", 0x337c, "b"),
+                      ("structDeIce", 0x337d, "b")]
 
     specialModels = []
@@ -1409 +1413 @@
 
         state.elevatorTrim = data[self._monidx_elevatorTrim] * 180.0 / math.pi
+
+        state.antiIceOn = data[self._monidx_eng1DeIce]!=0 or \
+                          data[self._monidx_eng2DeIce]!=0 or \
+                          data[self._monidx_propDeIce]!=0 or \
+                          data[self._monidx_structDeIce]!=0
 
         return state

src/mlx/gui/monitor.py

@@ -59 +59 @@
 
         self._onTheGround = gtk.Label("ONTHEGROUND")
-        table.attach(self._onTheGround, 10, 12, 0, 1)
+        table.attach(self._onTheGround, 10, 11, 0, 1)
+
+        self._antiIceOn = gtk.Label("ANTI-ICE")
+        table.attach(self._antiIceOn, 11, 12, 0, 1)
 
         (label, self._zfw) = self._createLabeledEntry("ZFW:", 6)
@@ -259 +262 @@
             self._stalled.set_sensitive(False)
             self._onTheGround.set_sensitive(False)
+            self._antiIceOn.set_sensitive(False)
             self._zfw.set_text("-")
             self._grossWeight.set_text("-")
@@ -311 +315 @@
             self._stalled.set_sensitive(aircraftState.stalled)
             self._onTheGround.set_sensitive(aircraftState.onTheGround)
+            self._antiIceOn.set_sensitive(aircraftState.antiIceOn)
             self._zfw.set_text("%.0f" % (aircraftState.zfw,))
             self._grossWeight.set_text("%.0f" % (aircraftState.grossWeight,))

src/mlx/pyuipc_sim.py

@@ -323 +323 @@
 
         self.elevatorTrim = 0.0
+
+        self.eng1DeIce = False
+        self.eng2DeIce = False
+        self.eng3DeIce = False
+        self.propDeIce = False
+        self.structDeIce = False
 
     def read(self, offset, type):
@@ -410 +416 @@
         elif offset==0x088c:       # Engine #1 throttle
             return self._getThrottle(self.ENGINE_1)
+        elif offset==0x08b2:       # Engine #1 de-ice
+            return 1 if self.eng1DeIce else 0
         elif offset==0x0924:       # Engine #2 throttle
             return self._getThrottle(self.ENGINE_2)
+        elif offset==0x094a:       # Engine #2 de-ice
+            return 1 if self.eng2DeIce else 0
         elif offset==0x09bc:       # Engine #3 throttle
             return self._getThrottle(self.ENGINE_3)
+        elif offset==0x09e2:       # Engine #3 de-ice
+            return 1 if self.eng3DeIce else 0
         elif offset==0x0af4:       # Fuel weight
             return int(self.fuelWeight * 256.0)
@@ -559 +571 @@
         elif offset==0x32fa:       # Message duration
             return self.messageDuration
+        elif offset==0x337c:       # Prop de-ice
+            return 1 if self.propDeIce else 0
+        elif offset==0x337d:       # Structural de-ice
+            return 1 if self.structDeIce else 0
         elif offset==0x3380:       # Message
             return self.message
@@ -666 +682 @@
         elif offset==0x088c:       # Engine #1 throttle
             self._setThrottle(self.ENGINE_1, value)
+        elif offset==0x08b2:       # Engine #1 de-ice
+            self.eng1DeIce = value!=0
         elif offset==0x0924:       # Engine #2 throttle
             self._setThrottle(self.ENGINE_2, value)
+        elif offset==0x094a:       # Engine #2 de-ice
+            self.eng2DeIce = value!=0
         elif offset==0x09bc:       # Engine #3 throttle
             self._setThrottle(self.ENGINE_3, value)
+        elif offset==0x09e2:       # Engine #3 de-ice
+            self.eng3DeIce = value!=0
         elif offset==0x0af4:       # Fuel weight
             self.fuelWeight = value / 256.0
@@ -803 +825 @@
         elif offset==0x32fa:       # Message duration
             self.messageDuration = value
+        elif offset==0x3364:       # Frozen
+            self.frozen = value!=0
+        elif offset==0x337c:       # Propeller de-ice
+            self.propDeIce = value!=0
+        elif offset==0x337d:       # Structural de-ice
+            self.structDeIce = value!=0
         elif offset==0x3380:       # Message
             self.message = value
-        elif offset==0x3364:       # Frozen
-            self.frozen = value!=0
         elif offset==0x3bfc:       # ZFW
             self.zfw = value * const.LBSTOKG / 256.0
@@ -1451 +1477 @@
                                        float(word) * math.pi / 180.0)
 
+        self._valueHandlers["eng1Deice"] = ([(0x08b2, "H")],
+                                            CLI.bool2str, CLI.str2bool)
+        self._valueHandlers["eng2Deice"] = ([(0x094a, "H")],
+                                            CLI.bool2str, CLI.str2bool)
+        self._valueHandlers["eng3Deice"] = ([(0x09e2, "H")],
+                                            CLI.bool2str, CLI.str2bool)
+        self._valueHandlers["propDeice"] = ([(0x337c, "b")],
+                                            CLI.bool2str, CLI.str2bool)
+        self._valueHandlers["structDeice"] = ([(0x337d, "b")],
+                                              CLI.bool2str, CLI.str2bool)
+
     def default(self, line):
         """Handle unhandle commands."""