Changeset 263:7ee78a903649 for src/mlx/fsuipc.py

Timestamp:

06/28/12 17:24:45 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

RPM is handled properly and the fuel tanks of Li-2 match the simulator

File:

• src/mlx/fsuipc.py (modified) (3 diffs)

src/mlx/fsuipc.py

@@ -1388 +1388 @@
             self._addOffsetWithIndexMember(data, offset+4, "u")  # tank capacity
 
-        if self._isN1:
-            self._engineStartIndex = len(data)
-            for i in range(0, self._numEngines):
+        self._engineStartIndex = len(data)
+        for i in range(0, self._numEngines):
+            self._addOffsetWithIndexMember(data, 0x088c + i * 0x98, "h")  # throttle lever
+            if self._isN1:
                 self._addOffsetWithIndexMember(data, 0x2000 + i * 0x100, "f")  # N1
-                self._addOffsetWithIndexMember(data, 0x088c + i * 0x98, "h")  # throttle lever
+            else:
+                self._addOffsetWithIndexMember(data, 0x0898 + i * 0x98, "H")  # RPM
+                self._addOffsetWithIndexMember(data, 0x08c8 + i * 0x98, "H")  # RPM scaler
         
     def getAircraftState(self, aircraft, timestamp, data):
@@ -1410 +1413 @@
             state.fuel.append(fuel)
 
-        state.n1 = []
+
+        state.n1 = [] if self._isN1 else None
+        state.rpm = None if self._isN1 else []
+        itemsPerEngine = 2 if self._isN1 else 3
+        
         state.reverser = []
         for i in range(self._engineStartIndex,
-                       self._engineStartIndex + 2*self._numEngines, 2):
-            state.n1.append(data[i])
-            state.reverser.append(data[i+1]<0)
+                       self._engineStartIndex +
+                       itemsPerEngine*self._numEngines,
+                       itemsPerEngine):
+            state.reverser.append(data[i]<0)
+            if self._isN1:
+                state.n1.append(data[i+1])
+            else:
+                state.rpm.append(data[i+1] * data[i+2]/65536.0)
 
         return state
@@ -1605 +1617 @@
             __init__(flapsNotches = [0, 15, 30, 45],
                      fuelTanks = acft.DC3.fuelTanks,
-                     numEngines = 2)
+                     numEngines = 2, isN1 = False)
 
     @property
     def name(self):
         """Get the name for this aircraft model."""
-        return "FSUIPC/Generic Lisunov Li-2"
+        return "FSUIPC/Generic Lisunov Li-2 (DC-3)"
 
 #------------------------------------------------------------------------------