Merge pull request #107 from openUC2/mergemaster

Mergemaster

Author: beniroquai

uc2rest/UC2Client.py

@@ -8,7 +8,6 @@
 from .mserial import Serial
 from .mserial import SerialManagerWrapper
 from .galvo import Galvo
-from .config import config
 from .ledmatrix import LedMatrix
 from .motor import Motor
 from .gripper import Gripper
@@ -39,11 +38,11 @@ class UC2Client(object):
 
     is_wifi = False
     is_serial = False
+    BAUDRATE = 115200
 
-    # BAUDRATE = 500000
-    BAUDRATE = 500000
-
-    def __init__(self, host=None, port=31950, serialport=None, identity="UC2_Feather", baudrate=BAUDRATE, NLeds=64, SerialManager=None, DEBUG=False, logger=None, skipFirmwareCheck=False):
+    def __init__(self, host=None, port=31950, serialport=None, identity="UC2_Feather", baudrate=BAUDRATE, 
+                 NLeds=64, SerialManager=None, DEBUG=False, logger=None, skipFirmwareCheck=False,
+                 isPyScript=False):
         '''
         This client connects to the UC2-REST microcontroller that can be found here
         https://github.com/openUC2/UC2-REST
@@ -61,7 +60,7 @@ def __init__(self, host=None, port=31950, serialport=None, identity="UC2_Feather
             self.logger = logger
 
         # perhaps we are in the browser?
-        self.isPyScript = False
+        self.isPyScript = isPyScript
 
         # initialize communication channel (# connect to wifi or usb)
         if serialport is not None:
@@ -89,18 +88,9 @@ def __init__(self, host=None, port=31950, serialport=None, identity="UC2_Feather
 
         # import libraries depending on API version
         self.logger.debug("Using API version 2")        
-
-        #FIXME
-        #self.set_state(debug=False)
-
+    
         # initialize state
         self.state = State(self)
-        if not self.isPyScript: 
-            state = self.state.get_state()
-       
-        # initialize config
-        if not self.isPyScript: 
-            self.config = config(self)
 
         # initialize cmdRecorder
         self.cmdRecorder = cmdRecorder(self)
@@ -149,13 +139,6 @@ def __init__(self, host=None, port=31950, serialport=None, identity="UC2_Feather
 
         # initialize messaging
         self.message = Message(self)
-        
-        # initialize config
-        if False: # not self.isPyScript: 
-            self.config = config(self)
-            try: self.pinConfig = self.config.loadConfigDevice()
-            except: self.pinConfig = None
-        
 
         # initialize module controller
         self.modules = Modules(parent=self)

uc2rest/__init__.py

@@ -1,2 +1 @@
-from .config import *
 from .UC2Client import *