Use KEY_ACTION_KEYSTROKE instead of KEY_ACTION_{BASIC,MEDIA}_KEYSTROKE. Add keystroke_type_t.

This commit is contained in:
László Monda
2017-03-03 22:49:20 +01:00
parent d2e3d6becf
commit fdb13d3a7e
4 changed files with 152 additions and 142 deletions

View File

@@ -95,12 +95,16 @@ void UpdateActiveUsbReports() {
key_action_t action = CurrentKeymap[activeLayer][slotId][keyId];
switch (action.type) {
case KEY_ACTION_BASIC_KEYSTROKE:
ActiveUsbBasicKeyboardReport->scancodes[scancodeIdx++] = action.keystroke.scancode;
case KEY_ACTION_KEYSTROKE:
ActiveUsbBasicKeyboardReport->modifiers |= action.keystroke.modifiers;
break;
case KEY_ACTION_MEDIA_KEYSTROKE:
ActiveUsbMediaKeyboardReport->scancodes[scancodeIdx++] = action.keystroke.scancode;
switch (action.keystroke.keystrokeType) {
case KEYSTROKE_BASIC:
ActiveUsbBasicKeyboardReport->scancodes[scancodeIdx++] = action.keystroke.scancode;
break;
case KEYSTROKE_MEDIA:
ActiveUsbMediaKeyboardReport->scancodes[scancodeIdx++] = action.keystroke.scancode;
break;
}
break;
case KEY_ACTION_MOUSE:
processMouseAction(action);