Skip to content

libwiikeyboard - track multiple devices reporting a keyboard HID descriptor #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dborth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libwiikeyboard - track multiple devices reporting a keyboard HID descriptor #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions libwiikeyboard/keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,20 +370,24 @@ static void _kbd_event_cb(USBKeyboard_event kevent)
return;
}

//This function call usb function to check if a new keyboard is connected
//This function call usb function to check if new keyboards are connected
static s32 _kbd_scan_for_keyboard(void)
{
s32 ret;
s32 ret, i;
keyboard_event event;
bool first = !USBKeyboard_IsConnected();

ret = USBKeyboard_Open(&_kbd_event_cb);

if (ret < 0)
return ret;

_modifiers = 0;
_composelen = 0;
memset(_held, 0, sizeof(_held));
// keys held on a keyboard that is already connected are still held
if (first) {
_modifiers = 0;
_composelen = 0;
memset(_held, 0, sizeof(_held));
}

USBKeyboard_SetLed(USBKEYBOARD_LEDNUM, true);
USBKeyboard_SetLed(USBKEYBOARD_LEDCAPS, true);
Expand All @@ -397,7 +401,9 @@ static s32 _kbd_scan_for_keyboard(void)
event.modifiers = 0;
event.keycode = 0;

_kbd_addEvent(&event);
// one event for each keyboard that was opened
for (i = 0; i < ret; i++)
_kbd_addEvent(&event);

return ret;
}
Expand All @@ -406,10 +412,11 @@ static void * _kbd_thread_func(void *arg) {
u32 turns = 0;

while (!_kbd_thread_quit) {
// scan for new attached keyboards
// scan for new attached keyboards, also while there is one already:
// a second keyboard can be attached, and a device that has a keyboard
// interface is not necessarily the keyboard that is going to be used
if ((turns % KBD_THREAD_KBD_SCAN_INTERVAL) == 0) {
if (!USBKeyboard_IsConnected())
_kbd_scan_for_keyboard();
_kbd_scan_for_keyboard();

turns = 0;
}
Expand Down
Loading