Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes by sinihappo #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes by sinihappo #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 28 additions & 17 deletions siglent_psu_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,14 @@ class SIGLENT_PSU():
def __init__(self, ip, port=5025):
self.ip = ip
self.port = port
self._sleep = 1
self._sleep = 0.05
self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.s.settimeout(1)
self.s.connect((self.ip , self.port))

def identify(self):
self.s.sendall(b'*IDN?')
#self.s.sendall(b'\n')
reply = self.s.recv(4096).decode('utf-8').strip()
self.send_line(b'*IDN?')
reply = self.receive_line().decode('utf-8').strip()
reply = reply.split(",")
reply_d = {}
if len(reply) == 5:
Expand All @@ -57,13 +56,29 @@ def identify(self):
return reply_d
return None

def send_line(self,cmd_b):
cmd_b = b'%s\n' % (cmd_b.strip(),)
return self.s.sendall(cmd_b)

def receive_line(self):
ba = bytearray()
while True:
try:
b = self.s.recv(256)
except TimeoutError:
b = b''
if not b:
break
ba.extend(b)
if b'\n' in b:
break
return bytes(ba)

def measure(self, ch, parameter):
cmd = "MEASURE:" + parameter.name + "? " + ch.name
cmd_b = cmd.encode("utf-8")
self.s.sendall(cmd_b)
#self.s.sendall(b'\n')
time.sleep(self._sleep)
reply = self.s.recv(4096).decode('utf-8').strip()
self.send_line(cmd_b)
reply = self.receive_line().decode('utf-8').strip()
reply = float(reply)
return reply

Expand All @@ -76,31 +91,27 @@ def set(self, ch, parameter, value):

cmd = ch.name + ":" + parameter.name + " " + str(value)
cmd_b = cmd.encode("utf-8")
self.s.sendall(cmd_b)
#self.s.sendall(b'\n')
self.send_line(cmd_b)
time.sleep(self._sleep)

def output(self, ch, status):
cmd = "OUTPUT " + ch.name + "," + status.name
cmd_b = cmd.encode("utf-8")
self.s.sendall(cmd_b)
#self.s.sendall(b'\n')
self.send_line(cmd_b)
time.sleep(self._sleep)

def track(self, tr):
cmd = "OUTPUT:TRACK " + str(tr.value)
cmd_b = cmd.encode("utf-8")
self.s.sendall(cmd_b)
#self.s.sendall(b'\n')
self.send_line(cmd_b)
time.sleep(self._sleep)

def system(self):
cmd = "SYSTem:STATus?"
cmd_b = cmd.encode("utf-8")
self.s.sendall(cmd_b)
#self.s.sendall(b'\n')
self.send_line(cmd_b)
time.sleep(self._sleep)
reply = self.s.recv(4096).decode('utf-8').strip()
reply = self.receive_line().decode('utf-8').strip()
reply = int(reply, 16)

response = {}
Expand Down