From 0c404f324df8d87ae0b40279d6bb772a37ef566b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 2 Jan 2017 21:25:38 +0100 Subject: [PATCH] Rename a couple of key action related type names and enum values. --- right/src/action.c | 46 +-- right/src/action.h | 53 ++- right/src/default_layout.c | 562 ++++++++++++++++---------------- right/src/usb_interface_mouse.c | 2 +- 4 files changed, 330 insertions(+), 333 deletions(-) diff --git a/right/src/action.c b/right/src/action.c index 92f5ddb..f289d6c 100644 --- a/right/src/action.c +++ b/right/src/action.c @@ -8,20 +8,20 @@ static uint8_t keyMasks[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; static uint8_t ActiveLayer = LAYER_ID_BASE; uint8_t prevKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; -static inline __attribute__((always_inline)) uhk_key_t getKeycode(uint8_t slotId, uint8_t keyId) +static inline __attribute__((always_inline)) key_action_t getKeycode(uint8_t slotId, uint8_t keyId) { if (keyId < MAX_KEY_COUNT_PER_MODULE) { if (keyMasks[slotId][keyId]!=0 && keyMasks[slotId][keyId]!=ActiveLayer) { // Mask out key presses after releasing modifier keys - return (uhk_key_t){.type = UHK_KEY_NONE}; + return (key_action_t){.type = KEY_ACTION_NONE}; } - uhk_key_t key = CurrentKeymap[ActiveLayer][slotId][keyId]; + key_action_t key = CurrentKeymap[ActiveLayer][slotId][keyId]; keyMasks[slotId][keyId] = ActiveLayer; return key; } else { - return (uhk_key_t){.type = UHK_KEY_NONE}; + return (key_action_t){.type = KEY_ACTION_NONE}; } } @@ -38,8 +38,8 @@ static void clearKeymasks(const uint8_t *leftKeyStates, const uint8_t *rightKeyS } } -static bool pressKey(uhk_key_t key, int scancodeIdx, usb_keyboard_report_t *report) { - if (key.type != UHK_KEY_SIMPLE) { +static bool pressKey(key_action_t key, int scancodeIdx, usb_keyboard_report_t *report) { + if (key.type != KEY_ACTION_KEYSTROKE) { return false; } @@ -69,14 +69,14 @@ static bool hasKeyReleased(const uint8_t *prevKeyStates, const uint8_t *currKeyS return (!currKeyStates[keyId]) && prevKeyStates[keyId]; } -static bool handleKey(uhk_key_t key, int scancodeIdx, usb_keyboard_report_t *report, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { +static bool handleKey(key_action_t key, int scancodeIdx, usb_keyboard_report_t *report, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { switch (key.type) { - case UHK_KEY_SIMPLE: + case KEY_ACTION_KEYSTROKE: if (isKeyPressed(prevKeyStates, currKeyStates, keyId)) { return pressKey(key, scancodeIdx, report); } break; - case UHK_KEY_LAYER: + case KEY_ACTION_SWITCH_LAYER: if (hasKeyPressed(prevKeyStates, currKeyStates, keyId)) { ActiveLayer = key.layer.target; } @@ -97,7 +97,7 @@ static uint8_t mouseSpeedAccelDivisorCounter = 0; static uint8_t mouseSpeed = 3; static bool wasPreviousMouseActionWheelAction = false; -static void handleMouseKey(usb_mouse_report_t *report, uhk_key_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) +static void handleMouseKey(usb_mouse_report_t *report, key_action_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { if (!isKeyPressed(prevKeyStates, currKeyStates, keyId)) { return; @@ -112,43 +112,43 @@ static void handleMouseKey(usb_mouse_report_t *report, uhk_key_t key, const uint if (key.mouse.scrollActions) { if (mouseWheelDivisorCounter == MOUSE_WHEEL_DIVISOR) { mouseWheelDivisorCounter = 0; - if (key.mouse.scrollActions & UHK_MOUSE_SCROLL_UP) { + if (key.mouse.scrollActions & MOUSE_SCROLL_UP) { report->wheelX = 1; } - if (key.mouse.scrollActions & UHK_MOUSE_SCROLL_DOWN) { + if (key.mouse.scrollActions & MOUSE_SCROLL_DOWN) { report->wheelX = -1; } } } - if (key.mouse.moveActions & UHK_MOUSE_ACCELERATE || key.mouse.moveActions & UHK_MOUSE_DECELERATE) { + if (key.mouse.moveActions & MOUSE_ACCELERATE || key.mouse.moveActions & MOUSE_DECELERATE) { mouseSpeedAccelDivisorCounter++; if (mouseSpeedAccelDivisorCounter == MOUSE_SPEED_ACCEL_DIVISOR) { mouseSpeedAccelDivisorCounter = 0; - if (key.mouse.moveActions & UHK_MOUSE_ACCELERATE) { + if (key.mouse.moveActions & MOUSE_ACCELERATE) { if (mouseSpeed < MOUSE_MAX_SPEED) { mouseSpeed++; } } - if (key.mouse.moveActions & UHK_MOUSE_DECELERATE) { + if (key.mouse.moveActions & MOUSE_DECELERATE) { if (mouseSpeed > 1) { mouseSpeed--; } } } } else if (key.mouse.moveActions) { - if (key.mouse.moveActions & UHK_MOUSE_MOVE_LEFT) { + if (key.mouse.moveActions & MOUSE_MOVE_LEFT) { report->x = -mouseSpeed; } - if (key.mouse.moveActions & UHK_MOUSE_MOVE_RIGHT) { + if (key.mouse.moveActions & MOUSE_MOVE_RIGHT) { report->x = mouseSpeed; } - if (key.mouse.moveActions & UHK_MOUSE_MOVE_UP) { + if (key.mouse.moveActions & MOUSE_MOVE_UP) { report->y = -mouseSpeed; } - if (key.mouse.moveActions & UHK_MOUSE_MOVE_DOWN) { + if (key.mouse.moveActions & MOUSE_MOVE_DOWN) { report->y = mouseSpeed; } } @@ -168,9 +168,9 @@ void HandleKeyboardEvents(usb_keyboard_report_t *keyboardReport, usb_mouse_repor break; } - uhk_key_t code = getKeycode(SLOT_ID_RIGHT_KEYBOARD_HALF, keyId); + key_action_t code = getKeycode(SLOT_ID_RIGHT_KEYBOARD_HALF, keyId); - if (code.type == UHK_KEY_MOUSE) { + if (code.type == KEY_ACTION_MOUSE) { handleMouseKey(mouseReport, code, prevKeyStates[SLOT_ID_RIGHT_KEYBOARD_HALF], rightKeyStates, keyId); } else { if (handleKey(code, scancodeIdx, keyboardReport, prevKeyStates[SLOT_ID_RIGHT_KEYBOARD_HALF], rightKeyStates, keyId)) { @@ -184,9 +184,9 @@ void HandleKeyboardEvents(usb_keyboard_report_t *keyboardReport, usb_mouse_repor break; } - uhk_key_t code = getKeycode(SLOT_ID_LEFT_KEYBOARD_HALF, keyId); + key_action_t code = getKeycode(SLOT_ID_LEFT_KEYBOARD_HALF, keyId); - if (code.type == UHK_KEY_MOUSE) { + if (code.type == KEY_ACTION_MOUSE) { handleMouseKey(mouseReport, code, prevKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], leftKeyStates, keyId); } else { if (handleKey(code, scancodeIdx, keyboardReport, prevKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], leftKeyStates, keyId)) { diff --git a/right/src/action.h b/right/src/action.h index 823bd88..a68985f 100644 --- a/right/src/action.h +++ b/right/src/action.h @@ -22,41 +22,38 @@ #define KEY_STATE_COUNT (5*7) typedef enum { - UHK_KEY_NONE, - UHK_KEY_SIMPLE, - UHK_KEY_MOUSE, - UHK_KEY_LAYER, - UHK_KEY_LAYER_TOGGLE, - UHK_KEY_KEYMAP, - UHK_KEY_MACRO, - UHK_KEY_LPRESSMOD, - UHK_KEY_LPRESSLAYER, -} uhk_key_type_t; + KEY_ACTION_NONE, + KEY_ACTION_KEYSTROKE, + KEY_ACTION_MOUSE, + KEY_ACTION_SWITCH_LAYER, + KEY_ACTION_SWITCH_KEYMAP, + KEY_ACTION_PLAY_MACRO, +} key_action_type_t; enum { - UHK_MOUSE_BUTTON_LEFT = (1 << 0), - UHK_MOUSE_BUTTON_RIGHT = (1 << 1), - UHK_MOUSE_BUTTON_MIDDLE = (1 << 2), - UHK_MOUSE_BUTTON_4 = (1 << 3), - UHK_MOUSE_BUTTON_5 = (1 << 4), - UHK_MOUSE_BUTTON_6 = (1 << 5), + MOUSE_BUTTON_LEFT = (1 << 0), + MOUSE_BUTTON_RIGHT = (1 << 1), + MOUSE_BUTTON_MIDDLE = (1 << 2), + MOUSE_BUTTON_4 = (1 << 3), + MOUSE_BUTTON_5 = (1 << 4), + MOUSE_BUTTON_6 = (1 << 5), }; enum { - UHK_MOUSE_MOVE_UP = (1 << 0), - UHK_MOUSE_MOVE_DOWN = (1 << 1), - UHK_MOUSE_MOVE_LEFT = (1 << 2), - UHK_MOUSE_MOVE_RIGHT = (1 << 3), + MOUSE_MOVE_UP = (1 << 0), + MOUSE_MOVE_DOWN = (1 << 1), + MOUSE_MOVE_LEFT = (1 << 2), + MOUSE_MOVE_RIGHT = (1 << 3), - UHK_MOUSE_ACCELERATE = (1 << 4), - UHK_MOUSE_DECELERATE = (1 << 5), + MOUSE_ACCELERATE = (1 << 4), + MOUSE_DECELERATE = (1 << 5), }; enum { - UHK_MOUSE_SCROLL_UP = (1 << 0), - UHK_MOUSE_SCROLL_DOWN = (1 << 1), - UHK_MOUSE_SCROLL_LEFT = (1 << 2), - UHK_MOUSE_SCROLL_RIGHT = (1 << 3), + MOUSE_SCROLL_UP = (1 << 0), + MOUSE_SCROLL_DOWN = (1 << 1), + MOUSE_SCROLL_LEFT = (1 << 2), + MOUSE_SCROLL_RIGHT = (1 << 3), }; #define MOUSE_WHEEL_SPEED 1 @@ -101,10 +98,10 @@ typedef struct { uint8_t key; } __attribute__ ((packed)) longpressLayer; }; -} __attribute__ ((packed)) uhk_key_t; +} __attribute__ ((packed)) key_action_t; extern uint8_t prevKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; -extern uhk_key_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; +extern key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; void HandleKeyboardEvents(usb_keyboard_report_t *keyboardReport, usb_mouse_report_t *mouseReport, const uint8_t *leftKeyStates, const uint8_t *rightKeyStates); diff --git a/right/src/default_layout.c b/right/src/default_layout.c index ee6bd4d..7207ede 100644 --- a/right/src/default_layout.c +++ b/right/src/default_layout.c @@ -1,102 +1,102 @@ #include "action.h" -uhk_key_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { +key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { // Layer 0 { // Right { // Row 1 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_7_AND_AMPERSAND }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_8_AND_ASTERISK }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_EQUAL_AND_PLUS }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_BACKSPACE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_7_AND_AMPERSAND }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_8_AND_ASTERISK }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_EQUAL_AND_PLUS }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_BACKSPACE }}, // Row 2 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_U }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_I }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_O }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_P }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_BACKSLASH_AND_PIPE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_Y }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_U }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_I }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_O }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_P }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_BACKSLASH_AND_PIPE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_Y }}, // Row 3 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_J }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_K }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_L }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_SEMICOLON_AND_COLON }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_ENTER }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_H }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_J }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_K }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_L }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SEMICOLON_AND_COLON }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_ENTER }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_H }}, // Row 4 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_N }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_M }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_N }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_M }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KEY_ACTION_NONE }, // Row 5 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_SPACE }}, - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_MOD }}, - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_FN }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SPACE }}, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOD }}, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_FN }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left { // Row 1 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_1_AND_EXCLAMATION }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_2_AND_AT }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_3_AND_HASHMARK }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_4_AND_DOLLAR }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_5_AND_PERCENTAGE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_6_AND_CARET }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_1_AND_EXCLAMATION }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_2_AND_AT }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_3_AND_HASHMARK }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_4_AND_DOLLAR }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_5_AND_PERCENTAGE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_6_AND_CARET }}, // Row 2 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_TAB }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_Q }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_W }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_E }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_R }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_T }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_TAB }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_Q }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_W }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_E }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_R }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_T }}, // Row 3 - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_MOUSE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_A }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_S }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_D }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_G }}, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOUSE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_A }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_S }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_D }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_G }}, // Row 4 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_Z }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_X }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_C }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_V }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_B }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_Z }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_X }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_C }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_V }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_B }}, // Row 5 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_FN }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_SPACE }}, - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_MOD }}, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_FN }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SPACE }}, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOD }}, + { .type = KEY_ACTION_NONE }, } }, @@ -105,97 +105,97 @@ uhk_key_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { // Right { // Row 1 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F7 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F8 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F9 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F10 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F11 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F12 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_DELETE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F7 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F8 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F9 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F10 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F11 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F12 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_DELETE }}, // Row 2 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_HOME }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_UP_ARROW }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_END }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_DELETE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_PRINT_SCREEN }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_SCROLL_LOCK }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_PAUSE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_PAGE_UP }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_HOME }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_UP_ARROW }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_END }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_DELETE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PRINT_SCREEN }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_SCROLL_LOCK }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAUSE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAGE_UP }}, // Row 3 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ARROW }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_DOWN_ARROW }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ARROW }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_INSERT }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_PAGE_DOWN }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ARROW }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_DOWN_ARROW }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ARROW }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_INSERT }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAGE_DOWN }}, // Row 4 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KEY_ACTION_NONE }, // Row 5 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_MOD }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOD }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left { // Row 1 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_ESCAPE }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F1 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F2 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F3 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F4 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F5 }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_F6 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_ESCAPE }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F1 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F2 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F3 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F4 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F5 }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_F6 }}, // Row 2 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_PAGE_UP, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [<] tab prev - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_T, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [+] tab new - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_PAGE_DOWN, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [>] tab next - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAGE_UP, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [<] tab prev + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_T, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [+] tab new + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_PAGE_DOWN, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [>] tab next + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 3 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ARROW, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace prev - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_TAB, .mods = HID_KEYBOARD_MODIFIER_LEFTALT }}, // Window switch? - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ARROW, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace next - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ARROW, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace prev + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_TAB, .mods = HID_KEYBOARD_MODIFIER_LEFTALT }}, // Window switch? + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ARROW, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace next + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 4 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_W, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [x] tab close - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_W, .mods = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [x] tab close + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 5 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_MOD }}, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOD }}, + { .type = KEY_ACTION_NONE }, } }, @@ -204,97 +204,97 @@ uhk_key_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { // Right { // Row 1 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 2 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_PLAY }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_VOLUME_UP }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_STOP }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_SLEEP }}, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_PLAY }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_VOLUME_UP }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_STOP }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_SLEEP }}, + { .type = KEY_ACTION_NONE }, // Row 3 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_PREVIOUS_TRACK }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_VOLUME_DOWN }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_NEXT_TRACK }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_PREVIOUS_TRACK }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_VOLUME_DOWN }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_NEXT_TRACK }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 4 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_MUTE }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_MUTE }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KEY_ACTION_NONE }, // Row 5 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_FN }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_FN }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left { // Row 1 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 2 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_STOP }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_RELOAD }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_STOP }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_RELOAD }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 3 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, // TODO: hist- - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_WWW }}, - { .type = UHK_KEY_NONE }, // TODO: hist+ - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // TODO: hist- + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_WWW }}, + { .type = KEY_ACTION_NONE }, // TODO: hist+ + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 4 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_LOCK }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_SEARCH }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_CALCULATOR }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_EJECT }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_LOCK }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_SEARCH }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_CALCULATOR }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_MEDIA_EJECT }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 5 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_FN }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_FN }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, } }, @@ -303,97 +303,97 @@ uhk_key_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { // Right { // Row 1 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 2 - { .type = UHK_KEY_MOUSE, .mouse = { .buttonActions = UHK_MOUSE_BUTTON_4 }}, - { .type = UHK_KEY_MOUSE, .mouse = { .moveActions = UHK_MOUSE_MOVE_UP }}, - { .type = UHK_KEY_MOUSE, .mouse = { .buttonActions = UHK_MOUSE_BUTTON_5 }}, - { .type = UHK_KEY_MOUSE, .mouse = { .buttonActions = UHK_MOUSE_BUTTON_6 }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_MOUSE, .mouse = { .scrollActions = UHK_MOUSE_SCROLL_UP }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_4 }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_MOVE_UP }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_5 }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_6 }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_MOUSE, .mouse = { .scrollActions = MOUSE_SCROLL_UP }}, // Row 3 - { .type = UHK_KEY_MOUSE, .mouse = { .moveActions = UHK_MOUSE_MOVE_LEFT }}, - { .type = UHK_KEY_MOUSE, .mouse = { .moveActions = UHK_MOUSE_MOVE_DOWN }}, - { .type = UHK_KEY_MOUSE, .mouse = { .moveActions = UHK_MOUSE_MOVE_RIGHT }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_MOUSE, .mouse = { .scrollActions = UHK_MOUSE_SCROLL_DOWN }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_MOVE_LEFT }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_MOVE_DOWN }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_MOVE_RIGHT }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_MOUSE, .mouse = { .scrollActions = MOUSE_SCROLL_DOWN }}, // Row 4 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KEY_ACTION_NONE }, // Row 5 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left { // Row 1 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 2 - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 3 - { .type = UHK_KEY_LAYER, .layer = { .target = LAYER_ID_MOUSE }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_MOUSE, .mouse = { .buttonActions = UHK_MOUSE_BUTTON_LEFT }}, - { .type = UHK_KEY_MOUSE, .mouse = { .buttonActions = UHK_MOUSE_BUTTON_MIDDLE }}, - { .type = UHK_KEY_MOUSE, .mouse = { .buttonActions = UHK_MOUSE_BUTTON_RIGHT }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_SWITCH_LAYER, .layer = { .target = LAYER_ID_MOUSE }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_LEFT }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_MIDDLE }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_RIGHT }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 4 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_NONE }, // Row 5 - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = UHK_KEY_SIMPLE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = UHK_KEY_NONE }, - { .type = UHK_KEY_MOUSE, .mouse = { .moveActions = UHK_MOUSE_DECELERATE }}, - { .type = UHK_KEY_MOUSE, .mouse = { .moveActions = UHK_MOUSE_ACCELERATE }}, - { .type = UHK_KEY_NONE }, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KEY_ACTION_KEYSTROKE, .simple = { .key = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_DECELERATE }}, + { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_ACCELERATE }}, + { .type = KEY_ACTION_NONE }, } }, diff --git a/right/src/usb_interface_mouse.c b/right/src/usb_interface_mouse.c index 263c4b1..54fe710 100644 --- a/right/src/usb_interface_mouse.c +++ b/right/src/usb_interface_mouse.c @@ -53,7 +53,7 @@ static volatile usb_status_t UsbMouseAction(void) return ret; } -void fillMouseReport(uhk_key_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) +void fillMouseReport(key_action_t key, const uint8_t *prevKeyStates, const uint8_t *currKeyStates, uint8_t keyId) { HandleMouseKey(&UsbMouseReport, key, prevKeyStates, currKeyStates, keyId); }