Changeset 496:0dadad5a93b8 for src/mlx/checks.py

Timestamp:

04/06/13 14:06:45 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

xplane

Parents:

478:00d38a068da9 (diff), 495:9c830f5791a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

hg-Phase:

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

Message:

Merged the default branch

Files:

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

src/mlx/checks.py

@@ -1382 +1382 @@
             if state.groundSpeed>50:
                 SpeedChecker.logSpeedFault(flight, state)
+        else:
+            self._takeoffState = None
 
     def _checkPushAndTaxi(self, flight, aircraft, state):
@@ -1426 +1428 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return (flight.stage==const.STAGE_BOARDING and \
+        return state.strobeLightsOn is not None and \
+              ((flight.stage==const.STAGE_BOARDING and \
                 state.strobeLightsOn and state.onTheGround) or \
                 (flight.stage==const.STAGE_TAKEOFF and \
@@ -1434 +1437 @@
                   not state.strobeLightsOn and not state.onTheGround) or \
                   (flight.stage==const.STAGE_PARKING and \
-                   state.strobeLightsOn and state.onTheGround)
+                   state.strobeLightsOn and state.onTheGround))
 
     def logFault(self, flight, aircraft, logger, oldState, state):

src/mlx/checks.py

@@ -957 +957 @@
         """Check if the fault condition holds."""
         if flight.stage==const.STAGE_CRUISE:
-            bankLimit = 30
+            isDH8DXplane = flight.aircraftType==const.AIRCRAFT_DH8D and \
+                           (flight.fsType==const.SIM_XPLANE10 or
+                            flight.fsType==const.SIM_XPLANE9)
+            bankLimit = 35 if isDH8DXplane else 30
         elif flight.stage in [const.STAGE_TAKEOFF, const.STAGE_CLIMB,
                               const.STAGE_DESCENT, const.STAGE_LANDING]:
@@ -968 +971 @@
     def logFault(self, flight, aircraft, logger, oldState, state):
         """Log the fault."""
+        message = "Bank too steep (%.1f)" % (state.bank,)
         flight.handleFault(BankChecker, state.timestamp,
-                           FaultChecker._appendDuring(flight, "Bank too steep"),
+                           FaultChecker._appendDuring(flight, message),
                            2)