Merge branch 'patch-controlEnum' into 'master'

fixed Control to ControlEnum

See merge request !4

Author: B. Thomas Goodwin

rest/bulkio_handler.py

@@ -109,15 +109,15 @@ def on_message(self, message):
         try:
             ctrl = json.loads(message)
 
-            if (ctrl['type'] == Control.MaxWidth):
+            if (ctrl['type'] == ControlEnum.MaxWidth):
                 if 0 < ctrl['value']:
                     self._outputWidth = ctrl['value']
                     logging.info('Decimation requested to {0} samples'.format(ctrl['value']))
                 else:
                     self._outputWidth = None
                     logging.info('Decimation disabled')
 
-            elif (ctrl['type'] == Control.MaxPPS):
+            elif (ctrl['type'] == ControlEnum.MaxPPS):
                 logging.warning('Packets per second (PPS) not implemented yet.')
         except Exception as e:
             self.write_message(dict(error='SystemError', message=str(e)))