Changeset 765:fc1433d4854f

Timestamp:

02/21/16 14:51:04 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

version_0.37

hg-Phase:

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

hg-rebase_source:

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

Message:

The N1 values of the Majestic Dash-8 Q400 are invalidated (re #292)

Location:

src/mlx

Files:

• fs.py (modified) (1 diff)
• fsuipc.py (modified) (1 diff)
• gui/monitor.py (modified) (1 diff)

src/mlx/fs.py

@@ -212 +212 @@
     - n1[]: the N1 values of the turbine engines (array of floats
     of as many items as the number of engines, present only for aircraft with
-    turbines, for other aircraft it is None)
+    turbines, for other aircraft it is None). If the aircraft has turbines, but
+    the N1 values cannot be read reliably, the array contains Nones.
     - rpm[]: the RPM values of the piston engines (array of floats
     of as many items as the number of engines, present only for aircraft with

src/mlx/fsuipc.py

@@ -1849 +1849 @@
         state.gearsDown = state.gearControlDown
 
+        # Th N1 values cannot be read either
+        state.n1 = [None, None]
+
         return state
 

src/mlx/gui/monitor.py

@@ -378 +378 @@
                 for n1 in aircraftState.n1:
                     if n1Str: n1Str += ", "
-                    n1Str += "%.0f" % (n1,)
+                    if n1 is None:
+                        n1Str += "?"
+                    else:
+                        n1Str += "%.0f" % (n1,)
             elif aircraftState.rpm is not None:
                 n1Str = ""