Skip to content
Snippets Groups Projects
Commit c6207ee6 authored by Alexandre MALFREYT's avatar Alexandre MALFREYT Committed by Florent LANGLOIS
Browse files

Refactor GetIDN, GetMAC and GetErrorState to use WriteReadSocket method for consistency

parent f74f670b
No related branches found
No related tags found
1 merge request!2Python 3 + améliorations
......@@ -157,11 +157,8 @@ class GEpressCtrlPACE5000 (PyTango.LatestDeviceImpl):
self.debug_stream("In GetIDN()")
argout = ""
#----- PROTECTED REGION ID(GEpressCtrlPACE5000.GetIDN) ENABLED START -----#
cmd = six.b("*IDN?\n")
self.socket.send(cmd)
argout = self.socket.recv(100)
argout = argout.decode("utf-8")
argout = argout.replace("*IDN ", "")
response = self.WriteReadSocket("*IDN?")
_, argout = response.split(" ", 1)
self.info_stream("Device identification: " + argout)
#----- PROTECTED REGION END -----# // GEpressCtrlPACE5000.GetIDN
......@@ -183,11 +180,8 @@ class GEpressCtrlPACE5000 (PyTango.LatestDeviceImpl):
self.debug_stream("In GetMAC()")
argout = ""
#----- PROTECTED REGION ID(GEpressCtrlPACE5000.GetMAC) ENABLED START -----#
cmd = six.b("INST:MAC?\n")
self.socket.send(cmd)
argout = self.socket.recv(100)
argout = argout.decode("utf-8")
argout = argout.replace(":INST:MAC ", "")
response = self.WriteReadSocket("INST:MAC?")
_, argout = response.split(" ", 1)
self.info_stream("Device MAC address: " + argout)
#----- PROTECTED REGION END -----# // GEpressCtrlPACE5000.GetMAC
......@@ -210,11 +204,9 @@ class GEpressCtrlPACE5000 (PyTango.LatestDeviceImpl):
argout = ""
#----- PROTECTED REGION ID(GEpressCtrlPACE5000.GetErrorState) ENABLED START -----#
cmd = six.b("SYST:ERR?\n")
self.socket.send(cmd)
return_str = self.socket.recv(100)
return_str = return_str.decode("utf-8")
return_str = return_str.replace(":SYST:ERR ", "")
response = self.WriteReadSocket("SYST:ERR?")
_, return_str = response.split(" ", 1)
value = int(return_str.split(",")[0])
if value == 0:
argout = "No error"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment