Changeset 354:4efeae885059

Timestamp:

12/12/12 16:36:23 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Some further smaller refinements of the strobeless takeoff detection (#143)

Location:

src/mlx

Files:

• checks.py (modified) (2 diffs)
• flight.py (modified) (1 diff)

src/mlx/checks.py

@@ -1300 +1300 @@
         """Check if the fault condition holds."""
         return flight.stage in [const.STAGE_PUSHANDTAXI,
+                                const.STAGE_RTO,
                                 const.STAGE_TAXIAFTERLAND] and \
             state.groundSpeed>50
@@ -1331 +1332 @@
     def check(self, flight, aircraft, logger, oldState, state):
         """Check the state as described above."""
-        if flight.stage==const.STAGE_PUSHANDTAXI:
+        if flight.stage==const.STAGE_PUSHANDTAXI or \
+           flight.stage==const.STAGE_RTO:
             self._checkPushAndTaxi(flight, aircraft, state)
         elif flight.stage==const.STAGE_TAXIAFTERLAND:

src/mlx/flight.py

@@ -325 +325 @@
                                        (self._rtoState.groundSpeed,))
                 self._gui.setRating(self.logger.getRating())
+                if self._stage == const.STAGE_PUSHANDTAXI:
+                    self.setStage(self.aircraft.state.timestamp,
+                                  const.STAGE_RTO)
             else:
                 SpeedChecker.logSpeedFault(self, self._rtoState,
                                            stage = const.STAGE_PUSHANDTAXI,
                                            updateID = self._rtoLogEntryID)
+                if self._stage == const.STAGE_RTO:
+                    self.setStage(self.aircraft.state.timestamp,
+                                  const.STAGE_PUSHANDTAXI)
 
     def flareStarted(self, flareStart, flareStartFS):