Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion socs/agents/srs_cg635/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ def acq(self, session, params):
data['data']['Standard_CMOS_Output'] = stdc
data['data']['Running_State'] = runs
data['data']['Timebase'] = timb

except socket.timeout as e:
self.log.error(f"Timeout in retrieving clock data: {e}")
self.clock = None
Expand Down
11 changes: 8 additions & 3 deletions socs/agents/srs_cg635/drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,14 @@ def get_timebase(self):

def get_all_status(self):
self.write("FREQ?;STDC?;RUNS?;TIMB?")
freq, stdc, runs, timb = self.read().split(';')

return float(freq), int(stdc), int(runs), int(timb)
output = self.read()

try:
freq, stdc, runs, timb = output.split(';')
return float(freq), int(stdc), int(runs), int(timb)
except ValueError:
self.clear()
return self.get_freq(), self.get_stdc(), self.get_runs(), self.get_timebase()

def clear(self):
"""Clear all the event registers and error queue."""
Expand Down