Changeset 314:09f49b9eef64 for src/mlx/checks.py

Timestamp:

09/30/12 06:53:14 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for the landing lights and the NAV frequencies being unreliable and the Digital Aviation F70 model

File:

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

src/mlx/checks.py

@@ -301 +301 @@
     def _changed(self, oldState, state):
         """Determine if the value has changed."""
-        return self._getValue(oldState)!=self._getValue(state)
+        currentValue = self._getValue(state)
+        return currentValue is not None and self._getValue(oldState)!=currentValue
 
 #---------------------------------------------------------------------------------------
@@ -759 +760 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return (flight.stage==const.STAGE_BOARDING and \
-                state.landingLightsOn and state.onTheGround) or \
-               (flight.stage==const.STAGE_TAKEOFF and \
-                not state.landingLightsOn and not state.onTheGround) or \
-               (flight.stage in [const.STAGE_CLIMB, const.STAGE_CRUISE,
-                                 const.STAGE_DESCENT] and \
-                state.landingLightsOn and state.altitude>12500) or \
-               (flight.stage==const.STAGE_LANDING and \
-                not state.landingLightsOn and state.onTheGround) or \
-               (flight.stage==const.STAGE_PARKING and \
-                state.landingLightsOn and state.onTheGround)
+        return state.landingLightsOn is not None and \
+               ((flight.stage==const.STAGE_BOARDING and \
+                 state.landingLightsOn and state.onTheGround) or \
+                (flight.stage==const.STAGE_TAKEOFF and \
+                 not state.landingLightsOn and not state.onTheGround) or \
+                (flight.stage in [const.STAGE_CLIMB, const.STAGE_CRUISE,
+                                  const.STAGE_DESCENT] and \
+                 state.landingLightsOn and state.altitude>12500) or \
+                (flight.stage==const.STAGE_LANDING and \
+                 not state.landingLightsOn and state.onTheGround) or \
+                (flight.stage==const.STAGE_PARKING and \
+                 state.landingLightsOn and state.onTheGround))
                
     def logFault(self, flight, aircraft, logger, oldState, state):