Changeset 16:eb7e301a7d8b

Timestamp:

02/11/12 19:54:41 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added a model handler for the Dreamwings Dash-8 and some other minor fixes

File:

• src/fsuipc.py (modified) (14 diffs)

src/fsuipc.py

@@ -276 +276 @@
         while self._connectionRequested:
             try:
-                pyuipc.open(pyuipc.SIM_FS2K4)
+                pyuipc.open(pyuipc.SIM_ANY)
                 description = "(FSUIPC version: 0x%04x, library version: 0x%04x, FS version: %d)" % \
                     (pyuipc.fsuipc_version, pyuipc.lib_version, 
@@ -326 +326 @@
         
         Returns what the request's process() function returned or None if
-        reconnection failed."""
-        
+        reconnection failed."""        
         self._requestCondition.release()
 
@@ -393 +392 @@
                    (0x0580, "d") ]           # Heading
 
-    def __init__(self, connectionListener, aircraft):
+    def __init__(self, connectionListener):
         """Construct the simulator.
         
@@ -414 +413 @@
          from the simulator or was calculated by the adapter. The other data
          are self-explanatory and expressed in their 'natural' units."""
-        self._aircraft = aircraft
+        self._aircraft = None
 
         self._handler = Handler(connectionListener)
@@ -432 +431 @@
         self._flareStartFS = None
         
-    def connect(self):
+    def connect(self, aircraft):
         """Initiate a connection to the simulator."""
+        self._aircraft = aircraft
+        self._aircraftName = None
+        self._aircraftModel = None
         self._handler.connect()
         self._startDefaultNormal()
@@ -488 +490 @@
         self._handler.clearPeriodic(self._normalRequestID)
         self._normalRequestID = None
+        self._monitoring = False
 
     def _handleNormal(self, data, extra):
@@ -506 +509 @@
         
         if self._monitoringRequested and not self._monitoring:
-            self._monitoring = True
             self._stopNormal()
             self._startMonitoring()
         elif self._monitoring and not self._monitoringRequested:
-            self._monitoring = False
             self._stopNormal()
             self._startDefaultNormal()
@@ -559 +560 @@
     def _startMonitoring(self):
         """Start monitoring with the current aircraft model."""
-        assert self._monitoring
-
         data = Simulator.normalData[:]
         self._aircraftModel.addMonitoringData(data)
@@ -567 +566 @@
             self._handler.requestPeriodicRead(1.0, data, 
                                               self._handleNormal)
+        self._monitoring = True
 
     def _addFlareRate(self, data):
@@ -802 +802 @@
         
         flapsLeft = data[self._monidx_flapsLeft]
-        flapsIndex = flapsLeft / flapsIncrement
-        state.flaps = self._flapsNotches[flapsIndex]
-        if flapsIndex != numNotchesM1:
-            thisNotch = flapsIndex * flapsIncrement
-            nextNotch = thisNotch + flapsIncrement
-            
-            state.flaps += (self._flapsNotches[flapsIndex+1] - state.flaps) * \
-                (flapsLeft - thisNotch) / (nextNotch - thisNotch)
+        state.flaps = self._flapsNotches[-1]*flapsLeft/16383.0
         
         lights = data[self._monidx_lights]
@@ -891 +884 @@
             self._engineStartIndex = len(data)
             for i in range(0, self._numEngines):
-                self._addOffsetWithIndexMember(data, 0x0898 + i * 0x98, "u")  # N1
-                self._addOffsetWithIndexMember(data, 0x088c + i * 0x98, "d")  # throttle lever
+                self._addOffsetWithIndexMember(data, 0x0898 + i * 0x98, "H")  # N1
+                self._addOffsetWithIndexMember(data, 0x088c + i * 0x98, "h")  # throttle lever
         
     def getAircraftState(self, aircraft, timestamp, data):
@@ -1011 +1004 @@
 
 class DH8DModel(GenericAircraftModel):
-    """Generic model for the Boeing 737 NG aircraft."""
+    """Generic model for the Bombardier  Dash 8-Q400 aircraft."""
     def __init__(self):
         """Construct the model."""
@@ -1022 +1015 @@
     def name(self):
         """Get the name for this aircraft model."""
-        return "FSUIPC/Generic Bombardier Dash-8 Q400"
-
+        return "FSUIPC/Generic Bombardier Dash 8-Q400"
+
+#------------------------------------------------------------------------------
+
+class DreamwingsDH8DModel(DH8DModel):
+    """Model handler for the Dreamwings Dash 8-Q400."""
+    @staticmethod
+    def doesHandle(aircraft, (name, airPath)):
+        """Determine if this model handler handles the aircraft with the given
+        name."""
+        return aircraft.type==const.AIRCRAFT_DH8D and \
+            (name.find("Dreamwings")!=-1 or airPath.find("Dreamwings")!=-1) and \
+            (name.find("Dash")!=-1 or airPath.find("Dash")!=-1) and \
+            (name.find("Q400")!=-1 or airPath.find("Q400")!=-1) and \
+            airPath.find("Dash8Q400")!=-1
+
+    @property
+    def name(self):
+        """Get the name for this aircraft model."""
+        return "FSUIPC/Dreamwings Bombardier Dash 8-Q400"
+
+    def getAircraftState(self, aircraft, timestamp, data):
+        """Get the aircraft state.
+
+        Get it from the parent, and then invert the pitot heat state."""
+        state = super(DreamwingsDH8DModel, self).getAircraftState(aircraft,
+                                                                  timestamp,
+                                                                  data)
+        state.pitotHeatOn = not state.pitotHeatOn
+
+        return state
 #------------------------------------------------------------------------------
 
@@ -1153 +1175 @@
 
 AircraftModel.registerSpecial(PMDGBoeing737NGModel)
-
-#------------------------------------------------------------------------------
-
+AircraftModel.registerSpecial(DreamwingsDH8DModel)
+
+#------------------------------------------------------------------------------