Merge lp:~pwlars/uci-phone-masher/debug-memory-controller into lp:uci-phone-masher

[Paul Larson]

These are just some useful debugging messages to use when messing with the memory controller, which is only used for testing, as it doesn't even try to use servos if they are connected

[Paul Larson (pwlars)]

review: Approve

=== modified file 'uci_phone_masher/controller.py'
--- uci_phone_masher/controller.py	2016-04-21 19:16:40 +0000
+++ uci_phone_masher/controller.py	2016-04-25 08:10:53 +0000
@@ -24,6 +24,9 @@
     'PhoneControllerMemory',
 ]
 
+# Default pwm for a "pressed" button state - use offset to adjust this
+DEFAULT_PWM_PRESS = 193
+
 
 class PhoneControllerBase(object):
 
@@ -77,7 +80,8 @@
 
     def press(self, channel):
         super(PhoneControllerI2C, self).press(channel)
-        self.pwm.setPWM(channel, 0, 193)
+        offset = self._model.get_button_offset(channel)
+        self.pwm.setPWM(channel, 0, DEFAULT_PWM_PRESS + offset)
 
     def unpress(self, channel):
         super(PhoneControllerI2C, self).unpress(channel)
@@ -95,3 +99,12 @@
     Used when we don't have i2c available, or we're testing.
 
     """
+    def set_offset(self, button_num, offset):
+        super(PhoneControllerMemory, self).set_offset(button_num, offset)
+        print("DEBUG: offset set to {}".format(
+            self._model.get_button_offset(button_num)))
+
+    def press(self, channel):
+        super(PhoneControllerMemory, self).press(channel)
+        print("DEBUG: Pressing button - PWM set to {}".format(
+            DEFAULT_PWM_PRESS+self._model.get_button_offset(channel)))