Changeset 366:21db3f9653ce

Timestamp:

12/15/12 16:50:01 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Added support for the ILS frequency, and made use of it in case of the DA F70 model (#115)

Location:

src/mlx

Files:

• acft.py (modified) (2 diffs)
• checks.py (modified) (1 diff)
• const.py (modified) (1 diff)
• fs.py (modified) (1 diff)
• fsuipc.py (modified) (3 diffs)

src/mlx/acft.py

@@ -86 +86 @@
         self._checkers.append(checks.AltimeterLogger())
 
+        self._ilsLogger = checks.ILSLogger()
+        self._checkers.append(self._ilsLogger)
         self._nav1Logger = checks.NAV1Logger()
         self._checkers.append(self._nav1Logger)
@@ -455 +457 @@
         logger = flight.logger
 
+        self._ilsLogger.forceLog(flight, logger, aircraftState)
         self._nav1Logger.forceLog(flight, logger, aircraftState)
         self._nav2Logger.forceLog(flight, logger, aircraftState)

src/mlx/checks.py

@@ -517 +517 @@
 #---------------------------------------------------------------------------------------
 
+class ILSLogger(NAVLogger):
+    """Logger for the ILS radio setting."""
+    def __init__(self):
+        """Construct the logger."""
+        super(ILSLogger, self).__init__("ils", "ILS")
+
+#---------------------------------------------------------------------------------------
+
 class NAV1Logger(NAVLogger):
     """Logger for the NAV1 radio setting."""

src/mlx/const.py

@@ -11 +11 @@
 
 ## The version of the program
-VERSION="0.11"
+VERSION="0.12"
 
 #-------------------------------------------------------------------------------

src/mlx/fs.py

@@ -229 +229 @@
     (float)
     - altimeter: the altimeter setting in hPa (float)
+    - ils: the frequency of the ILS radio in MHz (string). Can be None, if
+    the frequency is unreliable or meaningless.
+    - ols_obs: the OBS setting of the ILS radio in degrees (int). Can be None, if
+    the value is unreliable or meaningless.
+    - ils_manual: a boolean indicating if the ILS radio is on manual control
     - nav1: the frequency of the NAV1 radio in MHz (string). Can be None, if
     the frequency is unreliable or meaningless.

src/mlx/fsuipc.py

@@ -1371 +1371 @@
         state.altimeter = data[self._monidx_altimeter] / 16.0
 
+        state.ils = None
+        state.ils_obs = None
+        state.ils_manual = False
         state.nav1 = AircraftModel.convertFrequency(data[self._monidx_nav1])
         state.nav1_obs = data[self._monidx_nav1_obs]
@@ -1383 +1386 @@
             AircraftModel.convertADFFrequency(data[self._monidx_adf2_main],
                                               data[self._monidx_adf2_ext])
+
         state.squawk = AircraftModel.convertBCD(data[self._monidx_squawk], 4)
 
@@ -1792 +1796 @@
         state.navLightsOn = None
         state.landingLightsOn = None
-        state.nav2_manual = aircraft.flight.stage!=const.STAGE_CRUISE
-        self.autoXPDR = True
+
+        state.ils = state.nav1
+        state.ils_obs = state.nav1_obs
+        state.ils_manual = state.nav1_manual
+
+        state.nav1 = state.nav2
+        state.nav1_obs = state.nav2_obs
+        state.nav1_manual = aircraft.flight.stage!=const.STAGE_CRUISE
+
+        state.nav2 = None
+        state.nav2_obs = None
+        state.nav2_manual = False
+
+        state.autoXPDR = True
 
         return state