Changeset 529:c728353e86b1 for src/mlx

Timestamp:

08/17/13 08:37:50 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The Project Tupolev Tu-154 is detected on FSX as well and the transponder state is not checked (re #208)

Location:

src/mlx

Files:

• checks.py (modified) (1 diff)
• fsuipc.py (modified) (4 diffs)

src/mlx/checks.py

@@ -65 +65 @@
             elif not state.landingLightsOn and \
                  (state.strobeLightsOn is False or
-                  (state.strobeLightsOn is None and not state.xpdrC)) and \
+                  (state.strobeLightsOn is None and state.xpdrC is False)) and \
                  state.onTheGround and \
                  state.groundSpeed<50.0:

src/mlx/fsuipc.py

@@ -2005 +2005 @@
         print "PTT154Model.doesHandle", aircraft.type, name, airPath
         return aircraft.type==const.AIRCRAFT_T154 and \
-               name.find("Tu-154")!=-1 and \
+               (name.find("Tu-154")!=-1 or name.find("Tu154B")) and \
                os.path.basename(airPath).startswith("154b_")
 
@@ -2014 +2014 @@
         self._adf2 = None
         self._lastValue = None
+        self._fsType = None
 
     @property
@@ -2019 +2020 @@
         """Get the name for this aircraft model."""
         return "FSUIPC/Project Tupolev Tu-154"
+
+    def addMonitoringData(self, data, fsType):
+        """Add the model-specific monitoring data to the given array.
+
+        It only stores the flight simulator type."""
+        self._fsType = fsType
+
+        super(PTT154NGModel, self).addMonitoringData(data, fsType)
 
     def getAircraftState(self, aircraft, timestamp, data):
@@ -2039 +2048 @@
         state.adf1 = self._adf1
         state.adf2 = self._adf2
+
+        if self._fsType==const.SIM_MSFSX:
+            state.xpdrC = None
 
         return state