Changeset 336:2fa4d33cd52b

Timestamp:

11/13/12 18:42:21 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

#138: added support for the AP-related offsets in the simulator

File:

• src/mlx/pyuipc_sim.py (modified) (6 diffs)

src/mlx/pyuipc_sim.py

@@ -315 +315 @@
 
         self.xpdrC = False
+
+        self.apMaster = False
+        self.apHeadingHold = False
+        self.apHeading = 124
+        self.apAltitudeHold = False
+        self.apAltitude = 7000
 
     def read(self, offset, type):
@@ -390 +396 @@
         elif offset==0x0628:       # Replay
             return 1 if self.replay else 0
+        elif offset==0x07bc:       # AP Master switch
+            return 1 if self.apMaster else 0
+        elif offset==0x07c8:       # AP heading hold
+            return 1 if self.apHeadingHold else 0
+        elif offset==0x07cc:       # AP heading
+            return int(self.apHeading * 65536.0 / 360.0)
+        elif offset==0x07d0:       # AP altitude hold
+            return 1 if self.apAltitudeHold else 0
+        elif offset==0x07d4:       # AP altitude
+            return int(self.apAltitude * const.FEETTOMETRES * 65536.0)
         elif offset==0x088c:       # Engine #1 throttle
             return self._getThrottle(self.ENGINE_1)
@@ -634 +650 @@
         elif offset==0x0628:       # Replay
             self.replay = value!=0
+        elif offset==0x07bc:       # AP Master switch
+            self.apMaster = value!=0
+        elif offset==0x07c8:       # AP heading hold
+            self.apHeadingHold = value!=0
+        elif offset==0x07cc:       # AP heading
+            self.apHeading = value * 360.0 / 65536.0
+        elif offset==0x07d0:       # AP altitude hold
+            self.apAltitudeHold = value!=0
+        elif offset==0x07d4:       # AP altitude
+            self.apAltitude = value / const.FEETTOMETRES / 65536.0
         elif offset==0x088c:       # Engine #1 throttle
             self._setThrottle(self.ENGINE_1, value)
@@ -1057 +1083 @@
     def pyuipc2degree(value):
         """Convert the given PyUIPC value into a degree."""
-        return valie * 360.0 / 65536.0 / 65536.0
+        return value * 360.0 / 65536.0 / 65536.0
 
     @staticmethod
@@ -1088 +1114 @@
         """Convert the given PyUIPC value into a throttle value."""
         return value * 100.0 / 16384.0
+
+    @staticmethod
+    def heading2pyuipc(heading):
+        """Convert the given heading (as a string) into a PyUIPC value."""
+        return int(float(heading) * 65536.0 / 360.0)
+
+    @staticmethod
+    def pyuipc2heading(value):
+        """Convert the given PyUIPC value into a heading."""
+        return value * 360.0 / 65536.0
+
+    @staticmethod
+    def altitude2pyuipc(altitude):
+        """Convert the given altitude (as a string) into a PyUIPC value."""
+        return int(float(altitude) * const.FEETTOMETRES * 65536.0)
+
+    @staticmethod
+    def pyuipc2altitude(value):
+        """Convert the given PyUIPC value into an altitude."""
+        return value / const.FEETTOMETRES / 65536.0
 
     def __init__(self):
@@ -1381 +1427 @@
                                         lambda word: int(word))
 
+        self._valueHandlers["apMaster"] = ([(0x07bc, "u")],
+                                           CLI.bool2str, CLI.str2bool)
+        self._valueHandlers["apHeadingHold"] = ([(0x07c8, "u")],
+                                                CLI.bool2str, CLI.str2bool)
+        self._valueHandlers["apHeading"] = ([(0x07cc, "H")],
+                                            CLI.pyuipc2heading,
+                                            CLI.heading2pyuipc)
+        self._valueHandlers["apAltitudeHold"] = ([(0x07d0, "u")],
+                                                 CLI.bool2str, CLI.str2bool)
+        self._valueHandlers["apAltitude"] = ([(0x07d4, "H")],
+                                             CLI.pyuipc2altitude,
+                                             CLI.altitude2pyuipc)
+
     def default(self, line):
         """Handle unhandle commands."""