From 514198d136cccb95b52191a22617f1c12098c9a4 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Fri, 13 Dec 2024 17:57:49 +0000 Subject: [PATCH] controller: Fix USB get_input_report on Windows --- controller/valconomy.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/controller/valconomy.py b/controller/valconomy.py index 8d0748a..8130204 100644 --- a/controller/valconomy.py +++ b/controller/valconomy.py @@ -253,12 +253,13 @@ class HIDValconomyHandler(ValconomyHandler): # 2 bytes: report ID and returned value # We get back the same report ID and value - data = self.dev.get_input_report(0, 2) + # Set to report size + 1 to satisfy W*ndoze + data = self.dev.get_input_report(0, 65) assert len(data) == 2 return data[1] == 1 - except OSError: + except OSError as ex: if self.dev is not None: - log.warn(f'USB device lost') + log.warning(f'USB device lost') self.dev = None return False @@ -286,7 +287,7 @@ class HIDValconomyHandler(ValconomyHandler): try: self._do(cmd, *vals, fmt=fmt) except OSError as ex: - log.warn(f'USB device lost, state dequeuing stalled') + log.warning(f'USB device lost, state dequeuing stalled') def run(self): while self.running: