Changeset 6:db83d19666dc

Timestamp:

01/31/12 18:06:30 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

A bit of work on the constants

Location:

src

Files:

• const.py (modified) (1 diff)
• fs.py (modified) (1 diff)
• fsuipc.py (modified) (3 diffs)
• test.py (modified) (1 diff)
• util.py (modified) (1 diff)

src/const.py

@@ -3 +3 @@
 #-------------------------------------------------------------------------------
 
+# The ratio between lbs and kg
+LBSTOKG=0.4536
+
+# The ratio between feet and metre
+FEETTOMETRES=0.3048
+
+#-------------------------------------------------------------------------------
+
 # Flight simulator type: MS Flight Simulator 2004
-TYPE_MSFS9 = 1
+SIM_MSFS9 = 1
 
 # Flight simulator type: MS Flight Simulator X
-TYPE_MSFSX = 2
+SIM_MSFSX = 2
 
 # Flight simulator type: X-Plane 9
-TYPE_XPLANE9 = 3
+SIM_XPLANE9 = 3
 
 # Flight simulator type: X-Plane 10
-TYPE_XPLANE10 = 4
+SIM_XPLANE10 = 4
 
 #-------------------------------------------------------------------------------

src/fs.py

@@ -32 +32 @@
     FIXME: add info
     """
-    assert type==const.TYPE_MSFS9, "Only MS Flight Simulator 2004 is supported"
+    assert type==const.SIM_MSFS9, "Only MS Flight Simulator 2004 is supported"
     import fsuipc
     return fsuipc.Simulator(connectionListener, aircraft)

src/fsuipc.py

@@ -254 +254 @@
                      pyuipc.fs_version)
                 Handler._callSafe(lambda:     
-                                  self._connectionListener.connected(const.TYPE_MSFS9, 
+                                  self._connectionListener.connected(const.SIM_MSFS9, 
                                                                      description))
                 return True
@@ -578 +578 @@
         state.onTheGround = data[self._monidx_onTheGround]!=0
 
-        state.grossWeight = data[self._monidx_grossWeight] * util.LBSTOKG
+        state.grossWeight = data[self._monidx_grossWeight] * const.LBSTOKG
         
         state.heading = data[self._monidx_heading]*360.0/65536.0/65536.0
@@ -588 +588 @@
         state.ias = data[self._monidx_ias]/128.0
         state.groundSpeed = data[self._monidx_groundSpeed]* 3600.0/65536.0/1852.0
-        state.vs = data[self._monidx_vs]*60.0*3.28984/256.0
-
-        state.altitude = data[self._monidx_altitude]*3.28084/65536.0/65536.0
+        state.vs = data[self._monidx_vs]*60.0/const.FEETTOMETRES/256.0
+
+        state.altitude = data[self._monidx_altitude]/const.FEETTOMETRES/65536.0/65536.0
 
         state.gLoad = data[self._monidx_gLoad] / 625.0

src/test.py

@@ -10 +10 @@
 
 def main():
-    simulator = fs.createSimulator(const.TYPE_MSFS9, fs.ConnectionListener(),
+    simulator = fs.createSimulator(const.SIM_MSFS9, fs.ConnectionListener(),
                                    acft.Aircraft(const.AIRCRAFT_B737))
     simulator.connect()

src/util.py

@@ -1 +1 @@
 # Various utilities
 
-# The ratio between lbs and kg
-LBSTOKG=0.4536