Resolve "Refactor UI files"

.coveragerc

@@ -2,7 +2,7 @@
 [run]
 branch = True
 source = adwin_control
-omit = servoController.py
+omit = run.py
 
 [paths]
 source =

doc/apidoc.rst

@@ -15,9 +15,9 @@ adwin\_control.Servo
     :members:
     :no-undoc-members:
 
-adwin\_control.servoController
-------------------------------
+adwin\_control.controller
+---------------------------
 
-.. automodule:: adwin_control.servoController
+.. automodule:: adwin_control.controller
     :members:
     :no-undoc-members:

docker-compose.yml

@@ -47,7 +47,7 @@ services:
         context: .
         cache_from:
           - lasnq/adwin_control
-    command: bash -c "rsync -ur /mnt/* /code/ && ipython3 `pwd`/src/adwin_control/servoController.py"
+    command: bash -c "rsync -ur /mnt/* /code/ && ipython3 `pwd`/src/adwin_control/run.py"
     environment:
       PYTHONPATH: "/code/src"
     volumes:

requirements.txt

@@ -31,3 +31,4 @@ pytest-cov
 jsonpickle
 websocket-client
 websockets
+gunicorn

setup.py

@@ -14,7 +14,7 @@ from setuptools import setup
 # Add here console scripts and other entry points in ini-style format
 entry_points = """
 [console_scripts]
-adwin_control = adwin_control.servoController:main
+adwin_control = adwin_control.run:main
 # For example:
 # fibonacci = adwin_control.skeleton:run
 """

src/adwin_control/guniconfig.py.ini

+"""gunicorn config file"""
+workers = 1
+bind = '0.0.0.0:8000'
+timeout = 30
+worker_class = 'sync'
+debug = True
+spew = False
+loglevel = 'info'

src/adwin_control/gunirun.py

+import subprocess
+
+
+def main():
+    subprocess.run(['gunicorn', '-c', 'guniconfig.py.ini', 'run:server'])
+    subprocess.run(['pwd'])
+
+
+if __name__ == '__main__':
+    main()

src/adwin_control/run.py

+import dash
+from adwin_control import settings
+from adwin_control.adwinUI import UI
+
+
+def getLayout(ui):
+    return ui.layout
+
+
+app = dash.Dash(__name__)
+ui = UI(app)
+app.layout = getLayout(ui)
+ui.setCallbacks()
+server = app.server
+
+
+def main():
+    app.run_server(host='0.0.0.0', debug=settings.DEBUG, threaded=False, processes=1)
+
+
+if __name__ == '__main__':
+    main()

src/adwin_control/servo.py

@@ -35,11 +35,13 @@ def _rearange_filter_coeffs(filter):
     a = filter[3:6]
     return [b[0], a[1], a[2], b[1] / b[0], b[2] / b[0]]
 
+
 def _convertStepsize2Frequency(stepsize):
     if stepsize is None:
         return None
     return stepsize * settings.SAMPLING_RATE / settings.RAMP_DATA_POINTS
 
+
 def _convertFrequency2Stepsize(frequency):
     # period_time = RAMP_DATA_POINTS/stepsize / SAMPLING_RATE
     # f = stepsize * SAMPLING_RATE / RAMP_DATA_POINTS
@@ -168,9 +170,9 @@ class Servo:
             'inputSw': False,
         })
         self._ramp = mp.Manager().dict({
-            'amplitude': None,
+            'amplitude': .1,
             'minimum': 0,
-            'stepsize': None,
+            'stepsize': 20,
         })
         self._fifo = mp.Manager().dict({
             'stepsize': self.DEFAULT_FIFO_STEPSIZE,

src/adwin_control/settings.py

@@ -34,13 +34,14 @@ BACKUP_SUBSTRING = user_config.get('BACKUP_SUBSTRING', "%Y-%m-%d_%H-%M-%S")
 
 LOG_LEVEL = user_config.get('LOG_LEVEL', 'WARNING')
 LOG_FORMAT = user_config.get('LOG_FORMAT', '%(levelname)s: %(module)s: %(message)s')
+DEBUG = user_config.get('DEBUG', False)
+
+SERVO_NAMES = user_config.get('SERVO_NAMES', {})  # currently only for one device
 
 # Temperature feedback
 DEFAULT_TEMP_HOST = user_config.get('DEFAULT_TEMP_HOST', '127.0.0.1')
 DEFAULT_TEMP_PORT = user_config.get('DEFAULT_TEMP_PORT', 5917)
 
-SERVO_NAMES = user_config.get('SERVO_NAMES', dict({}))
-
 # ADwin variables
 SAMPLING_RATE = 200e3
 RAMP_DATA_POINTS = 0x20000

src/adwin_control/settings_local.sample.py

@@ -14,4 +14,5 @@
 #     1: 'Cavity',
 #     3: 'Mode Cleaner',
 # }
-# LOG_LEVEL = 'WARNING'  # Possible alternatives: DEBUG, INFO, WARNING, ERROR, CRITICAL
+
+# DEBUG = True