Changeset 521:9f6c08020c54

Timestamp:

06/05/13 15:42:56 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

xplane

Parents:

516:71fe9bfad86e (diff), 520:6a09d031f8f0 (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.

Phase:

public

Message:

Merged changes from the default branch

Location:

src/mlx

Files:

• checks.py (modified) (4 diffs)
• checks.py (modified) (2 diffs)
• const.py (modified) (1 diff)
• const.py (modified) (1 diff)

src/mlx/checks.py

@@ -641 +641 @@
 #---------------------------------------------------------------------------------------
 
-class FlapsLogger(StateChangeLogger, SingleValueMixin, SimpleChangeMixin):
+class FlapsLogger(StateChangeLogger, SingleValueMixin, DelayedChangeMixin):
     """Logger for the flaps setting."""
     def __init__(self):
@@ -652 +652 @@
                                     const.STAGE_TAKEOFF])
         SingleValueMixin.__init__(self, "flapsSet")
+        DelayedChangeMixin.__init__(self)
+        self._getLogTimestamp = \
+            lambda state, forced: \
+            DelayedChangeMixin._getLogTimestamp(self, state, forced)
 
     def _getMessage(self, flight, state, forced):
         """Get the message to log on a change."""
-        speed = state.groundSpeed if state.groundSpeed<80.0 else state.ias
+        logState = self._lastChangeState if \
+                   self._lastChangeState is not None else state
+        speed = logState.groundSpeed if logState.groundSpeed<80.0 \
+                else logState.ias
         return "Flaps %.0f - %.0f %s" % \
-               (state.flapsSet, flight.speedFromKnots(speed),
+               (logState.flapsSet, flight.speedFromKnots(speed),
                 flight.getEnglishSpeedUnit())
 
@@ -910 +917 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return (flight.stage!=const.STAGE_PARKING or \
-                not flight.config.usingFS2Crew) and \
+        return (not flight.config.usingFS2Crew or not state.parking or
+                flight.stage!=const.STAGE_TAXIAFTERLAND) and \
                 not state.antiCollisionLightsOn and \
                 self.isEngineCondition(state)
@@ -1126 +1133 @@
                   [const.STAGE_CRUISE, const.STAGE_DESCENT,
                    const.STAGE_GOAROUND] or \
-                  (flight.stage==const.STAGE_LANDING  and
+                  (flight.stage==const.STAGE_LANDING and
                    state.groundSpeed>50.0) or \
                   ((not state.autoXPDR or \
                     (self._liftOffTime is not None and
                      state.timestamp > (self._liftOffTime+8))) and \
-                   flight.stage in
-                   [const.STAGE_TAKEOFF, const.STAGE_RTO, const.STAGE_CLIMB])
+                   ((flight.stage==const.STAGE_TAKEOFF and
+                     not state.onTheGround) or flight.stage==const.STAGE_CLIMB))
                   )
                  )

src/mlx/checks.py

@@ -964 +964 @@
         """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]:
@@ -975 +978 @@
     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)
 

src/mlx/const.py

@@ -11 +11 @@
 
 ## The version of the program
-VERSION="0.20xpl"
+VERSION="0.21xpl"
 
 #-------------------------------------------------------------------------------

src/mlx/const.py

@@ -11 +11 @@
 
 ## The version of the program
-VERSION="0.21"
+VERSION="0.21xpl"
 
 #-------------------------------------------------------------------------------