Changeset 1043:3629e16455ef for src

Timestamp:

04/03/22 14:32:40 (2 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

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

Message:

Unreadable N1 values are handled better (re #359)

Location:

src/mlx

Files:

• acft.py (modified) (1 diff)
• checks.py (modified) (2 diffs)

src/mlx/acft.py

@@ -516 +516 @@
         This default implementation checks the N1 values, but for
         piston-powered aircraft you need to check the RPMs."""
-        for n1 in aircraftState.n1:
-            if n1>=0.5: return False
+        if aircraftState.n1 is not None:
+            for n1 in aircraftState.n1:
+                if n1 is not None and n1>=0.5: return False
         return True
 

src/mlx/checks.py

@@ -977 +977 @@
         be on."""
         if state.n1 is not None:
-            return max(state.n1)>5
+            for n1 in state.n1:
+                if n1 is not None and n1>5:
+                    return True
+            return False
         elif state.rpm is not None:
             return max(state.rpm)>0
@@ -1590 +1593 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return flight.stage==const.STAGE_TAKEOFF and \
-               state.n1 is not None and max(state.n1)>97
+        if flight.stage==const.STAGE_TAKEOFF and state.n1 is not None:
+            for n1 in state.n1:
+                if n1 is not None and n1>97:
+                    return True
+        return False
 
     def logFault(self, flight, aircraft, logger, oldState, state):