Changeset 635:717c097e0b12 for src/mlx/checks.py

Timestamp:

05/10/15 06:57:21 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The AGL altitude values are logged with aircraft type-specific units (re #264)

File:

• src/mlx/checks.py (modified) (3 diffs)

src/mlx/checks.py

@@ -185 +185 @@
            flight.stage in [const.STAGE_TAKEOFF, const.STAGE_CLIMB]:
             logger.message(state.timestamp,
-                           "Initial climb speed: %.0f %s - %.0f ft AGL" % \
+                           "Initial climb speed: %.0f %s - %.0f %s AGL" % \
                            (flight.speedFromKnots(state.ias),
                             flight.getEnglishSpeedUnit(),
-                            state.radioAltitude))
+                            flight.aglFromFeet(state.radioAltitude),
+                            flight.getEnglishAGLUnit()))
             self._logged = True
 
@@ -697 +698 @@
         speed = logState.groundSpeed if logState.groundSpeed<80.0 \
                 else logState.ias
-        message = "Flaps %.0f - %.0f %s, %.0f ft AGL, %.0f ft AMSL" % \
+        message = "Flaps %.0f - %.0f %s, %.0f %s AGL, %.0f ft AMSL" % \
                (logState.flapsSet, flight.speedFromKnots(speed),
-                flight.getEnglishSpeedUnit(), logState.radioAltitude,
+                flight.getEnglishSpeedUnit(),
+                flight.aglFromFeet(logState.radioAltitude),
+                flight.getEnglishAGLUnit(),
                 logState.altitude)
 
@@ -715 +718 @@
     def _getMessage(self, flight, state, forced):
         """Get the message to log on a change."""
-        return "Gears SET to %s at %.0f %s, %.0f ft, %.0f ft AGL" % \
+        return "Gears SET to %s at %.0f %s, %.0f ft, %.0f %s AGL" % \
             ("DOWN" if state.gearControlDown else "UP",
              flight.speedFromKnots(state.ias),
              flight.getEnglishSpeedUnit(),
-             state.altitude, state.radioAltitude)
+             state.altitude,
+             flight.aglFromFeet(state.radioAltitude),
+             flight.getEnglishAGLUnit())
 
 #---------------------------------------------------------------------------------------