Commit 224a6c4a authored by auke.klazema's avatar auke.klazema

Renamed some parameters

parent e075c415
......@@ -71,29 +71,29 @@ class PrologixGpibUsb(PortDevice):
self._devices = "Not scanned."
self._hpib_address = -1
def command(self, hpib_address, commandStr):
def command(self, hpib_address, command):
if hpib_address != self._hpib_address:
self._commandStr = "++addr " + str(hpib_address)+chr(10)
self._commandStr = "++addr " + str(hpib_address) + chr(10)
self._hpib_address = hpib_address
else:
self._commandStr = ""
self._commandStr += commandStr+chr(10)
self._commandStr += command + chr(10)
self._commandCount = self._serialPort.write(self._commandStr)
def query(self, hpib_address, queryStr, count=80):
def query(self, hpib_address, query, count=80):
if hpib_address != self._hpib_address:
self._commandStr = "++addr " + str(hpib_address)+chr(10)
self._commandStr = "++addr " + str(hpib_address) + chr(10)
self._hpib_address = hpib_address
else:
self._commandStr = ""
self._commandStr += queryStr + chr(10) + "++read eoi" + chr(10)
self._commandStr += query + chr(10) + "++read eoi" + chr(10)
self._commandCount = self._serialPort.write(self._commandStr)
self._returnStr = self._serialPort.readline()
return self._returnStr[:-1]
def set_local(self, hpib_address):
#self._commandStr = "++addr "+str(hpib_address)+chr(10)+"loc "+str(hpib_address)+chr(10)
#self._commandCount = self._serialPort.write(self._commandStr)
# self._commandStr = "++addr "+str(hpib_address)+chr(10)+"loc "+str(hpib_address)+chr(10)
# self._commandCount = self._serialPort.write(self._commandStr)
return
def getDevices(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment