From f6bc1c466eed09dd429819bebba386625c7783ea Mon Sep 17 00:00:00 2001 From: HappyYusuke Date: Wed, 24 May 2023 13:59:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?python=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- respeaker/firmware/tuning.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/respeaker/firmware/tuning.py b/respeaker/firmware/tuning.py index c1ed7fe..b0b2d8e 100755 --- a/respeaker/firmware/tuning.py +++ b/respeaker/firmware/tuning.py @@ -106,7 +106,7 @@ def read(self, name): usb.util.CTRL_IN | usb.util.CTRL_TYPE_VENDOR | usb.util.CTRL_RECIPIENT_DEVICE, 0, cmd, id, length, self.TIMEOUT) - response = struct.unpack(b'ii', response.tostring()) + response = struct.unpack(b'ii', response.tobytes()) if data[2] == 'int': result = response[0] From ef74d772f7e3c62228beb384a3e408286be94cb9 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Wed, 24 May 2023 05:12:10 +0000 Subject: [PATCH 2/2] 'Refactored by Sourcery' --- respeaker/firmware/tuning.py | 38 +++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/respeaker/firmware/tuning.py b/respeaker/firmware/tuning.py index b0b2d8e..2c4f2d3 100755 --- a/respeaker/firmware/tuning.py +++ b/respeaker/firmware/tuning.py @@ -74,7 +74,7 @@ def write(self, name, value): return if data[5] == 'ro': - raise ValueError('{} is read-only'.format(name)) + raise ValueError(f'{name} is read-only') id = data[0] @@ -108,12 +108,7 @@ def read(self, name): response = struct.unpack(b'ii', response.tobytes()) - if data[2] == 'int': - result = response[0] - else: - result = response[0] * (2.**response[1]) - - return result + return response[0] if data[2] == 'int' else response[0] * (2.**response[1]) def set_vad_threshold(self, db): self.write('GAMMAVAD_SR', db) @@ -139,20 +134,19 @@ def close(self): def find(vid=0x2886, pid=0x0018): - dev = usb.core.find(idVendor=vid, idProduct=pid) - if not dev: - return + if dev := usb.core.find(idVendor=vid, idProduct=pid): + # configuration = dev.get_active_configuration() - # configuration = dev.get_active_configuration() + # interface_number = None + # for interface in configuration: + # interface_number = interface.bInterfaceNumber - # interface_number = None - # for interface in configuration: - # interface_number = interface.bInterfaceNumber + # if dev.is_kernel_driver_active(interface_number): + # dev.detach_kernel_driver(interface_number) - # if dev.is_kernel_driver_active(interface_number): - # dev.detach_kernel_driver(interface_number) - - return Tuning(dev) + return Tuning(dev) + else: + return @@ -165,7 +159,7 @@ def main(): data = PARAMETERS[name] print('{:16}\t{}'.format(name, b'\t'.join([str(i) for i in data[2:7]]))) for extra in data[7:]: - print('{}{}'.format(' '*60, extra)) + print(f"{' ' * 60}{extra}") else: dev = find() if not dev: @@ -184,10 +178,10 @@ def main(): if name in PARAMETERS: if len(sys.argv) > 2: dev.write(name, sys.argv[2]) - - print('{}: {}'.format(name, dev.read(name))) + + print(f'{name}: {dev.read(name)}') else: - print('{} is not a valid name'.format(name)) + print(f'{name} is not a valid name') dev.close() else: