Merge lp:~pwlars/uci-phone-masher/set-offset into lp:uci-phone-masher

[Paul Larson]

Add a way to set the offset

This allows setting an "offset" which will later be used for making small adjustments. More patches are coming to actually use it, and load settings from a file, and other useful features. Just trying to break them up to make it easier.

[Paul Larson (pwlars)]

review: Approve

=== modified file 'uci_phone_masher/__init__.py'
--- uci_phone_masher/__init__.py	2015-03-31 14:17:43 +0000
+++ uci_phone_masher/__init__.py	2016-04-20 17:40:53 +0000
@@ -77,10 +77,7 @@
         button_states=controller.model.get_button_state(int(button_num)))
 
 
-def set_button(button_num):
-    if 'state' not in request.form:
-        raise errors.MissingParameter("state")
-    state = request.form['state'].lower()
+def set_button_state(button_num, state):
     controller = current_app.extensions['BUTTONCONTROLLER']
     if state == "on":
         controller.press(int(button_num))
@@ -90,6 +87,22 @@
         controller.calibrate(int(button_num))
     else:
         raise errors.BadStateName(state, ('on', 'off', 'calibrate'))
+
+
+def set_button_offset(button_num, offset):
+    controller = current_app.extensions['BUTTONCONTROLLER']
+    controller.set_offset(int(button_num), int(offset))
+
+
+def set_button(button_num):
+    if 'state' not in request.form and 'offset' not in request.form:
+        raise errors.MissingParameter("state or offset")
+    if 'state' in request.form:
+        state = request.form['state'].lower()
+        set_button_state(button_num, state)
+    if 'offset' in request.form:
+        offset = request.form['offset'].lower()
+        set_button_offset(button_num, offset)
     return get_button(button_num)
 
 

=== modified file 'uci_phone_masher/controller.py'
--- uci_phone_masher/controller.py	2015-04-01 13:32:32 +0000
+++ uci_phone_masher/controller.py	2016-04-20 17:40:53 +0000
@@ -44,6 +44,9 @@
     def calibrate(self, button_num):
         self._model = self._model.set_button_state(button_num, "calibrate")
 
+    def set_offset(self, button_num, offset):
+        self._model = self._model.set_button_offset(button_num, offset)
+
     @property
     def model(self):
         return self._model

=== modified file 'uci_phone_masher/model.py'
--- uci_phone_masher/model.py	2015-04-01 13:33:36 +0000
+++ uci_phone_masher/model.py	2016-04-20 17:40:53 +0000
@@ -33,12 +33,17 @@
 
     """
 
-    def __init__(self, initial_state=None):
+    def __init__(self, initial_state=None, initial_offset=None):
         if initial_state is None:
             self._buttons = {num: "off" for num in range(16)}
         else:
             self._buttons = initial_state
 
+        if initial_offset is None:
+            self._offset = {num: 0 for num in range(16)}
+        else:
+            self._offset = initial_offset
+
     @property
     def data(self):
         """Get a copy of the model's underlying data structure."""
@@ -56,8 +61,23 @@
             raise errors.BadButtonNumber(button_num)
 
         state_copy = self._buttons.copy()
+        offset_copy = self._offset.copy()
         state_copy[button_num] = state
-        return ButtonModel(state_copy)
+        return ButtonModel(state_copy, offset_copy)
+
+    def set_button_offset(self, button_num, offset):
+        """Modify the model by setting a button's offset.
+
+        Returns a copy of the modified model.
+
+        """
+        if not 0 <= button_num < len(self._buttons):
+            raise errors.BadButtonNumber(button_num)
+
+        state_copy = self._buttons.copy()
+        offset_copy = self._offset.copy()
+        offset_copy[button_num] = offset
+        return ButtonModel(state_copy, offset_copy)
 
     def get_button_state(self, button_num):
         """Get the state of a particular button."""
@@ -65,6 +85,12 @@
             raise errors.BadButtonNumber(button_num)
         return self._buttons[button_num]
 
+    def get_button_offset(self, button_num):
+        """Get the offset of a particular button."""
+        if not 0 <= button_num < len(self._buttons):
+            raise errors.BadButtonNumber(button_num)
+        return self._offset[button_num]
+
     def __eq__(self, other):
         return self._buttons == other._buttons