Changeset 917:803dc6bacfa5 for src/mlx/checks.py

Timestamp:

02/23/19 13:38:11 (5 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Parents:

908:fcf3c44650f1 (diff), 916:4f738ffc3596 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merged 0.39

Files:

• src/mlx/checks.py (modified) (1 diff)
• src/mlx/checks.py (modified) (1 diff)

src/mlx/checks.py

@@ -1021 +1021 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
+        isXPlane = (flight.aircraftType==const.AIRCRAFT_DH8D or
+                    flight.aircraftType==const.AIRCRAFT_B733) and \
+                    (flight.fsType==const.SIM_XPLANE11 or
+                     flight.fsType==const.SIM_XPLANE10 or
+                     flight.fsType==const.SIM_XPLANE9)
         if flight.stage==const.STAGE_CRUISE:
-            isDH8DXplane = flight.aircraftType==const.AIRCRAFT_DH8D and \
-                           (flight.fsType==const.SIM_XPLANE10 or
-                            flight.fsType==const.SIM_XPLANE9)
-            bankLimit = 35 if isDH8DXplane else 30
+            bankLimit = 40 if isXPlane else 30
         elif flight.stage in [const.STAGE_TAKEOFF, const.STAGE_CLIMB,
                               const.STAGE_DESCENT, const.STAGE_LANDING]:
-            bankLimit = 35
+            bankLimit = 45 if isXPlane else 35
         else:
             return False

src/mlx/checks.py

@@ -1415 +1415 @@
 class PayloadChecker(SimpleFaultChecker):
     """Check if the payload matches the specification."""
-    TOLERANCE=550
+    TOLERANCE=50
 
     @staticmethod