Changes in / [521:9f6c08020c54:516:71fe9bfad86e]

Files:

• src/mlx/checks.py (modified) (4 diffs)
• src/mlx/const.py (modified) (1 diff)
• test/test1.txt (modified) (6 diffs)

src/mlx/checks.py

@@ -641 +641 @@
 #---------------------------------------------------------------------------------------
 
-class FlapsLogger(StateChangeLogger, SingleValueMixin, DelayedChangeMixin):
+class FlapsLogger(StateChangeLogger, SingleValueMixin, SimpleChangeMixin):
     """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."""
-        logState = self._lastChangeState if \
-                   self._lastChangeState is not None else state
-        speed = logState.groundSpeed if logState.groundSpeed<80.0 \
-                else logState.ias
+        speed = state.groundSpeed if state.groundSpeed<80.0 else state.ias
         return "Flaps %.0f - %.0f %s" % \
-               (logState.flapsSet, flight.speedFromKnots(speed),
+               (state.flapsSet, flight.speedFromKnots(speed),
                 flight.getEnglishSpeedUnit())
 
@@ -917 +910 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return (not flight.config.usingFS2Crew or not state.parking or
-                flight.stage!=const.STAGE_TAXIAFTERLAND) and \
+        return (flight.stage!=const.STAGE_PARKING or \
+                not flight.config.usingFS2Crew) and \
                 not state.antiCollisionLightsOn and \
                 self.isEngineCondition(state)
@@ -1133 +1126 @@
                   [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==const.STAGE_TAKEOFF and
-                     not state.onTheGround) or flight.stage==const.STAGE_CLIMB))
+                   flight.stage in
+                   [const.STAGE_TAKEOFF, const.STAGE_RTO, const.STAGE_CLIMB])
                   )
                  )

src/mlx/const.py

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

test/test1.txt

@@ -14 +14 @@
 set adf1=382
 set parking=yes
-
 set parking=no
 set lights=3
@@ -28 +27 @@
 set xpdrC=0
 set altimeter=1004
-
 set lights=23
 set gs=60 ias=60
@@ -37 +35 @@
 set n1_1=90
 set n1_2=90
-
 set gs=100 ias=100
 set gs=120 ias=120
 set onTheGround=no
 set altitude=600
-
 set noseGear=0
 set altitude=2000
 set nav1=111.5
 set flapsControl=0
-
 set altimeter=1013.25
 set altitude=10000
@@ -53 +48 @@
 set ias=400
 set altitude=22001
-
 set vs=-200
 set altitude=15000
@@ -64 +58 @@
 set flapsControl=87.5
 set ias=130 gs=130
-
 set altitude=3500
 set ias=125 gs=125
@@ -76 +69 @@
 set latitude=47.49 longitude=21.62
 set lights=23
-
 set onTheGround=yes
 set n1_1=-10
 set n1_2=-10
+set n1_1=0
+set n1_2=0
+set ias=45 gs=45
 set lights=19
-set n1_1=20
-set n1_2=20
-set ias=45 gs=45
 set ias=35 gs=35
 set ias=20 gs=20
 set xpdrC=1
-
+set ias=0 gs=0
 set parking=yes
-set n1_1=0
-set n1_2=0
-set lights=17
-set ias=0 gs=0
-set lights=1