Skip to content

Commit a9b94fe

Browse files
committed
Cleanup version number acquisition and comparison code.
1 parent 535e87d commit a9b94fe

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

labscript_devices/PrawnBlaster/blacs_workers.py

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ def init(self):
7272
assert self.prawnblaster.readline().decode() == "ok\r\n"
7373

7474
# Check if fast serial is available
75-
self.fast_serial = self.version_greater_than((1, 1, 0))
75+
version, _ = self.get_version()
76+
self.fast_serial = version >= (1, 1, 0)
7677

7778
def get_version(self):
7879
self.prawnblaster.write(b"version\r\n")
@@ -86,24 +87,10 @@ def get_version(self):
8687
if version_overclock_list[1] == 'overclock':
8788
overclock = True
8889

89-
version_number = version_overclock_list[0].split('.')
90-
assert len(version_number) == 3
91-
92-
return (int(version_number[0]), int(version_number[1]), int(version_number[2]), overclock)
93-
94-
def version_greater_than(self, target_version):
95-
version = self.get_version()
96-
if version[0] > target_version[0]:
97-
return True
98-
if version[0] < target_version[0]:
99-
return False
100-
if version[1] > target_version[1]:
101-
return True
102-
if version[1] < target_version[1]:
103-
return False
104-
if version[2] >= target_version[2]:
105-
return True
106-
return False
90+
version = tuple(int(v) for v in version_overclock_list[0].split('.'))
91+
assert len(version) == 3
92+
93+
return version, overclock
10794

10895
def check_status(self):
10996
"""Checks the operational status of the PrawnBlaster.

0 commit comments

Comments
 (0)