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

Make USB communication work again (with my Mac and Oscilloscope, at least) #10

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

Make USB communication work again (with my Mac and Oscilloscope, at least) #10

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
26 changes: 17 additions & 9 deletions rigol_grab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

class RigolGrab(object):

VID_PID = '0x1AB1::0x04CE'.lower()
VID = 0x1AB1
PID = 0x04CE

def __init__(self, verbose=False):
self._verbose = verbose
Expand All @@ -20,6 +21,7 @@ def __init__(self, verbose=False):

def grab(self, filename='rigol.png', auto_view=True):
# self.rigol().write(':STOP')
self.verbose_print('Identification: ' + self.rigol().query('*IDN?'))
buf = self.rigol().query_binary_values(':DISP:DATA? ON,0,PNG', datatype='B')
with open(filename, 'wb') as f:
self.verbose_print('Capturing screen to', filename)
Expand All @@ -36,22 +38,28 @@ def rigol(self):
inst = 'TCPIP0::{}::INSTR'
name = inst.format(opts.port)
else:
names = self._resource_manager.list_resources()
name = self.find_rigol(names)
name = self.find_rigol()
if name == None: self.err_out("Could not find Rigol. Check USB?")
self.verbose_print('Opening', name)
try:
self._rigol = self._resource_manager.open_resource(name, write_termination='\n', read_termination='\n')

'''
Following some advice from:
https://github.com/pyvisa/pyvisa/issues/481
this seems to be the maximum chunk size Rigol (reliably?)
supports over USB.
'''
self._rigol.chunk_size = 64 - 12
except:
self.err_out('Could not open oscilloscope')
return self._rigol

def find_rigol(self, names):
'''
Find resource with matching VID_PID among list of names, or None
if there is no match.
'''
return next((s for s in names if self.VID_PID in s.lower()), None)
def find_rigol(self):
# Note: VISA regular expressions are case insensitive
visa_match_expression = f'?*::(0x{self.VID:0{4}x}|{self.VID})::(0x{self.PID:0{4}x}|{self.PID})::?*::INSTR'
names = self._resource_manager.list_resources(visa_match_expression)
return names[0] if names else None

def verbose_print(self, *args):
if (self._verbose): print(*args)
Expand Down