Changeset 150:0a6ffbd72d7e

Timestamp:

05/05/12 11:00:28 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Updated the fuel logging to the new order

File:

• src/mlx/acft.py (modified) (8 diffs)

src/mlx/acft.py

@@ -351 +351 @@
         self.logger.message(aircraftState.timestamp,
                             "Fuel: left=%.0f kg - centre=%.0f kg - right=%.0f kg" % \
-                            (aircraftState.fuel[1], aircraftState.fuel[0],
+                            (aircraftState.fuel[0], aircraftState.fuel[1],
                              aircraftState.fuel[2]))
         self.logger.message(aircraftState.timestamp,
@@ -457 +457 @@
         """Log the amount of fuel"""
         self.logger.message(aircraftState.timestamp,
-                            "Fuel: left=%.0f kg - centre=%.0f kg - right=%.0f kg" % \
-                            (aircraftState.fuel[1], aircraftState.fuel[0],
-                             aircraftState.fuel[2]))
+                            "Fuel: left=%.0f kg - right=%.0f kg" % \
+                            (aircraftState.fuel[0], aircraftState.fuel[1]))
         self.logger.message(aircraftState.timestamp,
                             "Total fuel: %.0f kg" % (sum(aircraftState.fuel),))
@@ -490 +489 @@
         self.logger.message(aircraftState.timestamp,
                             "Fuel: left=%.0f kg - centre=%.0f kg - right=%.0f kg" % \
-                            (aircraftState.fuel[1], aircraftState.fuel[0],
+                            (aircraftState.fuel[0], aircraftState.fuel[1],
                              aircraftState.fuel[2]))
         self.logger.message(aircraftState.timestamp,
@@ -546 +545 @@
         self.logger.message(aircraftState.timestamp,
                             "Fuel: left=%.0f kg - centre=%.0f kg - right=%.0f kg" % \
-                            (aircraftState.fuel[1], aircraftState.fuel[0],
+                            (aircraftState.fuel[0], aircraftState.fuel[1],
                              aircraftState.fuel[2]))
         self.logger.message(aircraftState.timestamp,
@@ -581 +580 @@
         self.logger.message(aircraftState.timestamp,
                             "Fuel: left=%.0f kg - centre=%.0f kg - right=%.0f kg" % \
-                            (aircraftState.fuel[1], aircraftState.fuel[0],
+                            (aircraftState.fuel[0], aircraftState.fuel[1],
                              aircraftState.fuel[2]))
         self.logger.message(aircraftState.timestamp,
@@ -622 +621 @@
         self.logger.message(aircraftState.timestamp,
                             "Fuel: left aux=%.0f kg - left=%.0f kg - right=%.0f kg - right aux=%.0f kg" % \
-                            (aircraftState.fuel[2], aircraftState.fuel[0],
-                             aircraftState.fuel[1], aircraftState.fuel[3]))
+                            (aircraftState.fuel[0], aircraftState.fuel[1],
+                             aircraftState.fuel[2], aircraftState.fuel[3]))
         self.logger.message(aircraftState.timestamp,
                             "Total fuel: %.0f kg" % (sum(aircraftState.fuel),))
@@ -659 +658 @@
         self.logger.message(aircraftState.timestamp,
                             "Fuel: left aux=%.0f kg - left tip=%.0f kg - centre= %.0f kg - right tip=%.0f kg - right aux=%.0f kg - external 1=%.0f kg - external 2=%.0f kg" % \
-                            (aircraftState.fuel[2], aircraftState.fuel[1],
-                             aircraftState.fuel[0], 
-                             aircraftState.fuel[3], aircraftState.fuel[4],
+                            (aircraftState.fuel[1], aircraftState.fuel[0],
+                             aircraftState.fuel[2], 
+                             aircraftState.fuel[4], aircraftState.fuel[3],
                              aircraftState.fuel[5], aircraftState.fuel[6]))
         self.logger.message(aircraftState.timestamp,
@@ -695 +694 @@
         self.logger.message(aircraftState.timestamp,
                             "Fuel: left aux=%.0f kg - left=%.0f kg - centre=%.0f kg - centre 2=%.0f kg - right=%.0f kg - right aux=%.0f kg" % \
-                            (aircraftState.fuel[4], aircraftState.fuel[1],
-                             aircraftState.fuel[0], aircraftState.fuel[3], 
-                             aircraftState.fuel[2], aircraftState.fuel[5]))
+                            (aircraftState.fuel[0], aircraftState.fuel[1],
+                             aircraftState.fuel[2], aircraftState.fuel[3], 
+                             aircraftState.fuel[4], aircraftState.fuel[5]))
         self.logger.message(aircraftState.timestamp,
                             "Total fuel: %.0f kg" % (sum(aircraftState.fuel),))