Changeset 314:09f49b9eef64

Timestamp:

09/30/12 06:53:14 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for the landing lights and the NAV frequencies being unreliable and the Digital Aviation F70 model

Files:

• src/mlx/checks.py (modified) (2 diffs)
• src/mlx/fs.py (modified) (2 diffs)
• src/mlx/fsuipc.py (modified) (4 diffs)
• src/mlx/gui/monitor.py (modified) (4 diffs)
• src/mlx/pyuipc_sim.py (modified) (1 diff)
• test/f70.vaflight (added)
• test/test2.txt (added)

src/mlx/checks.py

@@ -301 +301 @@
     def _changed(self, oldState, state):
         """Determine if the value has changed."""
-        return self._getValue(oldState)!=self._getValue(state)
+        currentValue = self._getValue(state)
+        return currentValue is not None and self._getValue(oldState)!=currentValue
 
 #---------------------------------------------------------------------------------------
@@ -759 +760 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return (flight.stage==const.STAGE_BOARDING and \
-                state.landingLightsOn and state.onTheGround) or \
-               (flight.stage==const.STAGE_TAKEOFF and \
-                not state.landingLightsOn and not state.onTheGround) or \
-               (flight.stage in [const.STAGE_CLIMB, const.STAGE_CRUISE,
-                                 const.STAGE_DESCENT] and \
-                state.landingLightsOn and state.altitude>12500) or \
-               (flight.stage==const.STAGE_LANDING and \
-                not state.landingLightsOn and state.onTheGround) or \
-               (flight.stage==const.STAGE_PARKING and \
-                state.landingLightsOn and state.onTheGround)
+        return state.landingLightsOn is not None and \
+               ((flight.stage==const.STAGE_BOARDING and \
+                 state.landingLightsOn and state.onTheGround) or \
+                (flight.stage==const.STAGE_TAKEOFF and \
+                 not state.landingLightsOn and not state.onTheGround) or \
+                (flight.stage in [const.STAGE_CLIMB, const.STAGE_CRUISE,
+                                  const.STAGE_DESCENT] and \
+                 state.landingLightsOn and state.altitude>12500) or \
+                (flight.stage==const.STAGE_LANDING and \
+                 not state.landingLightsOn and state.onTheGround) or \
+                (flight.stage==const.STAGE_PARKING and \
+                 state.landingLightsOn and state.onTheGround))
                
     def logFault(self, flight, aircraft, logger, oldState, state):

src/mlx/fs.py

@@ -215 +215 @@
     - antiCollisionLightsOn: a boolean indicating if the anti-collision lights are on
     - strobeLightsOn: a boolean indicating if the strobe lights are on
-    - landingLightsOn: a boolean indicating if the landing lights are on
+    - landingLightsOn: a boolean indicating if the landing lights are on. If
+    the detection of the state of the landing lights is unreliable, and should
+    not be considered, this is set to None.
     - pitotHeatOn: a boolean indicating if the pitot heat is on
     - parking: a boolean indicating if the parking brake is set
@@ -225 +227 @@
     (float) 
     - altimeter: the altimeter setting in hPa (float)
-    - nav1: the frequency of the NAV1 radio in MHz (string)
-    - nav2: the frequency of the NAV1 radio in MHz (string)
+    - nav1: the frequency of the NAV1 radio in MHz (string). Can be None, if
+    the frequency is unreliable or meaningless.
+    - nav2: the frequency of the NAV1 radio in MHz (string). Can be None, if
+    the frequency is unreliable or meaningless.
     - squawk: the transponder code (string)
     - windSpeed: the speed of the wind at the aircraft in knots (float)

src/mlx/fsuipc.py

@@ -896 +896 @@
             return False
 
+        print "fsuipc.Simulator: new aircraft name and air file path: %s, %s" % \
+              (name, airPath)
+
         self._aircraftName = aircraftName
         needNew = self._aircraftModel is None
@@ -1661 +1664 @@
 
         return state
+
 #------------------------------------------------------------------------------
 
@@ -1696 +1700 @@
         """Get the name for this aircraft model."""
         return "FSUIPC/Generic Fokker 70"
+
+#------------------------------------------------------------------------------
+
+class DAF70Model(F70Model):
+    """Model for the Digital Aviation F70 implementation on FS9."""
+    @staticmethod
+    def doesHandle(aircraft, (name, airPath)):
+        """Determine if this model handler handles the aircraft with the given
+        name."""
+        return aircraft.type == const.AIRCRAFT_F70 and \
+               (airPath.endswith("fokker70_2k4_v4.1.air") or
+                airPath.endswith("fokker70_2k4_v4.3.air"))
+
+    @property
+    def name(self):
+        """Get the name for this aircraft model."""
+        return "FSUIPC/Digital Aviation Fokker 70"
+
+    def getAircraftState(self, aircraft, timestamp, data):
+        """Get the aircraft state.
+
+        Get it from the parent, and then invert the pitot heat state."""
+        state = super(DAF70Model, self).getAircraftState(aircraft,
+                                                         timestamp,
+                                                         data)
+        state.landingLightsOn = None
+        state.nav2 = None
+
+        return state
 
 #------------------------------------------------------------------------------
@@ -1881 +1914 @@
 AircraftModel.registerSpecial(PMDGBoeing737NGModel)
 AircraftModel.registerSpecial(DreamwingsDH8DModel)
-
-#------------------------------------------------------------------------------
+AircraftModel.registerSpecial(DAF70Model)
+
+#------------------------------------------------------------------------------

src/mlx/gui/monitor.py

@@ -191 +191 @@
 
         self.add(alignment)
+
+        self._previousState = None
 
         self.setData()
@@ -249 +251 @@
             self._antiCollisionLightsOn.set_sensitive(False)
             self._strobeLightsOn.set_sensitive(False)
+            self._landingLightsOn.set_text("LANDING")
             self._landingLightsOn.set_sensitive(False)
             self._pitotHeatOn.set_sensitive(False)
@@ -285 +288 @@
             self._altimeter.set_text("%.0f" % (aircraftState.altimeter,))
             self._squawk.set_text(aircraftState.squawk)
-            self._nav1.set_text(aircraftState.nav1)
-            self._nav2.set_text(aircraftState.nav2)
+            self._nav1.set_text("-" if aircraftState.nav1 is None else aircraftState.nav1)
+            self._nav2.set_text("-" if aircraftState.nav2 is None else aircraftState.nav2)
 
             fuelStr = ""
@@ -317 +320 @@
             self._antiCollisionLightsOn.set_sensitive(aircraftState.antiCollisionLightsOn)
             self._strobeLightsOn.set_sensitive(aircraftState.strobeLightsOn)
-            self._landingLightsOn.set_sensitive(aircraftState.landingLightsOn)
+
+            if self._previousState is None or \
+               ((self._previousState.landingLightsOn is None)!=
+                (aircraftState.landingLightsOn is None)):
+                if aircraftState.landingLightsOn is None:
+                    self._landingLightsOn.set_markup('<span strikethrough="true">LANDING</span>')
+                else:
+                    self._landingLightsOn.set_text("LANDING")
+            self._landingLightsOn.set_sensitive(aircraftState.landingLightsOn is True)
+            
             self._pitotHeatOn.set_sensitive(aircraftState.pitotHeatOn)
             self._parking.set_sensitive(aircraftState.parking)

src/mlx/pyuipc_sim.py

@@ -1330 +1330 @@
     def do_set(self, args):
         """Handle the set command."""
-        arguments = args.split()
+        arguments = []
+        inWord = False
+        inQuote = False
+        word = ""
+        for c in args:
+            if c.isspace() and not inQuote:
+                if inWord:
+                    arguments.append(word)
+                    word = ""
+                    inWord = False
+            elif c=='"':
+                inQuote = not inQuote
+            else:
+                inWord = True
+                word += c
+
+        if inWord:
+            arguments.append(word)
+            
         names = []
         data = []