adafruit-mirror/Adafruit_Learning_System_Guides
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change usb mouse debug prints to adafruit_logging msgs

Browse source
This commit is contained in:
RetiredWizard 2025-08-12 19:39:10 -04:00
parent a5a62a1584
commit 21ce0d8ae1
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
CircuitPython_PyPaint/code.py
View file

@ -179,10 +179,10 @@ class MousePoller(object):
"""Get 'pressed' and location updates from a USB mouse.""" """Get 'pressed' and location updates from a USB mouse."""
def __init__(self, splash, cursor_bmp, screen_width, screen_height): def __init__(self, splash, cursor_bmp, screen_width, screen_height):
logger = logging.getLogger("Paint") self._logger = logging.getLogger("Paint")
if not logger.hasHandlers(): if not self._logger.hasHandlers():
logger.addHandler(logging.StreamHandler()) self._logger.addHandler(logging.StreamHandler())
logger.debug("Creating a MousePoller") self._logger.debug("Creating a MousePoller")
self._display_grp = splash self._display_grp = splash
self._cursor_grp = displayio.Group() self._cursor_grp = displayio.Group()
self._cur_palette = displayio.Palette(3) self._cur_palette = displayio.Palette(3)
@ -217,8 +217,8 @@ class MousePoller(object):
if self.find_mouse(): if self.find_mouse():
mouse_found = True mouse_found = True
else: else:
print("WARNING: Mouse not found after multiple attempts.") self._logger.debug("WARNING: Mouse not found after multiple attempts.")
print("The application will run, but mouse control may not work.") self._logger.debug("The application will run, but mouse control may not work.")
def find_mouse(self): def find_mouse(self):
@ -227,12 +227,12 @@ class MousePoller(object):
RETRY_DELAY = 1 # seconds RETRY_DELAY = 1 # seconds
if not usb_available: if not usb_available:
print("USB library not available; cannot find mouse.") self._logger.debug("USB library not available; cannot find mouse.")
return False return False
for attempt in range(MAX_ATTEMPTS): for attempt in range(MAX_ATTEMPTS):
try: try:
print(f"Mouse detection attempt {attempt+1}/{MAX_ATTEMPTS}") self._logger.debug(f"Mouse detection attempt {attempt+1}/{MAX_ATTEMPTS}")
# Constants for USB control transfers # Constants for USB control transfers
DIR_OUT = 0 DIR_OUT = 0
@ -246,7 +246,7 @@ class MousePoller(object):
for device in usb.core.find(find_all=True): for device in usb.core.find(find_all=True):
devices_found = True devices_found = True
print(f"Found device: {device.idVendor:04x}:{device.idProduct:04x}") self._logger.debug(f"Found device: {device.idVendor:04x}:{device.idProduct:04x}")
try: try:
# Try to get device info # Try to get device info
@ -266,18 +266,18 @@ class MousePoller(object):
if has_kernel_driver and device.is_kernel_driver_active(0): if has_kernel_driver and device.is_kernel_driver_active(0):
device.detach_kernel_driver(0) device.detach_kernel_driver(0)
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
print(f"Error detaching kernel driver: {e}") self._logger.debug(f"Error detaching kernel driver: {e}")
# Set configuration # Set configuration
try: try:
device.set_configuration() device.set_configuration()
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
print(f"Error setting configuration: {e}") self._logger.debug(f"Error setting configuration: {e}")
continue # Try next device continue # Try next device
# Just assume endpoint 0x81 (common for mice) # Just assume endpoint 0x81 (common for mice)
self.in_endpoint = 0x81 self.in_endpoint = 0x81
print(f"Using mouse: {manufacturer}, {product}") self._logger.debug(f"Using mouse: {manufacturer}, {product}")
# Set to report protocol mode # Set to report protocol mode
try: try:
@ -288,49 +288,49 @@ class MousePoller(object):
buf = bytearray(1) buf = bytearray(1)
device.ctrl_transfer(bmRequestType, bRequest, wValue, wIndex, buf) device.ctrl_transfer(bmRequestType, bRequest, wValue, wIndex, buf)
print("Set to report protocol mode") self._logger.debug("Set to report protocol mode")
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
print(f"Could not set protocol: {e}") self._logger.debug(f"Could not set protocol: {e}")
# Buffer for reading data # Buffer for reading data
self.buf = array.array("B", [0] * 4) self.buf = array.array("B", [0] * 4)
print("Created 4-byte buffer for mouse data") self._logger.debug("Created 4-byte buffer for mouse data")
# Verify mouse works by reading from it # Verify mouse works by reading from it
try: try:
# Try to read some data with a short timeout # Try to read some data with a short timeout
data = device.read(self.in_endpoint, self.buf, timeout=100) data = device.read(self.in_endpoint, self.buf, timeout=100)
print(f"Mouse test read successful: {data} bytes") self._logger.debug(f"Mouse test read successful: {data} bytes")
return True return True
except usb.core.USBTimeoutError: except usb.core.USBTimeoutError:
# Timeout is normal if mouse isn't moving # Timeout is normal if mouse isn't moving
print("Mouse connected but not sending data (normal)") self._logger.debug("Mouse connected but not sending data (normal)")
return True return True
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
print(f"Mouse test read failed: {e}") self._logger.debug(f"Mouse test read failed: {e}")
# Continue to try next device or retry # Continue to try next device or retry
self.mouse = None self.mouse = None
self.in_endpoint = None self.in_endpoint = None
continue continue
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
print(f"Error initializing device: {e}") self._logger.debug(f"Error initializing device: {e}")
continue continue
if not devices_found: if not devices_found:
print("No USB devices found") self._logger.debug("No USB devices found")
# If we get here without returning, no suitable mouse was found # If we get here without returning, no suitable mouse was found
print(f"No working mouse found on attempt {attempt+1}, retrying...") self._logger.debug(f"No working mouse found on attempt {attempt+1}, retrying...")
gc.collect() gc.collect()
time.sleep(RETRY_DELAY) time.sleep(RETRY_DELAY)
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
print(f"Error during mouse detection: {e}") self._logger.debug(f"Error during mouse detection: {e}")
gc.collect() gc.collect()
time.sleep(RETRY_DELAY) time.sleep(RETRY_DELAY)
print("Failed to find a working mouse after multiple attempts") self._logger.debug("Failed to find a working mouse after multiple attempts")
return False return False
@ -381,14 +381,14 @@ class MousePoller(object):
# Handle disconnections # Handle disconnections
if e.errno == 19: # No such device if e.errno == 19: # No such device
print("Mouse disconnected") self._logger.debug("Mouse disconnected")
self.mouse = None self.mouse = None
self.in_endpoint = None self.in_endpoint = None
gc.collect() gc.collect()
return False return False
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
print(f"Error reading mouse: {type(e).__name__}") self._logger.debug(f"Error reading mouse: {type(e).__name__}")
return False return False
if count >= 3: # We need at least buttons, X and Y if count >= 3: # We need at least buttons, X and Y