Commit e075c415 authored by auke.klazema's avatar auke.klazema

Renamed some parameters

parent 054a8d21
......@@ -8,7 +8,7 @@ class PortDevice(object):
def command(self, hpib_address, command):
raise NotImplementedError
def query(self, hpib_address, queryStr, count=80):
def query(self, hpib_address, query, count=80):
raise NotImplementedError
def set_local(self, hpib_address):
......@@ -109,14 +109,14 @@ class GPIB_232_485CT_A(PortDevice):
self._serialPort.flushInput()
self._pause = pause
def command(self, hpib_address, commandStr):
self._commandStr = "wr "+str(hpib_address)+chr(10)+commandStr+chr(13)
def command(self, hpib_address, command):
self._commandStr = "wr " + str(hpib_address) + chr(10) + command + chr(13)
self._commandCount = self._serialPort.write(self._commandStr)
def query(self, hpib_address, queryStr, count=80):
def query(self, hpib_address, query, count=80):
# flushInput should not be necessary
# self._serialPort.flushInput()
self._commandStr = "wr "+str(hpib_address)+chr(10)+queryStr+chr(13)
self._commandStr = "wr " + str(hpib_address) + chr(10) + query + chr(13)
self._commandCount = self._serialPort.write(self._commandStr)
self._queryStr = "rd #"+str(count)+" "+str(hpib_address)+chr(13)
self._queryCount = self._serialPort.write(self._queryStr)
......
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