Changeset 349:41c486c8a0b4 for src/mlx/checks.py

Timestamp:

12/10/12 19:28:32 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

The basic strobe-less RTO handling logic works (#143)

File:

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

src/mlx/checks.py

@@ -1285 +1285 @@
     """Check if the speed is in the prescribed limits."""
     @staticmethod
-    def logSpeedFault(flight, state):
+    def logSpeedFault(flight, state, stage = None, updateID = None):
         """Log the speed fault."""
         message = "Taxi speed over %.0f %s" % \
                   (flight.speedFromKnots(50), flight.getEnglishSpeedUnit())
-        flight.handleFault((SpeedChecker, flight.stage), state.timestamp,
-                           FaultChecker._appendDuring(flight, message),
-                           FaultChecker._getLinearScore(50, 80, 10, 15,
-                                                        state.groundSpeed),
-                           updatePrevious = True)
+        if stage is None:
+            stage = flight.stage
+        score = FaultChecker._getLinearScore(50, 80, 10, 15, state.groundSpeed)
+        return flight.handleFault((SpeedChecker, stage), state.timestamp,
+                                  FaultChecker._appendDuring(flight, message),
+                                  score, updatePrevious = updateID is None,
+                                  updateID = updateID)
 
     def isCondition(self, flight, aircraft, oldState, state):
@@ -1314 +1316 @@
     saved as a provisional takeoff state. If the speed then decreases below 50
     knots, or the plane remains on the ground for more than 20 seconds, a taxi
-    speed error is logged with the highest ground speed detected.
+    speed error is logged with the highest ground speed detected. This state is
+    also stored in the flight object as a possible
 
     If the plane becomes airborne within 20 seconds, the stage becomes TAKEOFF,
@@ -1345 +1348 @@
 
                 if state.timestamp > (self._takeoffState.timestamp + 20):
-                    SpeedChecker.logSpeedFault(flight, self._highestSpeedState)
+                    flight.setRTOState(self._highestSpeedState)
                 elif not state.onTheGround:
                     aircraft.setStage(self._takeoffState, const.STAGE_TAKEOFF)
                     self._takeoffState = None
         elif self._takeoffState is not None:
-            SpeedChecker.logSpeedFault(flight, self._highestSpeedState)
+            flight.setRTOState(self._highestSpeedState)
             self._takeoffState = None