Changeset 211:fbd8dad0b6be for src/mlx/checks.py

Timestamp:

05/31/12 15:37:24 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Reorganized the lights loggin and checks a bit

File:

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

src/mlx/checks.py

@@ -547 +547 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        isTupolev = aircraft.type in [const.AIRCRAFT_T134, 
-                                      const.AIRCRAFT_T154]
         return (flight.stage!=const.STAGE_PARKING or \
                 not flight.config.usingFS2Crew) and \
                 not state.antiCollisionLightsOn and \
-                ((isTupolev and max(state.n1[1:])>5) or \
-                 (not isTupolev and max(state.n1)>5))
+                self.isEngineCondition(state)
 
     def logFault(self, flight, aircraft, logger, oldState, state):
@@ -561 +558 @@
                                                       "Anti-collision lights were off"),
                            1)
+
+    def isEngineCondition(self, state):
+        """Determine if the engines are in such a state that the lights should
+        be on."""
+        return max(state.n1)>5
+
+#---------------------------------------------------------------------------------------
+
+class TupolevAntiCollisionLightsChecker(AntiCollisionLightsChecker):
+    """Check for the anti-collision light for Tuplev planes."""
+
+    def isEngineCondition(self, state):
+        """Determine if the engines are in such a state that the lights should
+        be on."""
+        return max(state.n1[1:])>5
+    
 
 #---------------------------------------------------------------------------------------
@@ -923 +936 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        if aircraft.type in [const.AIRCRAFT_T134,
-                             const.AIRCRAFT_T154,
-                             const.AIRCRAFT_YK40]:
-            return False
-        else:
-            return (flight.stage==const.STAGE_BOARDING and \
-                    state.strobeLightsOn and state.onTheGround) or \
-                   (flight.stage==const.STAGE_TAKEOFF and \
-                    not state.strobeLightsOn and not state.gearsDown) or \
-                   (flight.stage in [const.STAGE_CLIMB, const.STAGE_CRUISE,
-                                     const.STAGE_DESCENT] and \
-                   not state.strobeLightsOn and not state.onTheGround) or \
-                   (flight.stage==const.STAGE_PARKING and \
-                    state.strobeLightsOn and state.onTheGround)
+        return (flight.stage==const.STAGE_BOARDING and \
+                state.strobeLightsOn and state.onTheGround) or \
+                (flight.stage==const.STAGE_TAKEOFF and \
+                 not state.strobeLightsOn and not state.gearsDown) or \
+                 (flight.stage in [const.STAGE_CLIMB, const.STAGE_CRUISE,
+                                   const.STAGE_DESCENT] and \
+                  not state.strobeLightsOn and not state.onTheGround) or \
+                  (flight.stage==const.STAGE_PARKING and \
+                   state.strobeLightsOn and state.onTheGround)
                
     def logFault(self, flight, aircraft, logger, oldState, state):