Changeset 263:7ee78a903649 for src/mlx/checks.py

Timestamp:

06/28/12 17:24:45 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

RPM is handled properly and the fuel tanks of Li-2 match the simulator

File:

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

src/mlx/checks.py

@@ -572 +572 @@
         """Determine if the engines are in such a state that the lights should
         be on."""
-        return max(state.n1)>5
+        if state.n1 is not None:
+            return max(state.n1)>5
+        elif state.rpm is not None:
+            return max(state.rpm)>0
+        else:
+            return False
 
 #---------------------------------------------------------------------------------------
@@ -582 +587 @@
         """Determine if the engines are in such a state that the lights should
         be on."""
-        return max(state.n1[1:])>5
-    
+        return max(state.n1[1:])>5    
 
 #---------------------------------------------------------------------------------------
 
 class BankChecker(SimpleFaultChecker):
-    """Check for the anti-collision light being off at high N1 values."""
+    """Check for the bank is within limits."""
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
@@ -973 +977 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return flight.stage==const.STAGE_TAKEOFF and max(state.n1)>97
+        return flight.stage==const.STAGE_TAKEOFF and \
+               state.n1 is not None and max(state.n1)>97
                
     def logFault(self, flight, aircraft, logger, oldState, state):
         """Log the fault."""
-        print state.n1
         flight.handleFault(ThrustChecker, state.timestamp,
                            FaultChecker._appendDuring(flight,