Changeset 420:fc063b7b571e

Timestamp:

02/10/13 16:54:52 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

xplane

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Implemented the most important parts of X-Plane support

Location:

src/mlx

Files:

• checks.py (modified) (2 diffs)
• fs.py (modified) (2 diffs)
• gui/monitor.py (modified) (1 diff)
• xplane.py (added)

src/mlx/checks.py

@@ -954 +954 @@
         """Check if the fault condition holds."""
         if flight.stage==const.STAGE_CRUISE:
-            bankLimit = 30
+            bankLimit = 32
         elif flight.stage in [const.STAGE_TAKEOFF, const.STAGE_CLIMB,
                               const.STAGE_DESCENT, const.STAGE_LANDING]:
@@ -965 +965 @@
     def logFault(self, flight, aircraft, logger, oldState, state):
         """Log the fault."""
+        message = "Bank too steep (%.1f)" % (state.bank,)
         flight.handleFault(BankChecker, state.timestamp,
-                           FaultChecker._appendDuring(flight, "Bank too steep"),
+                           FaultChecker._appendDuring(flight, message),
                            2)
 

src/mlx/fs.py

@@ -3 +3 @@
 from sound import startSound
 
-import fsuipc
+import os
+
+if os.name=="nt" or "FORCE_PYUIPC_SIM" in os.environ:
+    import fsuipc as sim
+else:
+    import xplane as sim
+
 import threading
 import time
@@ -58 +64 @@
     assert type in [const.SIM_MSFS9, const.SIM_MSFSX], \
            "Only MS Flight Simulator 2004 and X are supported"
-    return fsuipc.Simulator(connectionListener, connectAttempts = 3)
+    return sim.Simulator(connectionListener, connectAttempts = 3)
 
 #-------------------------------------------------------------------------------

src/mlx/gui/monitor.py

@@ -386 +386 @@
             self._gearControlDown.set_sensitive(aircraftState.gearControlDown)
             self._gearsDown.set_sensitive(aircraftState.gearsDown)
-            self._spoilersArmed.set_sensitive(aircraftState.spoilersArmed)
+            self._spoilersArmed.set_sensitive(aircraftState.spoilersArmed is True)
             self._spoilersExtension.set_text("%.0f" % (aircraftState.spoilersExtension,))
             self._windSpeed.set_text("%.0f" % (aircraftState.windSpeed,))