Changeset 317:26cd9b16bf92 for src/mlx/fsuipc.py

Timestamp:

09/30/12 09:00:53 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added the logging of the ADF frequencies

File:

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

src/mlx/fsuipc.py

@@ -1178 +1178 @@
                       ("nav1", 0x0350, "H"),
                       ("nav2", 0x0352, "H"),
+                      ("adf1_main", 0x034c, "H"),
+                      ("adf1_ext", 0x0356, "H"),
+                      ("adf2_main", 0x02d4, "H"),
+                      ("adf2_ext", 0x02d6, "H"),
                       ("squawk", 0x0354, "H"),
                       ("windSpeed", 0x0e90, "H"),
@@ -1227 +1231 @@
         return "1" + bcd[0:2] + "." + bcd[2:4]
 
+    @staticmethod
+    def convertADFFrequency(main, ext):
+        """Convert the given ADF frequency data to a string."""
+        mainBCD = AircraftModel.convertBCD(main, 4)
+        extBCD = AircraftModel.convertBCD(ext, 4)
+
+        return (extBCD[1] if extBCD[1]!="0" else "") + \
+               mainBCD[1:] + "." + extBCD[3]
+    
     def __init__(self, flapsNotches):
         """Construct the aircraft model.
@@ -1350 +1363 @@
         state.nav1 = AircraftModel.convertFrequency(data[self._monidx_nav1])
         state.nav2 = AircraftModel.convertFrequency(data[self._monidx_nav2])
+        state.adf1 = \
+            AircraftModel.convertADFFrequency(data[self._monidx_adf1_main],
+                                              data[self._monidx_adf1_ext])
+        state.adf2 = \
+            AircraftModel.convertADFFrequency(data[self._monidx_adf2_main],
+                                              data[self._monidx_adf2_ext])
         state.squawk = AircraftModel.convertBCD(data[self._monidx_squawk], 4)