adafruit-mirror/Fruit-Jam-OS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #34 from FoamyGuy/editor_keyboardmouse_combo_fix
Some checks failed
Validate Build / validate-build (push) Has been cancelled
Details

Browse source 
only try to find mouse if there are at least 2 USB devices in editor.
This commit is contained in:
foamyguy 2025-08-02 11:32:32 -05:00 committed by GitHub
commit d7302ea2a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
builtin_apps/editor/code.py
View file

@ -3,13 +3,14 @@ import os
import supervisor import supervisor
from displayio import Group, Palette, TileGrid from displayio import Group, Palette, TileGrid
import terminalio
from adafruit_display_text.bitmap_label import Label from adafruit_display_text.bitmap_label import Label
from adafruit_editor import editor, picker from adafruit_editor import editor, picker
from tilepalettemapper import TilePaletteMapper from tilepalettemapper import TilePaletteMapper
from adafruit_argv_file import read_argv, write_argv from adafruit_argv_file import read_argv, write_argv
from adafruit_fruitjam.peripherals import request_display_config from adafruit_fruitjam.peripherals import request_display_config
from adafruit_usb_host_mouse import find_and_init_boot_mouse from adafruit_usb_host_mouse import find_and_init_boot_mouse
import terminalio
import usb
print(f"cwd in editor/code.py: {os.getcwd()}") print(f"cwd in editor/code.py: {os.getcwd()}")
@ -25,7 +26,6 @@ font_palette = Palette(2)
font_palette[0] = 0x000000 font_palette[0] = 0x000000
font_palette[1] = 0xFFFFFF font_palette[1] = 0xFFFFFF
font = terminalio.FONT font = terminalio.FONT
char_size = font.get_bounding_box() char_size = font.get_bounding_box()
screen_size = (display.width // char_size[0], display.height // char_size[1]) screen_size = (display.width // char_size[0], display.height // char_size[1])
@ -62,7 +62,14 @@ if args is not None and len(args) > 0:
else: else:
file = picker.pick_file(terminal) file = picker.pick_file(terminal)
usb_device_count = 0
for dev in usb.core.find(find_all=True):
usb_device_count += 1
mouse = None
if usb_device_count > 1:
mouse = find_and_init_boot_mouse() mouse = find_and_init_boot_mouse()
if mouse is not None: if mouse is not None:
mouse.x = display.width - 6 mouse.x = display.width - 6
main_group.append(mouse.tilegrid) main_group.append(mouse.tilegrid)