Merge pull request #83 from openUC2/mergemaster

adding dac

Author: beniroquai

uc2rest/TEST/TEST_ESP32_Serial.py

@@ -11,6 +11,13 @@
 #ESP32.serial.sendMessage('{"task":"/home_act", "home": {"steppers": [{"stepperid":1, "timeout": 20000, "speed": 15000, "direction":1, "endposrelease":3000}]}}')
 
 
+# test servo 
+for i in range(180):
+    ESP32.laser.set_servo(channel=1, value=i, is_blocking=False)
+    time.sleep(0.1)
+ESP32.laser.set_servo(channel=1, value=0, is_blocking=False)    
+
+
 #%% TEMPERATURE
 if 0:
     ESP32.temperature.start_temperature_polling()

uc2rest/galvo.py

@@ -1,3 +1,4 @@
+import numpy as np
 class Galvo(object):
     def __init__(self, parent=None):
         '''
@@ -15,16 +16,18 @@ def __init__(self, parent=None):
         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)

uc2rest/laser.py

@@ -60,3 +60,18 @@ def set_laserpin(self, laserid=1, laserpin=0):
         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

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):