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

[Paul Larson]

If you specify the path to a json file in UCI_PHONE_MASHER_CONFIG, it will load those config values and use them for offsets. You can export the dict you should use in the file using something like:
$ curl localhost:8000/button

The file should contain something like this:
{
    "0": 0,
    "1": 0,
    "2": 0,
    "3": 3,
    "4": 0,
    "5": 0,
    "6": 0,
    "7": 0,
    "8": 0,
    "9": 0,
    "10": 88,
    "11": 0,
    "12": 0,
    "13": 0,
    "14": 0,
    "15": 0
}

[Paul Larson (pwlars)]

review: Approve

=== modified file 'uci_phone_masher/__init__.py'
--- uci_phone_masher/__init__.py	2016-04-21 19:16:40 +0000
+++ uci_phone_masher/__init__.py	2016-04-26 07:19:17 +0000
@@ -32,7 +32,7 @@
 from uci_phone_masher import errors
 
 
-def create_flask_app(controller_type=''):
+def create_flask_app(controller_type='', config_file=None):
     """Create the flask web application.
 
     Pass 'memory' as the controller_type if you want to force the use of a
@@ -60,9 +60,11 @@
         return response
 
     if controller_type == 'memory':
-        app.extensions['BUTTONCONTROLLER'] = PhoneControllerMemory()
+        app.extensions['BUTTONCONTROLLER'] = PhoneControllerMemory(
+            config_file=config_file)
     else:
-        app.extensions['BUTTONCONTROLLER'] = PhoneControllerI2C()
+        app.extensions['BUTTONCONTROLLER'] = PhoneControllerI2C(
+            config_file=config_file)
     return app
 
 
@@ -108,7 +110,8 @@
     return get_button(button_num)
 
 
+config_file = os.environ.get('UCI_PHONE_MASHER_CONFIG')
 if os.environ.get('UCI_PHONE_MASHER_CONTROLLER', '').lower() == 'memory':
-    app = create_flask_app(controller_type='memory')
+    app = create_flask_app(controller_type='memory', config_file=config_file)
 else:
-    app = create_flask_app()
+    app = create_flask_app(config_file=config_file)

=== modified file 'uci_phone_masher/controller.py'
--- uci_phone_masher/controller.py	2016-04-26 07:19:17 +0000
+++ uci_phone_masher/controller.py	2016-04-26 07:19:17 +0000
@@ -16,6 +16,8 @@
 #
 
 
+import json
+
 from uci_phone_masher.model import ButtonModel
 
 
@@ -35,8 +37,20 @@
 
     """
 
-    def __init__(self):
-        self._model = ButtonModel()
+    def __init__(self, config_file=None):
+        self.config_file = config_file
+        if config_file:
+            offset_config = self._load_config(config_file)
+        else:
+            offset_config = None
+        self._model = ButtonModel(initial_offset=offset_config)
+
+    def _load_config(self, config_file):
+        def str2int(x):
+            return {int(k): v for k, v in x.items()}
+
+        with open(config_file) as f:
+            return json.loads(f.read(), object_hook=str2int)
 
     def press(self, button_num):
         self._model = self._model.set_button_state(button_num, "on")
@@ -59,8 +73,8 @@
 
     """A controller that knows how to manipulate the servos."""
 
-    def __init__(self, debug=False):
-        super(PhoneControllerI2C, self).__init__()
+    def __init__(self, config_file=None, debug=False):
+        super(PhoneControllerI2C, self).__init__(config_file)
         #
         # Note: The PWM class tries to open the i2c device when it's
         # declared (ugh), so we need the local import here: