Changeset 26:86eae254f951

Timestamp:

02/19/12 15:01:54 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Modified some checks to work with the Tupolev aircraft

Files:

• .hgignore (modified) (1 diff)
• src/checks.py (modified) (2 diffs)
• src/fsuipc.py (modified) (3 diffs)
• src/mlx.py (modified) (2 diffs)

.hgignore

@@ -4 +4 @@
 dist/.+
 build/.+
+mlx-common.nsh

src/checks.py

@@ -476 +476 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
+        isTupolev = aircraft.type in [const.AIRCRAFT_T134, 
+                                      const.AIRCRAFT_T154]
         return (flight.stage!=const.STAGE_PARKING or \
                 not flight.options.fs2Crew) and \
                 not state.antiCollisionLightsOn and \
-                max(state.n1)>5
+                ((isTupolev and max(state.n1[1:])>5) or \
+                 (not isTupolev and max(state.n1)>5))
 
     def logFault(self, flight, aircraft, logger, oldState, state):
@@ -835 +838 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return (flight.stage==const.STAGE_BOARDING and \
-                state.strobeLightsOn and state.onTheGround) or \
-               (flight.stage==const.STAGE_TAKEOFF and \
-                not state.strobeLightsOn and not state.gearsDown) or \
-               (flight.stage in [const.STAGE_CLIMB, const.STAGE_CRUISE,
-                                 const.STAGE_DESCENT] and \
-                not state.strobeLightsOn and not state.onTheGround) or \
-               (flight.stage==const.STAGE_PARKING and \
-                state.strobeLightsOn and state.onTheGround)
+        if aircraft.type in [const.AIRCRAFT_T134,
+                             const.AIRCRAFT_T154,
+                             const.AIRCRAFT_YK40]:
+            return False
+        else:
+            return (flight.stage==const.STAGE_BOARDING and \
+                    state.strobeLightsOn and state.onTheGround) or \
+                   (flight.stage==const.STAGE_TAKEOFF and \
+                    not state.strobeLightsOn and not state.gearsDown) or \
+                   (flight.stage in [const.STAGE_CLIMB, const.STAGE_CRUISE,
+                                     const.STAGE_DESCENT] and \
+                   not state.strobeLightsOn and not state.onTheGround) or \
+                   (flight.stage==const.STAGE_PARKING and \
+                    state.strobeLightsOn and state.onTheGround)
                
     def logFault(self, flight, aircraft, logger, oldState, state):

src/fsuipc.py

@@ -12 +12 @@
 import calendar
 import sys
+import codecs
 
 if os.name == "nt":
@@ -474 +475 @@
         self._flareStart = None
         self._flareStartFS = None
-        
+    
+        self._latin1decoder = codecs.getdecoder("iso-8859-1")
+    
     def connect(self, aircraft):
         """Initiate a connection to the simulator."""
@@ -592 +595 @@
         if needNew:
             self._setAircraftModel(AircraftModel.create(self._aircraft, aircraftName))
-        
-        self._aircraft.modelChanged(timestamp, name, self._aircraftModel.name)        
+ 
+        
+        self._aircraft.modelChanged(timestamp, self._latin1decoder(name), 
+                                    self._aircraftModel.name)        
 
         return needNew

src/mlx.py

@@ -392 +392 @@
         table.attach(self._nav2, 11, 12, 3, 4)
 
-        (label, self._fuel) = self._createLabeledEntry("Fuel:", 20, xalign = 0.0)
+        (label, self._fuel) = self._createLabeledEntry("Fuel:", 40, xalign = 0.0)
         table.attach(label, 0, 1, 4, 5)
         table.attach(self._fuel, 1, 4, 4, 5)
@@ -521 +521 @@
             for fuel in aircraftState.fuel:
                 if fuelStr: fuelStr += ", "
-                fuelStr += "%.0f" % (fuel,)
+                fuelStr += "%.0f" % (fuel,)                
             self._fuel.set_text(fuelStr)