Changeset 209:3172e5cab96e for src/mlx

Timestamp:

05/31/12 15:20:55 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The position of the gear control lever is logged

Location:

src/mlx

Files:

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

src/mlx/checks.py

@@ -455 +455 @@
         """Construct the logger."""
         StateChangeLogger.__init__(self, logInitial = True)
-        SingleValueMixin.__init__(self, "gearsDown")
+        SingleValueMixin.__init__(self, "gearControlDown")
 
     def _getMessage(self, state):
         """Get the message to log on a change."""
-        return "Gears %s at %.0f knots, %.0f feet" % \
-            ("DOWN" if state.gearsDown else "UP", state.ias, state.altitude)
+        return "Gears SET to %s at %.0f knots, %.0f feet" % \
+            ("DOWN" if state.gearControlDown else "UP",
+             state.ias, state.altitude)
 
 #---------------------------------------------------------------------------------------

src/mlx/fs.py

@@ -201 +201 @@
     - pitotHeatOn: a boolean indicating if the pitot heat is on
     - parking: a boolean indicating if the parking brake is set
+    - gearControlDown: a boolean indicating if the gear control is set to down
     - gearsDown: a boolean indicating if the gears are down
     - spoilersArmed: a boolean indicating if the spoilers have been armed for

src/mlx/fsuipc.py

@@ -1145 +1145 @@
                       ("pitot", 0x029c, "b"),
                       ("parking", 0x0bc8, "H"),
+                      ("gearControl", 0x0be8, "d"),
                       ("noseGear", 0x0bec, "d"),
                       ("spoilersArmed", 0x0bcc, "d"),
@@ -1308 +1309 @@
         state.parking = data[self._monidx_parking]!=0
 
+        state.gearControlDown = data[self._monidx_gearControl]==16383
         state.gearsDown = data[self._monidx_noseGear]==16383
 

src/mlx/gui/monitor.py

@@ -141 +141 @@
 
         self._antiCollisionLightsOn = gtk.Label("ANTICOLLISION")
-        table.attach(self._antiCollisionLightsOn, 1, 3, 5, 6)
+        table.attach(self._antiCollisionLightsOn, 1, 2, 5, 6)
 
         self._strobeLightsOn = gtk.Label("STROBE")
-        table.attach(self._strobeLightsOn, 3, 4, 5, 6)
+        table.attach(self._strobeLightsOn, 2, 3, 5, 6)
 
         self._landingLightsOn = gtk.Label("LANDING")
-        table.attach(self._landingLightsOn, 4, 5, 5, 6)
+        table.attach(self._landingLightsOn, 3, 4, 5, 6)
 
         self._pitotHeatOn = gtk.Label("PITOT HEAT")
-        table.attach(self._pitotHeatOn, 5, 7, 5, 6)
+        table.attach(self._pitotHeatOn, 4, 5, 5, 6)
 
         self._parking = gtk.Label("PARKING")
-        table.attach(self._parking, 7, 8, 5, 6)
+        table.attach(self._parking, 5, 6, 5, 6)
+
+        self._gearControlDown = gtk.Label("GEAR LEVER DOWN")
+        table.attach(self._gearControlDown, 6, 8, 5, 6)
 
         self._gearsDown = gtk.Label("GEARS DOWN")
@@ -241 +244 @@
             self._pitotHeatOn.set_sensitive(False)
             self._parking.set_sensitive(False)
+            self._gearControlDown.set_sensitive(False)
             self._gearsDown.set_sensitive(False)
             self._spoilersArmed.set_sensitive(False)
@@ -308 +312 @@
             self._pitotHeatOn.set_sensitive(aircraftState.pitotHeatOn)
             self._parking.set_sensitive(aircraftState.parking)
+            self._gearControlDown.set_sensitive(aircraftState.gearControlDown)
             self._gearsDown.set_sensitive(aircraftState.gearsDown)
             self._spoilersArmed.set_sensitive(aircraftState.spoilersArmed)

src/mlx/pyuipc_sim.py

@@ -229 +229 @@
         self.parking = True
 
+        self.gearControl = 1.0
         self.noseGear = 1.0
 
@@ -385 +386 @@
         elif offset==0x0be0 or offset==0x0be4:    # Flaps left and  right
             return self.flaps * 16383.0 / self.flapsNotches[-1]        
+        elif offset==0x0be8:       # Gear control
+            return int(self.gearControl * 16383.0)
         elif offset==0x0bec:       # Nose gear
             return int(self.noseGear * 16383.0)
@@ -602 +605 @@
         elif offset==0x0be0 or offset==0x0be4:    # Flaps left and  right
             self.flaps = value * self.flapsNotches[-1] / 16383.0
+        elif offset==0x0be8:       # Gear control
+            self.gearControl = value / 16383.0
         elif offset==0x0bec:       # Nose gear
             self.noseGear = value / 16383.0
@@ -1092 +1097 @@
         self._valueHandlers["pitot"] = (0x029c, "b", CLI.bool2str, CLI.str2bool)
         self._valueHandlers["parking"] = (0x0bc8, "H", CLI.bool2str, CLI.str2bool)
+        self._valueHandlers["gearControl"] = (0x0be8, "d",
+                                              lambda value: value * 100.0 / 16383.0,
+                                              lambda word: int(float(word) *
+                                                               16383.0 / 100.0))
         self._valueHandlers["noseGear"] = (0x0bec, "d",
                                            lambda value: value * 100.0 / 16383.0,