UC2-REST 0.2.0.29__tar.gz → 0.2.0.30__tar.gz

{uc2_rest-0.2.0.29 → uc2_rest-0.2.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UC2-REST
-Version: 0.2.0.29
+Version: 0.2.0.30
 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

{uc2_rest-0.2.0.29 → uc2_rest-0.2.0.30}/UC2_REST.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UC2-REST
-Version: 0.2.0.29
+Version: 0.2.0.30
 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

{uc2_rest-0.2.0.29 → uc2_rest-0.2.0.30}/uc2rest/UC2Client.py

@@ -56,7 +56,7 @@ class UC2Client(object):
 
         you can send commands through wifi/http or usb/serial
         '''
-        if logger is None:
+        if True: #logger is None:
             self.logger = Logger()
         else:
             self.logger = logger

{uc2_rest-0.2.0.29 → uc2_rest-0.2.0.30}/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.29"
+__version__ = "v0.2.0.30"
 __author__ = 'Benedict Diederich'
 __author_email__ = 'benedictdied@gmail.com'
 __license__ = 'GPL v3'

{uc2_rest-0.2.0.29 → uc2_rest-0.2.0.30}/uc2rest/home.py

@@ -55,13 +55,14 @@ class Home(object):
                   endstoppolarity=endstoppolarity,
                   isBlocking=isBlocking)    
     
-    def home(self, axis=None, timeout=None, speed=None, direction=None, endposrelease=None, endstoppolarity=None, endstoptimeout=10000, isBlocking=False):
+    def home(self, axis=None, timeout=None, speed=None, direction=None, endposrelease=None, endstoppolarity=None, endstoptimeout=10000, isBlocking=False, preMove=True):
         '''
         axis = 0,1,2,3 or 'A, 'X','Y','Z'
         timeout => when to stop homing (it's a while loop on the MCU)
         speed => speed of homing (0...15000)
         direction => 1,-1 (left/right)
         endposrelease => how far to move after homing (0...3000)
+        preMove => the motor will first move by some steps in the opposite direction before homing, this is useful to avoid false triggering of the endstop
         '''
         
         # default values
@@ -79,6 +80,25 @@ class Home(object):
         if direction not in [-1,1]:
             direction = 1
 
+        if preMove:
+            # first move in the opposite direction
+            if direction == 1:
+                preMoveDirection = -1
+            else:
+                preMoveDirection = 1
+            
+            # move away from endstop
+            if axis == 1 or axis == "X":
+                self._parent.motor.move_x(steps=preMoveDirection*100, speed=self.speed, is_blocking=True, is_absolute=False, is_enabled=True)
+            elif axis == 2 or axis == "Y":
+                self._parent.motor.move_y(steps=preMoveDirection*100, speed=self.speed, is_blocking=True, is_absolute=False, is_enabled=True)
+            elif axis == 3 or axis == "Z":
+                self._parent.motor.move_z(steps=preMoveDirection*100, speed=self.speed, is_blocking=True, is_absolute=False, is_enabled=True)
+            elif axis == 0 or axis == "A":
+                self._parent.motor.move_a(steps=preMoveDirection*100, speed=self.speed, is_blocking=True, is_absolute=False, is_enabled=True)
+            else:   
+                raise ValueError("Invalid axis. Use 'X', 'Y', 'Z', or 'A'.")
+            time.sleep(0.5)
         # construct json string
         path = "/home_act"
 

uc2_rest-0.2.0.30/uc2rest/logger.py

@@ -0,0 +1,45 @@
+import logging
+
+
+class Logger(object):
+    def __init__(
+        self,
+        name=__name__,
+        log_to_file=False,
+        filename='uc2rest.log'
+    ):
+        # Create a logger with the given name
+        self.logger = logging.getLogger(name)
+        self.logger.setLevel(logging.DEBUG)
+        formatter = logging.Formatter(
+            '%(asctime)s [%(levelname)s] %(name)s: %(message)s'
+        )
+
+        # Console handler
+        ch = logging.StreamHandler()
+        ch.setLevel(logging.DEBUG)
+        ch.setFormatter(formatter)
+        self.logger.addHandler(ch)
+
+        # Optional file handler
+        if log_to_file:
+            fh = logging.FileHandler(filename)
+            fh.setLevel(logging.DEBUG)
+            fh.setFormatter(formatter)
+            self.logger.addHandler(fh)
+
+    def error(self, message):
+        # Log an error message
+        self.logger.error(message)
+
+    def debug(self, message):
+        # Log a debug message
+        self.logger.debug(message)
+
+    def info(self, message):
+        # Log an info message
+        self.logger.info(message)
+
+    def warning(self, message):
+        # Log a warning message
+        self.logger.warning(message)

{uc2_rest-0.2.0.29 → uc2_rest-0.2.0.30}/uc2rest/motor.py

@@ -23,7 +23,6 @@ class Motor(object):
         self.minStep = np.ones((self.nMotors))*(-np.inf)
         self.currentDirection = np.zeros((self.nMotors))
         self.currentPosition = np.zeros((self.nMotors))
-        self._position = np.zeros((self.nMotors)) # position from the last motor status update
 
         self.minPosX = -np.inf
         self.minPosY = -np.inf
@@ -84,9 +83,9 @@ class Motor(object):
             for iMotor in range(nSteppers):
                 stepperID = data["steppers"][iMotor]["stepperid"]
                 # FIXME:  smart to re-update this variable? Will be updated by motor-sender too
-                self._position[stepperID] = data["steppers"][iMotor]["position"] * stepSizes[stepperID] - offSets[stepperID]
+                self.currentPosition[stepperID] = data["steppers"][iMotor]["position"] * stepSizes[stepperID] - offSets[stepperID]
             if  callable(self._callbackPerKey[0]):
-                self._callbackPerKey[0](self._position) # we call the function with the value
+                self._callbackPerKey[0](self.currentPosition) # we call the function with the value
         except Exception as e:
             print("Error in _callback_motor_status: ", e)
 
@@ -654,9 +653,9 @@ class Motor(object):
         _physicalOffsets = np.array((self.offsetA, self.offsetX, self.offsetY, self.offsetZ))
 
         # this may be an asynchronous call.. #FIXME!
-        r = self._parent.post_json(path, payload, getReturn = True, nResponses=1, timeout=timeout)
+        r = self._parent.post_json(path, payload, getReturn = True, nResponses=1, timeout=timeout)[0]
         # returns {"motor": }
-        if "motor" in r:
+        if "motor" in r :
             for index, istepper in enumerate(r["motor"]["steppers"]):
                 if index >3: break # TODO: We would need to handle other values too soon
                 _position[istepper["stepperid"]]=istepper["position"]*_physicalStepSizes[self.motorAxisOrder[index]]-_physicalOffsets[self.motorAxisOrder[index]]
@@ -775,6 +774,32 @@ class Motor(object):
         r = self._parent.post_json(path, payload)
         return r
     
+    def start_stage_scanning_by_coordinates(self, coordinates, tPre=50, tPost=50, led=100, illumination=[50, 75, 100, 125], stopped=0): 
+        '''
+        Example: {"task": "/motor_act", "stagescan": {"coordinates": [{"x": 100, "y": 200}, {"x": 300, "y": 400}, {"x": 500, "y": 600}], "tPre": 50, "tPost": 50, "led": 100, "illumination": [50, 75, 100, 125], "stopped": 0}}
+        
+        coordinates: list of dictionaries with x and y coordinates
+        tPre: time before exposure in ms
+        tPost: exposure time - time after action
+        led: led value for illumination
+        illumination: list of values for each channel of the illumination
+        stopped: 0 for start, 1 for stop
+        '''
+        path = "/motor_act"
+        payload = {
+            "task": path,
+            "stagescan": {
+                "coordinates": coordinates,
+                "tPre": tPre,
+                "tPost": tPost,
+                "led": led,
+                "illumination": illumination,
+                "stopped": stopped
+            }
+        }
+        r = self._parent.post_json(path, payload)
+        return r
+            
     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

{uc2_rest-0.2.0.29 → uc2_rest-0.2.0.30}/uc2rest/mserial.py

@@ -387,9 +387,10 @@ class Serial:
                 except: pass
 
                 with self.lock:
-                    try:
+                    try: # TODO: THis looks fishy   an
                         self.responses[currentIdentifier].append(json_response.copy())
-                    except:
+                    except Exception as e:
+                        #self._logger.error("Failed to append the response: "+str(e))
                         self.responses[currentIdentifier] = list()
                         self.responses[currentIdentifier].append(json_response.copy())
                     buffer = ""      # reset buffer

{uc2_rest-0.2.0.29 → uc2_rest-0.2.0.30}/uc2rest/state.py

@@ -55,6 +55,7 @@ class State(object):
     
     def espRestart(self,timeout=1):
         # if isController =True=> only PS jjoystick will be accepted
+        # {"task":"/state_act", "restart":1}
         path = "/state_act"
         payload = {
             "restart":1

uc2_rest-0.2.0.29/uc2rest/logger.py

@@ -1,9 +0,0 @@
-class Logger(object):
-    def __init__(self):
-        pass
-
-    def error(self,message):
-        print(message)
-
-    def debug(self, message):
-        print(message)