Changes in src/mlx/xplane.py [909:5df186bc203c:893:147633a04fda]

File:

• src/mlx/xplane.py (modified) (5 diffs)

src/mlx/xplane.py

@@ -506 +506 @@
                   (xplaneVersion, xplmVersion, xplraVersion)
                 if not autoReconnection:
-                    fsType = const.SIM_XPLANE11 if xplaneVersion>=11000 else \
-                      (const.SIM_XPLANE10 if xplaneVersion>=10000 else const.SIM_XPLANE9)
+                    fsType = const.SIM_XPLANE10 if xplaneVersion>=10000 else const.SIM_XPLANE9
 
                     Handler._callSafe(lambda:
@@ -1435 +1434 @@
 
         flapsControl = data[self._monidx_flapsControl]
-        flapsIndex = int(round(flapsControl * (len(self._flapsNotches)-1)))
+        flapsIndex = int(flapsControl * (len(self._flapsNotches)-1))
         state.flapsSet = 0 if flapsIndex<1 else self._flapsNotches[flapsIndex]
 
@@ -1879 +1878 @@
 
 class T154Model(GenericAircraftModel):
-    """Generic model for the Tupolev Tu-154 aircraft."""
+    """Generic model for the Tupolev Tu-134 aircraft."""
     fuelTanks = [const.FUELTANK_CENTRE, const.FUELTANK_CENTRE2,
                  const.FUELTANK_RIGHT, const.FUELTANK_LEFT,
@@ -1903 +1902 @@
         del state.reverser[1]
         return state
-
-#------------------------------------------------------------------------------
-
-class FelisT154Model(T154Model):
-    """Model for Felis' Tupolev Tu-154-M aircraft."""
-    @staticmethod
-    def doesHandle(aircraft, (tailnum, author, description, notes,
-                              icao, liveryPath)):
-        """Determine if this model handler handles the aircraft with the given
-        name."""
-        return aircraft.type==const.AIRCRAFT_T154 and \
-          author.find("Felis")!=-1 and \
-          description.find("Tu154M")!=-1
-
-    def __init__(self):
-        """Construct the model."""
-        super(T154Model, self). \
-            __init__(flapsNotches = [0, 15, 28, 36, 45],
-                     fuelTanks = T154Model.fuelTanks,
-                     numEngines = 3)
-
-    @property
-    def name(self):
-        """Get the name for this aircraft model."""
-        return "X-Plane/Felis Tupolev Tu-154-M"
 
 #------------------------------------------------------------------------------
@@ -1970 +1944 @@
 
 AircraftModel.registerSpecial(FJSDH8DModel)
-AircraftModel.registerSpecial(FelisT154Model)
 
 #------------------------------------------------------------------------------