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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UC2-REST
-Version: 0.2.0.20
+Version: 0.2.0.21
 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.20 → uc2_rest-0.2.0.21}/UC2_REST.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UC2-REST
-Version: 0.2.0.20
+Version: 0.2.0.21
 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.20 → uc2_rest-0.2.0.21}/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.21"
 __author__ = 'Benedict Diederich'
 __author_email__ = 'benedictdied@gmail.com'
 __license__ = 'GPL v3'

{uc2_rest-0.2.0.20 → uc2_rest-0.2.0.21}/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.21}/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.21}/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):