Changeset 539:750f64278751 for src/mlx/checks.py

Timestamp:

09/18/13 04:52:50 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The no-strobe speed checker also works for models without strobe and transponder (re #211)

File:

• src/mlx/checks.py (modified) (3 diffs)

src/mlx/checks.py

@@ -1342 +1342 @@
     """Check if the speed is in the prescribed limits."""
     @staticmethod
+    def needNoStrobe(aircraft, state):
+        """Determine if the given aircraft and state needs a strobeless speed
+        checking."""
+        return aircraft.needNoStrobeSpeedCheck or \
+               (state.strobeLightsOn is None and state.xpdrC is None)
+
+    @staticmethod
     def logSpeedFault(flight, state, stage = None, updateID = None):
         """Log the speed fault."""
@@ -1356 +1363 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return flight.stage in [const.STAGE_PUSHANDTAXI,
-                                const.STAGE_RTO,
-                                const.STAGE_TAXIAFTERLAND] and \
+        return not self.needNoStrobe(aircraft, state) and \
+            flight.stage in [const.STAGE_PUSHANDTAXI,
+                             const.STAGE_RTO,
+                             const.STAGE_TAXIAFTERLAND] and \
             state.groundSpeed>50
 
@@ -1389 +1397 @@
     def check(self, flight, aircraft, logger, oldState, state):
         """Check the state as described above."""
-        if flight.stage==const.STAGE_PUSHANDTAXI or \
-           flight.stage==const.STAGE_RTO:
-            self._checkPushAndTaxi(flight, aircraft, state)
-        elif flight.stage==const.STAGE_TAXIAFTERLAND:
-            if state.groundSpeed>50:
-                SpeedChecker.logSpeedFault(flight, state)
-        else:
-            self._takeoffState = None
+        if SpeedChecker.needNoStrobe(aircraft, state):
+            if flight.stage==const.STAGE_PUSHANDTAXI or \
+               flight.stage==const.STAGE_RTO:
+                self._checkPushAndTaxi(flight, aircraft, state)
+            elif flight.stage==const.STAGE_TAXIAFTERLAND:
+                if state.groundSpeed>50:
+                    SpeedChecker.logSpeedFault(flight, state)
+            else:
+                self._takeoffState = None
 
     def _checkPushAndTaxi(self, flight, aircraft, state):