uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't put more scancodes into the individual reports than possible.

Browse Source
This commit is contained in:
László Monda
2017-03-03 23:01:26 +01:00
parent f83d655c15
commit a2bd0cf602
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
right/src/usb_report_updater.c
View File

@@ -72,7 +72,8 @@ void UpdateActiveUsbReports() {
bzero(&UsbMouseReport, sizeof(usb_mouse_report_t)); bzero(&UsbMouseReport, sizeof(usb_mouse_report_t));
uint8_t scancodeIdx = 0; uint8_t basicScancodeIndex = 0;
uint8_t mediaScancodeIndex = 0;
activeLayer = LAYER_ID_BASE; activeLayer = LAYER_ID_BASE;
for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) { for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
@@ -97,12 +98,19 @@ void UpdateActiveUsbReports() {
switch (action.type) { switch (action.type) {
case KEY_ACTION_KEYSTROKE: case KEY_ACTION_KEYSTROKE:
ActiveUsbBasicKeyboardReport->modifiers |= action.keystroke.modifiers; ActiveUsbBasicKeyboardReport->modifiers |= action.keystroke.modifiers;
switch (action.keystroke.keystrokeType) { switch (action.keystroke.keystrokeType) {
case KEYSTROKE_BASIC: case KEYSTROKE_BASIC:
ActiveUsbBasicKeyboardReport->scancodes[scancodeIdx++] = action.keystroke.scancode; if (basicScancodeIndex >= USB_BASIC_KEYBOARD_MAX_KEYS) {
break;
}
ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = action.keystroke.scancode;
break; break;
case KEYSTROKE_MEDIA: case KEYSTROKE_MEDIA:
ActiveUsbMediaKeyboardReport->scancodes[scancodeIdx++] = action.keystroke.scancode; if (mediaScancodeIndex >= USB_MEDIA_KEYBOARD_MAX_KEYS) {
break;
}
ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = action.keystroke.scancode;
break; break;
} }
break; break;