Changeset 917:803dc6bacfa5

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.

hg-Phase:

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

Message:

Merged 0.39

Location:

src/mlx

Files:

• acft.py (modified) (1 diff)
• acft.py (modified) (6 diffs)
• checks.py (modified) (1 diff)
• checks.py (modified) (1 diff)
• const.py (modified) (1 diff)
• const.py (modified) (6 diffs)

src/mlx/acft.py

@@ -1149 +1149 @@
             self.mtow = 100000
             self.mlw = 80000
+        elif bookedFlight.tailNumber=="HA-LCX":
+            self.mtow = 100000
+            self.mlw = 80000
+            self.mzfw = 74000
+
+            self.flapSpeedLimits = { 15 : 227,
+                                     28 : 194,
+                                     36 : 178,
+                                     45 : 162 }
 
     def _appendLightsLoggers(self):

src/mlx/acft.py

@@ -97 +97 @@
 class Aircraft(object):
     """Base class for aircraft."""
+    dowCockpit = 2
+    dowCabin = 3
+
     @staticmethod
     def create(flight, bookedFlight):
@@ -125 +128 @@
         self._landingAntiIceLineID = None
 
-        self.humanWeight = 82.0
+        self.cockpitCrewWeight = 85.0
+        self.cabinCrewWeight = 75.0
+        self.humanWeight = 84.0
 
         self.initialClimbSpeedAltitude = 1500
@@ -829 +834 @@
 class B734(Boeing737CL):
     """Boeing 737-400 aircraft."""
+    dow = 35100
+
     def __init__(self, flight):
         super(B734, self).__init__(flight)
-        self.dow = 35100
         self.mtow = 62822
         self.mlw = 54885
@@ -1243 +1249 @@
         """Get the derate type for this type."""
         return DERATE_B462
+
+#---------------------------------------------------------------------------------------
+
+class IL62(Aircraft):
+    """Ilyushin IL-62 aircraft.
+
+    The aircraft type-specific values in the aircraft state have the following
+    structure:
+    - fuel: left, centre, right
+    - n1: left outer, left inner, right inner, right outer
+    - reverser: empty (the plane has no reversers)"""
+    dow = 69500
+
+    def __init__(self, flight):
+        super(B462, self).__init__(flight)
+        self.mtow = 165000
+        self.mlw = 165000
+        self.mzfw = 165000
+        self.gearSpeedLimit = 210
+        self.flapSpeedLimits = { 18 : 217,
+                                 24 : 180,
+                                 30 : 170,
+                                 33 : 150 }
+
+    @property
+    def derateType(self):
+        """Get the derate type for this type."""
+        return DERATE_NONE
 
 #---------------------------------------------------------------------------------------
@@ -1271 +1305 @@
              const.AIRCRAFT_T154  : T154,
              const.AIRCRAFT_YK40  : YK40,
-             const.AIRCRAFT_B462  : B462 }
+             const.AIRCRAFT_B462  : B462,
+             const.AIRCRAFT_IL62  : IL62 }
 
 #---------------------------------------------------------------------------------------
@@ -1281 +1316 @@
 #---------------------------------------------------------------------------------------
 
+def setupTypes(aircraftTypes):
+    """Setup the values in the given types using the info retrieved
+    from the server."""
+    for aircraftTypeInfo in aircraftTypes:
+        clazz = getClass(aircraftTypeInfo.aircraftType)
+
+        clazz.dow = aircraftTypeInfo.dow
+        clazz.dowCockpit = aircraftTypeInfo.dowCockpit
+        clazz.dowCabin = aircraftTypeInfo.dowCabin
+
+#---------------------------------------------------------------------------------------
+
 if __name__ == "__main__":
     value = SmoothedValue()

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

src/mlx/const.py

@@ -49 +49 @@
 ## Flight simulator type: Prepar3D
 SIM_P3D = 5
+
+## Flight simulator type: X-Plane 11
+SIM_XPLANE11 = 6
 
 #-------------------------------------------------------------------------------

src/mlx/const.py

@@ -12 +12 @@
 
 ## The version of the program
-VERSION="0.39.6"
+VERSION="0.40.1"
 
 #-------------------------------------------------------------------------------
@@ -108 +108 @@
 ## Aircraft type: British Aerospace BAe-146
 AIRCRAFT_B462 = 17
+
+## Aircraft type: British Aerospace BAe-146
+AIRCRAFT_IL62 = 19
 
 #-------------------------------------------------------------------------------
@@ -122 +125 @@
                  AIRCRAFT_T154, AIRCRAFT_T134,
                  AIRCRAFT_YK40, AIRCRAFT_DC3,
-                 AIRCRAFT_B462]
+                 AIRCRAFT_B462, AIRCRAFT_IL62]
 
 #-------------------------------------------------------------------------------
@@ -158 +161 @@
 ## Aircraft type family: British Aerospace BAe-146
 AIRCRAFT_FAMILY_B462 = 11
+
+## Aircraft type family: Ilyushin IL-62
+AIRCRAFT_FAMILY_IL62 = 12
 
 #-------------------------------------------------------------------------------
@@ -185 +191 @@
     AIRCRAFT_FAMILY_YK40: [AIRCRAFT_YK40],
 
-    AIRCRAFT_FAMILY_B462: [AIRCRAFT_B462]
+    AIRCRAFT_FAMILY_B462: [AIRCRAFT_B462],
+
+    AIRCRAFT_FAMILY_IL62: [AIRCRAFT_IL62]
 
     }
@@ -219 +227 @@
               AIRCRAFT_T154  : "T154",
               AIRCRAFT_YK40  : "YK40",
-              AIRCRAFT_B462  : "B462" }
+              AIRCRAFT_B462  : "B462",
+              AIRCRAFT_IL62  : "IL62" }
+
+#-------------------------------------------------------------------------------
+
+## A mapping from ICAO codes to the corresponding aircraft types
+icao2Type = { "B736" : AIRCRAFT_B736,
+              "B737" : AIRCRAFT_B737,
+              "B738" : AIRCRAFT_B738,
+              "B732" : AIRCRAFT_B732,
+              "B733" : AIRCRAFT_B733,
+              "B734" : AIRCRAFT_B734,
+              "B735" : AIRCRAFT_B735,
+              "DH8D" : AIRCRAFT_DH8D,
+              "B762" : AIRCRAFT_B762,
+              "B763" : AIRCRAFT_B763,
+              "CRJ2" : AIRCRAFT_CRJ2,
+              "F70"  : AIRCRAFT_F70,
+              "DC3"  : AIRCRAFT_DC3,
+              "T134" : AIRCRAFT_T134,
+              "T154" : AIRCRAFT_T154,
+              "YK40" : AIRCRAFT_YK40,
+              "B462" : AIRCRAFT_B462,
+              "IL62" : AIRCRAFT_IL62 }
 
 #-------------------------------------------------------------------------------