Ignore:
Timestamp:
02/23/19 13:38:11 (4 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.
hg-Phase:
(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')
Message:

Merged 0.39

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/mlx/checks.py

    r896 r917  
    10211021    def isCondition(self, flight, aircraft, oldState, state):
    10221022        """Check if the fault condition holds."""
     1023        isXPlane = (flight.aircraftType==const.AIRCRAFT_DH8D or
     1024                    flight.aircraftType==const.AIRCRAFT_B733) and \
     1025                    (flight.fsType==const.SIM_XPLANE11 or
     1026                     flight.fsType==const.SIM_XPLANE10 or
     1027                     flight.fsType==const.SIM_XPLANE9)
    10231028        if flight.stage==const.STAGE_CRUISE:
    1024             isDH8DXplane = flight.aircraftType==const.AIRCRAFT_DH8D and \
    1025                            (flight.fsType==const.SIM_XPLANE10 or
    1026                             flight.fsType==const.SIM_XPLANE9)
    1027             bankLimit = 35 if isDH8DXplane else 30
     1029            bankLimit = 40 if isXPlane else 30
    10281030        elif flight.stage in [const.STAGE_TAKEOFF, const.STAGE_CLIMB,
    10291031                              const.STAGE_DESCENT, const.STAGE_LANDING]:
    1030             bankLimit = 35
     1032            bankLimit = 45 if isXPlane else 35
    10311033        else:
    10321034            return False
  • src/mlx/checks.py

    r912 r917  
    14151415class PayloadChecker(SimpleFaultChecker):
    14161416    """Check if the payload matches the specification."""
    1417     TOLERANCE=550
     1417    TOLERANCE=50
    14181418
    14191419    @staticmethod
Note: See TracChangeset for help on using the changeset viewer.