Changeset 525:02437e74e7ca

Timestamp:

06/29/13 11:30:39 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The AGL values are logged for gear movements and flap extension during descent and landing (re #206)

Files:

• src/mlx/checks.py (modified) (2 diffs)
• test/test1.txt (modified) (3 diffs)

src/mlx/checks.py

@@ -663 +663 @@
         speed = logState.groundSpeed if logState.groundSpeed<80.0 \
                 else logState.ias
-        return "Flaps %.0f - %.0f %s" % \
+        message = "Flaps %.0f - %.0f %s" % \
                (logState.flapsSet, flight.speedFromKnots(speed),
                 flight.getEnglishSpeedUnit())
+
+        if flight.stage in [const.STAGE_DESCENT, const.STAGE_LANDING]:
+            message += ", %.0f ft AGL" % (logState.radioAltitude,)
+
+        return message
 
 #---------------------------------------------------------------------------------------
@@ -678 +683 @@
     def _getMessage(self, flight, state, forced):
         """Get the message to log on a change."""
-        return "Gears SET to %s at %.0f %s, %.0f feet" % \
+        return "Gears SET to %s at %.0f %s, %.0f ft, %.0f ft AGL" % \
             ("DOWN" if state.gearControlDown else "UP",
              flight.speedFromKnots(state.ias),
-             flight.getEnglishSpeedUnit(), state.altitude)
+             flight.getEnglishSpeedUnit(),
+             state.altitude, state.radioAltitude)
 
 #---------------------------------------------------------------------------------------

test/test1.txt

@@ -8 +8 @@
 set lights=1
 set noseGear=100
+set gearControl=100
 set flapsControl=0
 set zfw=46741 hour=7 min=50
@@ -43 +44 @@
 set altitude=600
 
+set gearControl=0
 set noseGear=0
 set altitude=2000
@@ -69 +71 @@
 set radioAltitude=3200
 set radioAltitude=1100
+set gearControl=100
 set noseGear=100
 set radioAltitude=50