UC2-REST 0.2.0.20__tar.gz → 0.2.0.22__tar.gz

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: UC2-REST
-Version: 0.2.0.20
+Version: 0.2.0.22
 Summary: This pacage will help you to drive the ESP32-driven microscopy control modules from UC2
 Home-page: https://github.com/openUC2/UC2-REST
 Author: Benedict Diederich
@@ -16,9 +16,17 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: requests
 Requires-Dist: pyserial
-Requires-Dist: esptool
-Requires-Dist: progressbar2
-Requires-Dist: pillow
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 <p align="left">

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/UC2_REST.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: UC2-REST
-Version: 0.2.0.20
+Version: 0.2.0.22
 Summary: This pacage will help you to drive the ESP32-driven microscopy control modules from UC2
 Home-page: https://github.com/openUC2/UC2-REST
 Author: Benedict Diederich
@@ -16,9 +16,17 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: requests
 Requires-Dist: pyserial
-Requires-Dist: esptool
-Requires-Dist: progressbar2
-Requires-Dist: pillow
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 <p align="left">

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/UC2_REST.egg-info/SOURCES.txt

@@ -31,6 +31,5 @@ uc2rest/rotator.py
 uc2rest/slm.py
 uc2rest/state.py
 uc2rest/temperature.py
-uc2rest/updater.py
 uc2rest/utils.py
 uc2rest/wifi.py

uc2_rest-0.2.0.22/UC2_REST.egg-info/requires.txt

@@ -0,0 +1,3 @@
+numpy
+requests
+pyserial

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/setup.py

@@ -27,7 +27,7 @@ setup(
     packages=['uc2rest'],
     include_package_data=True,
     python_requires='>=3.7',
-    install_requires=['numpy', 'requests', 'pyserial', "esptool", "progressbar2", "pillow"],
+    install_requires=['numpy', 'requests', 'pyserial'],
     license=about['__license__'],
     zip_safe=False,
     entry_points={

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/uc2rest/UC2Client.py

@@ -84,9 +84,7 @@ class UC2Client(object):
         else:
             self.logger.error("No ESP32 device is connected - check IP or Serial port!")
         
-                
-        if not self.isPyScript: from .updater import updater
-        
+                        
         # import libraries depending on API version
         self.logger.debug("Using API version 2")        
 
@@ -150,11 +148,7 @@ class UC2Client(object):
             try: self.pinConfig = self.config.loadConfigDevice()
             except: self.pinConfig = None
         
-        # initialize updater 
-        if not self.isPyScript: 
-            try: self.updater = updater(parent=self)
-            except: self.updater = None
-        
+
         # initialize module controller
         self.modules = Modules(parent=self)
     
@@ -192,7 +186,7 @@ class UC2Client(object):
             if timeout <=0:
                 getReturn = False
             return self.serial.post_json(path, payload=None, getReturn=getReturn, nResponses=1, timeout=timeout)
-            #return self.serial.read_json()
+            #return self.serial.read_json()<
         else:
             self.logger.error("No ESP32 device is connected - check IP or Serial port!")
             return None
@@ -202,4 +196,4 @@ class UC2Client(object):
         self.serial.DEBUG = debug
         
     def close(self):
-        self.serial.closeSerial()
+        self.serial.close()

uc2_rest-0.2.0.22/uc2rest/__init__.py

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

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/uc2rest/__version__.py

@@ -6,7 +6,7 @@ __version__.py
 
 __title__ = 'UC2-REST'
 __description__ = 'This pacage will help you to drive the ESP32-driven microscopy control modules from UC2'
-__version__ = "v0.2.0.20"
+__version__ = "v0.2.0.22"
 __author__ = 'Benedict Diederich'
 __author_email__ = 'benedictdied@gmail.com'
 __license__ = 'GPL v3'

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/uc2rest/galvo.py

@@ -1,3 +1,4 @@
+import numpy as np
 class Galvo(object):
     def __init__(self, parent=None):
         '''
@@ -15,16 +16,18 @@ class Galvo(object):
         self._parent = parent
 
     
-    def set_dac(self, channel=1, frequency=1, offset=0, amplitude=1/2, clk_div=0, timeout=1):
-        
+    def set_dac(self, channel=1, frequency=1, offset=0, amplitude=1, clk_div=0, phase=0, invert=1, timeout=1):
+        # {"task":"/dac_act", "dac_channel":1, "frequency":10, "offset":1, "amplitude":1, "divider":0, "phase":0, "invert":1, "qid":2}
         path = "/dac_act"
         payload = {
             "task": path,
             "dac_channel": channel, # 1 or 2
             "frequency": frequency,
             "offset": offset,
-            "amplitude":amplitude,
-            "clk_div": clk_div
+            "divider": clk_div,
+            "amplitude":amplitude, 
+            "phase":phase,
+            "invert":invert
         }
                         
         self._parent.post_json(path, payload, timeout=timeout, getReturn=False)

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/uc2rest/home.py

@@ -44,6 +44,17 @@ class Home(object):
                   endstoppolarity=endstoppolarity,
                   isBlocking=isBlocking)    
         
+    def home_a(self, speed = None, direction = None, endposrelease = None, endstoppolarity=None, timeout=None, isBlocking=False):
+        # axis = 0 corresponds to 'A'
+        axis = 0
+        self.home(axis=axis,
+                  timeout=timeout, 
+                  speed = speed, 
+                  direction = direction, 
+                  endposrelease=endposrelease, 
+                  endstoppolarity=endstoppolarity,
+                  isBlocking=isBlocking)    
+    
     def home(self, axis=None, timeout=None, speed=None, direction=None, endposrelease=None, endstoppolarity=None, isBlocking=False):
         '''
         axis = 0,1,2,3 or 'A, 'X','Y','Z'
@@ -77,10 +88,9 @@ class Home(object):
                 "steppers": [
                 {
                  "stepperid": axis,
-                 "timeout":timeout*1000,
-                 "speed":direction*abs(speed),
+                 "timeout":timeout,
+                 "speed":abs(speed),
                  "direction":direction,
-                 "endposrelease":endposrelease,
                  "endstoppolarity":endstoppolarity
                  }]
             }}

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/uc2rest/laser.py

@@ -60,3 +60,18 @@ class Laser(object):
         r = self._parent.post_json(path, payload)
         return r
 
+
+
+    def set_servo(self, channel=1, value=0, is_blocking=False):
+        #{"task":"/laser_act", "LASERid":1 ,"LASERval":99, "servo":1, "qid":1}
+        path = '/laser_act'
+        
+        payload = {
+            "task": path,
+            "LASERid": channel,
+            "LASERval": value, 
+            "servo": 1
+        }
+        
+        r = self._parent.post_json(path, payload, getReturn=is_blocking)
+        return r

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/uc2rest/ledmatrix.py

@@ -1,6 +1,5 @@
 import numpy as np
-import json
-import time 
+
 gTimeout = 2
 class LedMatrix(object):
     def __init__(self, parent, NLeds=64):

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/uc2rest/motor.py

@@ -75,10 +75,11 @@ class Motor(object):
         into the position array of the motors '''
         try:
             nSteppers = len(data["steppers"])
+            stepSizes = np.array((self.stepSizeA, self.stepSizeX, self.stepSizeY, self.stepSizeZ))
             for iMotor in range(nSteppers):
                 stepperID = data["steppers"][iMotor]["stepperid"]
-                # smart to re-update this variable? Will be updated by motor-sender too
-                self._position[stepperID] = data["steppers"][iMotor]["position"]
+                # FIXME:  smart to re-update this variable? Will be updated by motor-sender too
+                self._position[stepperID] = data["steppers"][iMotor]["position"] * stepSizes[stepperID]
             if  callable(self._callbackPerKey[0]):
                 self._callbackPerKey[0](self._position) # we call the function with the value
         except Exception as e:
@@ -218,7 +219,10 @@ class Motor(object):
             if type(speed)==int or len(speed)!= 2:
                 speed = (speed,speed)
 
-            if len(acceleration)!= 2:
+            if acceleration is None:
+                acceleration = 100000
+                
+            if type(acceleration)==int or len(acceleration)!= 2:
                 acceleration = (acceleration,acceleration)
 
             # motor axis is 1,2,3,0 => X,Y,Z,T # FIXME: Hardcoded
@@ -237,10 +241,14 @@ class Motor(object):
         return r
 
     def move_xyza(self, steps=(0,0,0,0), speed=(1000,1000,1000,1000), acceleration=None, is_blocking=False, is_absolute=False, is_enabled=True, timeout=gTIMEOUT):
+        # everywhere, where relative steps are zero, speed should be zero, too
         if type(speed)==int:
-            speed = (speed,speed,speed,speed)
-        if type(steps)==int:
-            steps = (steps,steps,steps,steps)
+            speed = [speed,speed,speed,speed]
+        if type(speed)==tuple:
+            speed = list(speed)
+        for iMotor in range(len(steps)):
+            if steps[iMotor]==0 and not is_absolute:
+                speed[iMotor] = 0
 
         r = self.move_stepper(steps=steps, speed=speed, acceleration=acceleration, is_blocking=is_blocking, is_absolute=is_absolute, is_enabled=is_enabled, timeout=timeout)
         return r
@@ -543,6 +551,7 @@ class Motor(object):
 
         # this may be an asynchronous call.. #FIXME!
         r = self._parent.post_json(path, payload, getReturn = True, nResponses=1, timeout=timeout)
+        # returns {"motor": }
         if "motor" in r:
             for index, istepper in enumerate(r["motor"]["steppers"]):
                 _position[istepper["stepperid"]]=istepper["position"]*_physicalStepSizes[self.motorAxisOrder[index]]
@@ -592,3 +601,38 @@ class Motor(object):
 
     def set_direction(self, axis=1, sign=1, timeout=1):
         return False
+
+    def set_tmc_parameters(self, axis=0, msteps=None, rms_current=None, stall_value=None, sgthrs=None, semin=None, semax=None, blank_time=None, toff=None, timeout=1):
+        ''' set the TMC parameters for a specific axis 
+        msteps: microsteps
+        rms_current: current in mA
+        sgthrs: stallguard threshold
+        semin: minimum current
+        semax: maximum current
+        blank_time: blank time
+        toff: off time
+        #   {"task":"/tmc_act", "msteps":32, "rms_current":600, "sgthrs":100, "semin":5, "semax":2, "blank_time":24, "toff":4, "axis":1}
+        '''
+        if type(axis)==str:
+            axis = self.xyztTo1230(axis)
+        path = "/tmc_act"
+        payload = {}
+        if axis is not None:
+            payload["axis"] = axis
+        if msteps is not None:
+            payload["msteps"] = msteps
+        if rms_current is not None:
+            payload["rms_current"] = rms_current
+        if sgthrs is not None:
+            payload["sgthrs"] = sgthrs
+        if semin is not None:
+            payload["semin"] = semin
+        if semax is not None:
+            payload["semax"] = semax
+        if blank_time is not None:
+            payload["blank_time"] = blank_time
+        if toff is not None:
+            payload["toff"] = toff
+
+        r = self._parent.post_json(path, payload, timeout=timeout)
+        return r

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.22}/uc2rest/mserial.py

@@ -5,7 +5,7 @@ import queue
 import threading
 import time
 
-T_SERIAL_WARMUP = 2.5
+T_SERIAL_WARMUP = 1#2.5
 class Serial:
     def __init__(self, port, baudrate=115200, timeout=5,
                  identity="UC2_Feather", parent=None, DEBUG=False):
@@ -104,7 +104,7 @@ class Serial:
             pass
         self.running = True
         self.identifier_counter = 0 # Counter for generating unique identifiers
-        self.thread = threading.Thread(target=self._process_commands)
+        self.thread = threading.Thread(target=self._process_commands, daemon=True)
         self.thread.start()
         
         # setup sender queue
@@ -142,7 +142,14 @@ class Serial:
     def tryToConnect(self, port):
         try:
             self.serialdevice = serial.Serial(port=port, baudrate=self.baudrate, timeout=self.read_timeout, write_timeout=self.write_timeout)
-            time.sleep(T_SERIAL_WARMUP)
+            # close the device - similar to hard reset
+            self.serialdevice.setDTR(False)
+            self.serialdevice.setRTS(True)
+            time.sleep(.1)
+            self.serialdevice.setDTR(False)
+            self.serialdevice.setRTS(False)
+            time.sleep(.5)            
+            #time.sleep(T_SERIAL_WARMUP)
             self._freeSerialBuffer(self.serialdevice, timeout=2, timeMinimum=1)
             if self.checkFirmware(self.serialdevice):
                 self.is_connected = True
@@ -213,6 +220,8 @@ class Serial:
         currentIdentifier = None
         nLineCountTimeout = 50 # maximum number of lines read before timeout
         lineCounter = 0
+        nFailedCommands = 0
+        nFailedCommandsMax = 5
         while self.running:
             if self.manufacturer == "UC2Mock": 
                 self.running = False
@@ -226,17 +235,38 @@ class Serial:
                 self.is_connected = True
 
             # if we just want to send but not even wait for a response
-            try:
-                with self.serialLock:
-                    mReadline = self.serialdevice.readline()
-                    line = mReadline.decode('utf-8').strip()
-                    if self.DEBUG and line!="": self._logger.debug("[ProcessLines]:"+str(line))
-            except Exception as e:
-                self._logger.error("Failed to read the line in serial: "+str(e))
-                line = ""
+            with self.serialLock:
+                try:
+                        mReadline = self.serialdevice.readline()
+                        line = mReadline.decode('utf-8').strip()
+                        if self.DEBUG and line!="": 
+                            self._logger.debug("[ProcessLines]:"+str(line))
+                except Exception as e:
+                    self._logger.error("Failed to read the line in serial: "+str(e))
+                    nFailedCommands += 1
+                    line = ""
+                        
+                    # if we have a problem with the serial connection, we need to reconnect
+                    for i in range(4):
+                        if self.reconnect():
+                            self._logger.debug("Reconnected to the serial device")
+                            break
+                        else:
+                            self._logger.debug("Failed to reconnect to the serial device")
+                        time.sleep(1)
+                
             if line == "++":
                 reading_json = True
                 continue
+            elif line.find("error") != -1:
+                # if we have an error, we need to reset the last command
+                self._logger.debug("Error - last command did not match the firmware: "+str(self.commands[currentIdentifier]))
+                self.resetLastCommand = True
+                buffer = ""
+                lineCounter = 0
+                reading_json = False
+                self.responses[currentIdentifier].append({"error": 1})
+                self.responses[currentIdentifier].append({"qid": currentIdentifier})
             elif line == "--" or lineCounter>nLineCountTimeout:
                 lineCounter = 0
                 reading_json = False
@@ -246,6 +276,7 @@ class Serial:
                         for callback in self.callBackList:
                             # check if json has key
                             try:
+                                self._logger.debug("[ProcessCommands]: "+str(json_response))
                                 if callback["pattern"] in json_response:
                                     callback["callbackfct"](json_response)
                             except Exception as e:
@@ -255,6 +286,7 @@ class Serial:
                     self._logger.error("Failed to load the json from serial %s" % buffer)
                     self._logger.error("Error: %s" % str(e))
                     json_response = {}
+                    reading_json = True
 
                 try: currentIdentifier = json_response["qid"]
                 except: pass
@@ -341,7 +373,8 @@ class Serial:
             json_command = json.dumps(command)+"\n"
             #self.serialdevice.flush()
             if self.DEBUG and json_command!="": self._logger.debug("[SendingCommands]:"+str(json_command))
-            self.serialdevice.write(json_command.encode('utf-8'))
+            with self.serialLock:
+                self.serialdevice.write(json_command.encode('utf-8'))
             #time.sleep(1)
             # we have to queue the commands and give it some time to process
             #self._enqueue_command(json_command)
@@ -355,6 +388,8 @@ class Serial:
             return identifier
         t0 = time.time()
         timeReturnReceived = 0.3
+        maxRetry = 3
+        iRetry = 0
         while self.running:
             time.sleep(0.002)
             if self.resetLastCommand or time.time()-t0>timeout or not self.is_connected:
@@ -368,9 +403,16 @@ class Serial:
                     self._logger.debug("You have sent the wrong command!")
                     return "Wrong Command"
             if time.time()-t0>timeReturnReceived and not (identifier in self.responses and len(self.responses[identifier]) > 0):
-                self._logger.debug("It takes too long to get a response, we will resend the last command")
+                if iRetry > maxRetry:
+                    self.resetLastCommand = True
+                    return "No response received"
+                self._logger.debug("It takes too long to get a response, we will resend the last command: "+str(self.commands[identifier]))
                 try:
+                    ERROR="We have a queue, so after a while we need to resend the wrong command!"
+                    iRetry += 1
+                    raise Exception(ERROR)
                     self.serialdevice.write(json.dumps(self.commands[identifier]).encode('utf-8'))
+                    t0 = time.time()
                     time.sleep(0.1)
                 except Exception as e:
                     self._logger.error("Failed to write the line in serial: "+str(e))
@@ -388,7 +430,11 @@ class Serial:
         self.stop()
         self.running = False
 
+    def close(self):
+        self.closeSerial()
+        
     def reconnect(self, baudrate=None):
+        self._logger.debug("Reconnecting to the serial device")
         self.running = False
         if baudrate is not None:
             self.baudrate = baudrate
@@ -397,6 +443,8 @@ class Serial:
         except:
             pass
         self.serialdevice = self.openDevice(port = self.serialport, baud_rate = self.baudrate)
+        if self.serialdevice: return True
+        return False
 
     def toggleCommandOutput(self, cmdCallBackFct=None):
         # if true, all commands will be output to a callback function and stored for later use
@@ -526,4 +574,4 @@ if __name__ == "__main__":
     #response = monitor.waitForResponse(command_id)
 
     if response:
-        print("Response:", response)
+        print("Response:", response)

uc2_rest-0.2.0.20/UC2_REST.egg-info/requires.txt

@@ -1,6 +0,0 @@
-numpy
-requests
-pyserial
-esptool
-progressbar2
-pillow

uc2_rest-0.2.0.20/uc2rest/__init__.py

@@ -1,6 +0,0 @@
-from .config import *
-from .UC2Client import *
-try:
-    from .updater import *
-except:
-    print("Updater not available")

uc2_rest-0.2.0.20/uc2rest/updater.py

@@ -1,268 +0,0 @@
-import subprocess
-import os
-import esptool
-import tempfile
-import urllib
-import threading
-import zipfile
-import progressbar 
-import platform
-import glob
-try:
-    import requests
-    is_requests = True
-except:
-    is_requests = False
-
-class updater(object):
-    
-    def __init__(self, ESP32=None, port=None, parent=None):
-        if ESP32 is not None:
-            self.port = ESP32.serial.serialport
-        if port is not None:
-            self.port = port
-        # parent holds the entire esp object
-        if parent is not None:
-            self._parent = parent
-            self.port = self._parent.serial.serialport
-
-        # define a temporary firmware file name for the firmware download
-        self.firmwarePath = os.path.join(tempfile.gettempdir(), "uc2rest")
-            
-
-                
-    def unzipFiles(self):
-        ''' Unzip the UC2Rest.zip '''
-        print("Unzipping files")
-        with zipfile.ZipFile(os.path.join(self.firmwarePath, self.uc2restZip), 'r') as zip_ref:
-            zip_ref.extractall(self.firmwarePath)
-        # list the files in the directory
-        filenames = os.listdir(self.firmwarePath)
-        print("Done unzipping files:")
-        print(filenames)
-        return filenames
-        
-        
-    def flashFirmware(self, firmwarePath=None):
-        # sideload the firmware if already available online
-        
-        self.filenames = self.unzipFiles()
-        if self._parent is not None:
-            # in case the serial is still open, perhaps it makes sense to close it
-            try:
-                self._parent.serial.closeSerial()
-            except:
-                pass
-            
-        if platform.system()=="Windows":
-            try:
-                #esptool.py --chip esp32 --port /dev/cu.SLAB_USBtoUART --baud 921600 
-                # --before default_reset --after hard_reset write_flash -z --flash_mode dio 
-                # --flash_freq 80m --flash_size 4MB 
-                # 0x1000 ./ESP32/build/main.ino.bootloader.bin 
-                # 0x8000 ./ESP32/build/main.ino.partitions.bin 
-                # 0xe000 ./ESP32/build/boot_app0.bin 
-                # 0x10000 ./ESP32/build/main.ino.bin 
-                try:
-                    cmd = ["esptool.py", 
-                            "--chip", "esp32",
-                            "--port", self.port, 
-                            "--baud", "921600", 
-                            "write_flash",
-                            "--flash_freq", "80m",
-                            "--flash_mode", "dio", 
-                            "--flash_size", "detect", 
-                            "0xe000", os.path.join(self.firmwarePath,"boot_app0.bin"),
-                            "0x1000", os.path.join(self.firmwarePath,"main.ino.bootloader.bin"), 
-                            "0x8000", os.path.join(self.firmwarePath,"main.ino.partitions.bin"), 
-                            "0x10000", os.path.join(self.firmwarePath,"main.ino.bin")]
-                    print('Using command %s' % ' '.join(cmd))
-                    process = subprocess.Popen(cmd,shell=True,stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-                    process.wait()
-                    stdout, stderr = process.communicate()
-                    if str(stderr).find("not reco")>0 or not str(stdout).find("Leaving...")>0: 
-                        raise Exception
-                    
-                except Exception as e:
-                    print(e)
-                    print("We will try an alternative route:")
-                    try:
-                        cmd = ["python -m esptool", 
-                                "--chip", "esp32",
-                                "--port", self.port, 
-                                "--baud", "921600", 
-                                "write_flash",
-                                "--flash_freq", "80m",
-                                "--flash_mode", "dio", 
-                                "--flash_size", "detect", 
-                                "0xe000", os.path.join(self.firmwarePath,"boot_app0.bin"),
-                                "0x1000", os.path.join(self.firmwarePath,"main.ino.bootloader.bin"), 
-                                "0x8000", os.path.join(self.firmwarePath,"main.ino.partitions.bin"), 
-                                "0x10000", os.path.join(self.firmwarePath,"main.ino.bin")]
-                        print('Using command %s' % ' '.join(cmd))
-                        env = os.environ
-                        process = subprocess.Popen(cmd,shell=True, env=env,stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-                        process.wait()
-                        stdout, stderr = process.communicate()
-                        if str(stderr).find("not reco")>0 or  not str(stdout).find("Leaving...")>0: 
-                            raise Exception
-                    except Exception as e:
-                        print(e)
-                        print("We will try an alternative route:")
-                        try:
-                            # special weindows case?
-                            cmd = ["esptool", 
-                                    "--chip", "esp32",
-                                    "--port", self.port, 
-                                    "--baud", "921600", 
-                                    "write_flash",
-                                    "--flash_freq", "80m",
-                                    "--flash_mode", "dio", 
-                                    "--flash_size", "detect", 
-                                    "0xe000", os.path.join(self.firmwarePath,"boot_app0.bin"),
-                                    "0x1000", os.path.join(self.firmwarePath,"main.ino.bootloader.bin"), 
-                                    "0x8000", os.path.join(self.firmwarePath,"main.ino.partitions.bin"), 
-                                    "0x10000", os.path.join(self.firmwarePath,"main.ino.bin")]
-                            print('Using command %s' % ' '.join(cmd))
-                            env = os.environ
-                            process = subprocess.Popen(cmd,shell=True, env=env)
-                            process.wait()
-                        except Exception as e:
-                            print(e)
-                            print("Firmware not flashed.")
-                            return False                    
-                print("Firmware flashed")
-                return True
-            except Exception as e:
-                print(e)
-                print("Firmware flash failed")
-                return False
-            
-        else:
-            try:
-                try:
-                    cmd = ["esptool.py", 
-                            "--chip", "esp32",
-                            "--port", self.port, 
-                            "--baud", "921600", 
-                            "write_flash",
-                            "--flash_freq", "80m",
-                            "--flash_mode", "dio", 
-                            "--flash_size", "detect", 
-                            "0xe000", os.path.join(self.firmwarePath,"boot_app0.bin"),
-                            "0x1000", os.path.join(self.firmwarePath,"main.ino.bootloader.bin"), 
-                            "0x8000", os.path.join(self.firmwarePath,"main.ino.partitions.bin"), 
-                            "0x10000", os.path.join(self.firmwarePath,"main.ino.bin")]
-                    print('Using command %s' % ' '.join(cmd))
-                    process = subprocess.Popen(cmd)
-                    process.wait()
-                except Exception as e:
-                    print(e)
-                    print("We will try an alternative route:")
-                    cmd = ["python -m esptool", 
-                            "--chip", "esp32",
-                            "--port", self.port, 
-                            "--baud", "921600", 
-                            "write_flash",
-                            "--flash_freq", "80m",
-                            "--flash_mode", "dio", 
-                            "--flash_size", "detect", 
-                            "0xe000", os.path.join(self.firmwarePath,"boot_app0.bin"),
-                            "0x1000", os.path.join(self.firmwarePath,"main.ino.bootloader.bin"), 
-                            "0x8000", os.path.join(self.firmwarePath,"main.ino.partitions.bin"), 
-                            "0x10000", os.path.join(self.firmwarePath,"main.ino.bin")]
-                    print('Using command %s' % ' '.join(cmd))
-                    process = subprocess.Popen(cmd)
-                    process.wait()
-                print("Firmware flashed")
-                return True
-            except Exception as e:
-                print(e)
-                print("Firmware flash failed")
-                return False
-
-    
-    def downloadFirmware(self):
-
-        print("We are checking for pre-built binaries on Github")
-        self.firmwareDownloadPath = 'https://api.github.com/repos/youseetoo/uc2-esp32/releases/latest'
-        releaseResponse = requests.get(
-            self.firmwareDownloadPath
-        )
-        latestVersion = releaseResponse.json()['tag_name']
-        print("Latest version is: "+latestVersion)
-
-        ## attempting to downloda the current ImSwitch version
-        self.downloadURL = releaseResponse.json()['assets'][0]['browser_download_url']
-        self.uc2restZip = "UC2Rest.zip"
-        print("We are downloading the software from: "+self.uc2restZip)
-                
-
-        print("Downloading Firmware from "+self.firmwareDownloadPath)
-        # download the firmware from github
-        ## inplace replacement won't work I guess? => seems to work
-        def dlImSwitch(downloadURL, fileName):
-            resultDL = urllib.request.urlretrieve(downloadURL, fileName, MyProgressBar())
-            print("Done Downloading")
-
-
-        try:
-            if not os.path.exists(self.firmwarePath):
-                os.makedirs(self.firmwarePath)
-            # remove file if exists
-            if os.path.exists(self.firmwarePath+self.uc2restZip):
-                os.remove(os.path.join(self.firmwarePath,self.uc2restZip))
-            
-            # download the new version in a separate thread
-            mThread =  threading.Thread(target=dlImSwitch, args=(self.downloadURL, os.path.join(self.firmwarePath,self.uc2restZip)))
-            mThread.start()
-            mThread.join()
-
-            print("Succesfully downloaded file: "+os.path.join(self.firmwarePath, self.uc2restZip))
-            return True
-        except Exception as e:
-            print(e)
-            print("Firmware download failed"+self.uc2restZip)
-
-            return False
-            
-    def removeFirmware(self):
-        try:
-            print("Removing Firmware:"+self.uc2restZip)
-            for ifile in glob.glob(self.firmwarePath+"/*"):
-                try:os.remove(ifile)
-                except:pass
-            return True
-        except Exception as e:
-            print(e)
-            return False
-        
-        
-
-class MyProgressBar():
-    def __init__(self):
-        self.pbar = None
-
-    def __call__(self, block_num, block_size, total_size):
-        if not self.pbar:
-            self.pbar=progressbar.ProgressBar(maxval=total_size)
-            self.pbar.start()
-
-        downloaded = block_num * block_size
-        if downloaded < total_size:
-            self.pbar.update(downloaded)
-        else:
-            self.pbar.finish()
-    
-        
-if __name__ == "__main__":
-    updater = updater(port="/dev/cu.SLAB_USBtoUART", firmwarePath=None)
-    updater.downloadFirmware()
-    updater.flashFirmware()
-    
-    # remove firmware.bin after flashing
-    updater.removeFirmware()
-    
-            
-        
-