Changeset 539:750f64278751 for src/mlx

Timestamp:

09/18/13 04:52:50 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The no-strobe speed checker also works for models without strobe and transponder (re #211)

Location:

src/mlx

Files:

• acft.py (modified) (10 diffs)
• checks.py (modified) (3 diffs)
• fsuipc.py (modified) (2 diffs)

src/mlx/acft.py

@@ -113 +113 @@
         self.reverseMinSpeed = 60
 
+        self.needNoStrobeSpeedCheck = False
+
         self._checkers = []
 
@@ -178 +180 @@
         self._checkers.append(checks.PayloadChecker())
 
-        self._appendSpeedChecker()
+        self._checkers.append(checks.NoStrobeSpeedChecker())
+        self._checkers.append(checks.SpeedChecker())
         self._checkers.append(checks.VSChecker())
 
@@ -480 +483 @@
         self._checkers.append(checks.StrobeLightsChecker())
 
-    def _appendSpeedChecker(self):
-        """Append the speed checker.
-
-        This default implementation used the SpeedChecker."""
-        self._checkers.append(checks.SpeedChecker())
-
     def _speedToLog(self, speed):
         """Convert the given speed (being either None or expressed in the
@@ -651 +648 @@
         """Get the derate type for this type."""
         return DERATE_BOEING
-
-    # def _appendSpeedChecker(self):
-    #     """Append the NoStrobeSpeedChecker to the checkers.
-
-    #     FOR TESTING ONLY, THIS FUNCTION SHOULD NORMALLY BE COMMENTED OUT!!!"""
-    #     self._checkers.append(checks.NoStrobeSpeedChecker())
 
 #---------------------------------------------------------------------------------------
@@ -906 +897 @@
         self.reverseMinSpeed = 50
 
+        self.needNoStrobeSpeedCheck = True
+
     @property
     def derateType(self):
@@ -927 +920 @@
         self._checkers.append(checks.LandingLightsChecker())
         self._checkers.append(checks.NavLightsChecker())
-
-    def _appendSpeedChecker(self):
-        """Append the NoStrobeSpeedChecker to the checkers."""
-        self._checkers.append(checks.NoStrobeSpeedChecker())
 
 #---------------------------------------------------------------------------------------
@@ -954 +943 @@
         self.reverseMinSpeed = 50
 
+        self.needNoStrobeSpeedCheck = True
+
     @property
     def speedInKnots(self):
@@ -975 +966 @@
         self._checkers.append(checks.LandingLightsChecker())
         self._checkers.append(checks.NavLightsChecker())
-
-    def _appendSpeedChecker(self):
-        """Append the NoStrobeSpeedChecker to the checkers."""
-        self._checkers.append(checks.NoStrobeSpeedChecker())
 
 #---------------------------------------------------------------------------------------
@@ -1000 +987 @@
                                  35 : 135 }
 
+        self.needNoStrobeSpeedCheck = True
+
     @property
     def speedInKnots(self):
@@ -1021 +1010 @@
         self._checkers.append(checks.LandingLightsChecker())
         self._checkers.append(checks.NavLightsChecker())
-
-    def _appendSpeedChecker(self):
-        """Append the NoStrobeSpeedChecker to the checkers."""
-        self._checkers.append(checks.NoStrobeSpeedChecker())
 
 #---------------------------------------------------------------------------------------

src/mlx/checks.py

@@ -1342 +1342 @@
     """Check if the speed is in the prescribed limits."""
     @staticmethod
+    def needNoStrobe(aircraft, state):
+        """Determine if the given aircraft and state needs a strobeless speed
+        checking."""
+        return aircraft.needNoStrobeSpeedCheck or \
+               (state.strobeLightsOn is None and state.xpdrC is None)
+
+    @staticmethod
     def logSpeedFault(flight, state, stage = None, updateID = None):
         """Log the speed fault."""
@@ -1356 +1363 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return flight.stage in [const.STAGE_PUSHANDTAXI,
-                                const.STAGE_RTO,
-                                const.STAGE_TAXIAFTERLAND] and \
+        return not self.needNoStrobe(aircraft, state) and \
+            flight.stage in [const.STAGE_PUSHANDTAXI,
+                             const.STAGE_RTO,
+                             const.STAGE_TAXIAFTERLAND] and \
             state.groundSpeed>50
 
@@ -1389 +1397 @@
     def check(self, flight, aircraft, logger, oldState, state):
         """Check the state as described above."""
-        if flight.stage==const.STAGE_PUSHANDTAXI or \
-           flight.stage==const.STAGE_RTO:
-            self._checkPushAndTaxi(flight, aircraft, state)
-        elif flight.stage==const.STAGE_TAXIAFTERLAND:
-            if state.groundSpeed>50:
-                SpeedChecker.logSpeedFault(flight, state)
-        else:
-            self._takeoffState = None
+        if SpeedChecker.needNoStrobe(aircraft, state):
+            if flight.stage==const.STAGE_PUSHANDTAXI or \
+               flight.stage==const.STAGE_RTO:
+                self._checkPushAndTaxi(flight, aircraft, state)
+            elif flight.stage==const.STAGE_TAXIAFTERLAND:
+                if state.groundSpeed>50:
+                    SpeedChecker.logSpeedFault(flight, state)
+            else:
+                self._takeoffState = None
 
     def _checkPushAndTaxi(self, flight, aircraft, state):

src/mlx/fsuipc.py

@@ -1626 +1626 @@
         return "FSUIPC/Generic Boeing 737"
 
+    # Note: the function below should be enabled if testing the speed-based
+    # takeoff on Linux
+    # def getAircraftState(self, aircraft, timestamp, data):
+    #     """Get the aircraft state.
+
+    #     Get it from the parent, and then check some PMDG-specific stuff."""
+    #     state = super(B737Model, self).getAircraftState(aircraft,
+    #                                                     timestamp,
+    #                                                     data)
+    #     state.strobeLightsOn = None
+    #     state.xpdrC = None
+
+    #     return state
+
 #------------------------------------------------------------------------------
 
@@ -1690 +1704 @@
             apalthold = data[self._pmdgidx_apalthold]
             state.apAltitudeHold = apalthold>=3 and apalthold<=6
+            state.xpdrC = data[self._pmdgidx_xpdr]==4
+
+            # Uncomment the following to test the speed-based takeoff
+            # state.strobeLightsOn = None
+            # state.xpdrC = None
         else:
             state.apMaster = data[self._pmdgidx_cmda]!=0
             state.apHeadingHold = data[self._pmdgidx_aphdgsel]!=0
             state.apAltitudeHold = data[self._pmdgidx_apalthold]!=0
-            #state.strobeLightsOn = data[self._pmdgidx_lts_positionsw]==0x02
+
+            # state.strobeLightsOn = data[self._pmdgidx_lts_positionsw]==0x02
+            # state.xpdrC = data[self._pmdgidx_xpdr]==4
             state.strobeLightsOn = None
-
-        state.xpdrC = data[self._pmdgidx_xpdr]==4
+            state.xpdrC = None
+
         state.apHeading = data[self._pmdgidx_aphdg]
         state.apAltitude = data[self._pmdgidx_apalt]