Changeset 25:d3bf7580e98e

Timestamp:

02/16/12 18:41:00 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Eliminated the detection of multiple flare-touchdown sequences when bouncing after landing and some other small fixes.

File:

• src/checks.py (modified) (5 diffs)

src/checks.py

@@ -22 +22 @@
 class StageChecker(StateChecker):
     """Check the flight stage transitions."""
+    def __init__(self):
+        """Construct the stage checker."""
+        self._flareStarted = False
+
     def check(self, flight, aircraft, logger, oldState, state):
         """Check the stage of the aircraft."""
@@ -63 +67 @@
             elif not state.gearsDown:
                 aircraft.setStage(state, const.STAGE_GOAROUND)
-            elif state.radioAltitude>200:
+            elif state.radioAltitude>200 and self._flareStarted:
                 aircraft.cancelFlare()
-            elif state.radioAltitude<150 and not state.onTheGround:
+                self._flareStarted = False
+            elif state.radioAltitude<150 and not state.onTheGround and \
+                 not self._flareStarted:
+                self._flareStarted = True
                 aircraft.prepareFlare()
         elif stage==const.STAGE_TAXIAFTERLAND:
@@ -572 +579 @@
     def logFault(self, flight, aircraft, logger, oldState, state):
         """Log the fault."""
-        logger.fault(GearSpeedLinmitChecker, state.timestamp,
+        logger.fault(GearSpeedLimitChecker, state.timestamp,
                      FaultChecker._appendDuring(flight, "Gear speed limit fault"),
                      5)
@@ -780 +787 @@
         return flight.stage in [const.STAGE_DESCENT, const.STAGE_LANDING,
                                 const.STAGE_TAXIAFTERLAND] and \
-            state.groundSpeed<80 and max(state.reverser)
+            state.groundSpeed<60 and max(state.reverser)
                            
     def logFault(self, flight, aircraft, logger, oldState, state):
@@ -858 +865 @@
         """Log the fault."""
         print state.n1
-        logger.fault(LandingLightsChecker, state.timestamp,
+        logger.fault(ThrustChecker, state.timestamp,
                      FaultChecker._appendDuring(flight, "Thrust setting was too high (>97%)"),
                      FaultChecker._getLinearScore(97, 110, 0, 10, max(state.n1)))