From 976444b5fec71a805e1ce702f515f37cddadf84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Thu, 15 Jun 2017 19:14:05 +0200 Subject: [PATCH] Rename key action related enums and values to be easier to read. --- right/src/action.h | 70 ++-- right/src/config/parse_keymap.c | 42 +-- right/src/current_keymap.c | 560 ++++++++++++++++---------------- right/src/usb_report_updater.c | 32 +- 4 files changed, 352 insertions(+), 352 deletions(-) diff --git a/right/src/action.h b/right/src/action.h index dad5513..2d042d9 100644 --- a/right/src/action.h +++ b/right/src/action.h @@ -9,46 +9,46 @@ #include "module.h" typedef enum { - KEY_ACTION_NONE, - KEY_ACTION_KEYSTROKE, - KEY_ACTION_MOUSE, - KEY_ACTION_SWITCH_LAYER, - KEY_ACTION_SWITCH_KEYMAP, - KEY_ACTION_PLAY_MACRO, - KEY_ACTION_TEST, + KeyActionType_None, + KeyActionType_Keystroke, + KeyActionType_Mouse, + KeyActionType_SwitchLayer, + KeyActionType_SwitchKeymap, + KeyActionType_PlayMacro, + KeyActionType_Test, } key_action_type_t; typedef enum { - KEYSTROKE_BASIC, - KEYSTROKE_MEDIA, - KEYSTROKE_SYSTEM, + KeystrokeType_Basic, + KeystrokeType_Media, + KeystrokeType_System, } keystroke_type_t; -enum { - 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), -}; +typedef enum { + MouseButton_Left = 1 << 0, + MouseButton_Right = 1 << 1, + MouseButton_Middle = 1 << 2, + MouseButton_4 = 1 << 3, + MouseButton_5 = 1 << 4, + MouseButton_t = 1 << 5, +} mouse_button_t; -enum { - MOUSE_MOVE_UP = (1 << 0), - MOUSE_MOVE_DOWN = (1 << 1), - MOUSE_MOVE_LEFT = (1 << 2), - MOUSE_MOVE_RIGHT = (1 << 3), +typedef enum { + MouseMove_Up = 1 << 0, + MouseMove_Down = 1 << 1, + MouseMove_Left = 1 << 2, + MouseMove_Right = 1 << 3, - MOUSE_ACCELERATE = (1 << 4), - MOUSE_DECELERATE = (1 << 5), -}; + MouseMove_Accelerate = 1 << 4, + MouseMove_Decelerate = 1 << 5, +} mouse_move_action_t; -enum { - MOUSE_SCROLL_UP = (1 << 0), - MOUSE_SCROLL_DOWN = (1 << 1), - MOUSE_SCROLL_LEFT = (1 << 2), - MOUSE_SCROLL_RIGHT = (1 << 3), -}; +typedef enum { + MouseScroll_Up = 1 << 0, + MouseScroll_Down = 1 << 1, + MouseScroll_Left = 1 << 2, + MouseScroll_Right = 1 << 3, +} mouse_scroll_t; typedef enum { TestAction_DisableUsb, @@ -75,9 +75,9 @@ typedef struct { uint16_t scancode; } __attribute__ ((packed)) keystroke; struct { - uint8_t buttonActions; - uint8_t scrollActions; - uint8_t moveActions; + mouse_button_t buttonActions; + mouse_scroll_t scrollActions; + mouse_move_action_t moveActions; } __attribute__ ((packed)) mouse; struct { bool isToggle; diff --git a/right/src/config/parse_keymap.c b/right/src/config/parse_keymap.c index 15443ba..4d7e883 100644 --- a/right/src/config/parse_keymap.c +++ b/right/src/config/parse_keymap.c @@ -39,25 +39,25 @@ static const char *readString(serialized_buffer_t *buffer, uint16_t *len) { // ---------------- static void parseNoneAction(key_action_t *action, serialized_buffer_t *buffer) { - action->type = KEY_ACTION_NONE; + action->type = KeyActionType_None; } static void parseKeyStrokeAction(key_action_t *action, uint8_t actionType, serialized_buffer_t *buffer) { uint8_t flags = actionType - 1; - action->type = KEY_ACTION_KEYSTROKE; + action->type = KeyActionType_Keystroke; uint8_t keystrokeType = (SERIALIZED_KEYSTROKE_TYPE_MASK_KEYSTROKE_TYPE & flags) >> SERIALIZED_KEYSTROKE_TYPE_OFFSET_KEYSTROKE_TYPE; switch (keystrokeType) { case SerializedKeystrokeType_Basic: - action->keystroke.keystrokeType = KEYSTROKE_BASIC; + action->keystroke.keystrokeType = KeystrokeType_Basic; break; case SerializedKeystrokeType_ShortMedia: case SerializedKeystrokeType_LongMedia: - action->keystroke.keystrokeType = KEYSTROKE_MEDIA; + action->keystroke.keystrokeType = KeystrokeType_Media; break; case SerializedKeystrokeType_System: - action->keystroke.keystrokeType = KEYSTROKE_SYSTEM; + action->keystroke.keystrokeType = KeystrokeType_System; break; } if (flags & SERIALIZED_KEYSTROKE_TYPE_MASK_HAS_SCANCODE) { @@ -75,7 +75,7 @@ static void parseSwitchLayerAction(key_action_t *action, serialized_buffer_t *bu uint8_t layer = readUInt8(buffer) + 1; bool isToggle = readBool(buffer); - action->type = KEY_ACTION_SWITCH_LAYER; + action->type = KeyActionType_SwitchLayer; action->switchLayer.layer = layer; action->switchLayer.isToggle = isToggle; } @@ -84,7 +84,7 @@ static void parseSwitchKeymapAction(key_action_t *action, serialized_buffer_t *b // uint16_t len; // const char *keymap = readString(buffer, &len); - action->type = KEY_ACTION_SWITCH_KEYMAP; + action->type = KeyActionType_SwitchKeymap; // TODO: Implement this } @@ -92,46 +92,46 @@ static void parseSwitchKeymapAction(key_action_t *action, serialized_buffer_t *b static void parseMouseAction(key_action_t *action, serialized_buffer_t *buffer) { uint8_t mouseAction = readUInt8(buffer); - action->type = KEY_ACTION_MOUSE; + action->type = KeyActionType_Mouse; switch (mouseAction) { case 0: // leftClick - action->mouse.buttonActions |= MOUSE_BUTTON_LEFT; + action->mouse.buttonActions |= MouseButton_Left; break; case 1: // middleClick - action->mouse.buttonActions |= MOUSE_BUTTON_MIDDLE; + action->mouse.buttonActions |= MouseButton_Middle; break; case 2: // rightClick - action->mouse.buttonActions |= MOUSE_BUTTON_RIGHT; + action->mouse.buttonActions |= MouseButton_Right; break; case 3: // moveUp - action->mouse.moveActions |= MOUSE_MOVE_UP; + action->mouse.moveActions |= MouseMove_Up; break; case 4: // moveDown - action->mouse.moveActions |= MOUSE_MOVE_DOWN; + action->mouse.moveActions |= MouseMove_Down; break; case 5: // moveLeft - action->mouse.moveActions |= MOUSE_MOVE_LEFT; + action->mouse.moveActions |= MouseMove_Left; break; case 6: // moveRight - action->mouse.moveActions |= MOUSE_MOVE_RIGHT; + action->mouse.moveActions |= MouseMove_Right; break; case 7: // scrollUp - action->mouse.scrollActions |= MOUSE_SCROLL_UP; + action->mouse.scrollActions |= MouseScroll_Up; break; case 8: // scrollDown - action->mouse.scrollActions |= MOUSE_SCROLL_DOWN; + action->mouse.scrollActions |= MouseScroll_Down; break; case 9: // scrollLeft - action->mouse.scrollActions |= MOUSE_SCROLL_LEFT; + action->mouse.scrollActions |= MouseScroll_Left; break; case 10: // scrollRight - action->mouse.scrollActions |= MOUSE_SCROLL_RIGHT; + action->mouse.scrollActions |= MouseScroll_Right; break; case 11: // accelerate - action->mouse.moveActions |= MOUSE_ACCELERATE; + action->mouse.moveActions |= MouseMove_Accelerate; break; case 12: // decelerate - action->mouse.moveActions |= MOUSE_DECELERATE; + action->mouse.moveActions |= MouseMove_Decelerate; break; } } diff --git a/right/src/current_keymap.c b/right/src/current_keymap.c index 09a685c..5754d36 100644 --- a/right/src/current_keymap.c +++ b/right/src/current_keymap.c @@ -8,97 +8,97 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = // Right keyboard half { // Row 1 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_7_AND_AMPERSAND }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_8_AND_ASTERISK }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_EQUAL_AND_PLUS }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_BACKSPACE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_7_AND_AMPERSAND }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_8_AND_ASTERISK }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_EQUAL_AND_PLUS }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_BACKSPACE }}, // Row 2 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_U }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_I }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_O }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_P }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_BACKSLASH_AND_PIPE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Y }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_U }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_I }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_O }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_P }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_BACKSLASH_AND_PIPE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_Y }}, // Row 3 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_J }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_K }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_L }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SEMICOLON_AND_COLON }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_ENTER }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_H }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_J }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_K }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_L }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_SEMICOLON_AND_COLON }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_ENTER }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_H }}, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_N }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_M }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_N }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_M }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KeyActionType_None }, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SPACE }}, - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_SPACE }}, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_MOD }}, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_FN }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left keyboard half { // Row 1 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_1_AND_EXCLAMATION }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_2_AND_AT }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_3_AND_HASHMARK }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_4_AND_DOLLAR }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_5_AND_PERCENTAGE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_6_AND_CARET }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_1_AND_EXCLAMATION }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_2_AND_AT }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_3_AND_HASHMARK }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_4_AND_DOLLAR }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_5_AND_PERCENTAGE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_6_AND_CARET }}, // Row 2 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_TAB }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Q }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_W }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_E }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_R }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_T }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_TAB }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_Q }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_W }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_E }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_R }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_T }}, // Row 3 - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOUSE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_A }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_S }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_D }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_G }}, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_MOUSE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_A }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_S }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_D }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_G }}, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Z }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_X }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_C }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_V }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_B }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_Z }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_X }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_C }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_V }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_B }}, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SPACE }}, - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_FN }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_SPACE }}, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_MOD }}, + { .type = KeyActionType_None }, } }, @@ -107,97 +107,97 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = // Right keyboard half { // Row 1 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F7 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F8 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F9 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F10 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F11 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F12 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DELETE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F7 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F8 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F9 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F10 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F11 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F12 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_DELETE }}, // Row 2 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_HOME }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_UP_ARROW }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_END }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DELETE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PRINT_SCREEN }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SCROLL_LOCK }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAUSE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_UP }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_HOME }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_UP_ARROW }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_END }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_DELETE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_PRINT_SCREEN }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_SCROLL_LOCK }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_PAUSE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_UP }}, // Row 3 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ARROW }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DOWN_ARROW }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ARROW }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_INSERT }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_DOWN }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ARROW }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_DOWN_ARROW }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ARROW }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_INSERT }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_DOWN }}, // Row 4 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KeyActionType_None }, // Row 5 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_MOD }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left keyboard half { // Row 1 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_ESCAPE }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F1 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F2 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F3 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F4 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F5 }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F6 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_ESCAPE }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F1 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F2 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F3 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F4 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F5 }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_F6 }}, // Row 2 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_UP, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [<] tab prev - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_T, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [+] tab new - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_DOWN, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [>] tab next - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_UP, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [<] tab prev + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_T, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [+] tab new + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_DOWN, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [>] tab next + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 3 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ARROW, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace prev - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_TAB, .modifiers = HID_KEYBOARD_MODIFIER_LEFTALT }}, // window switch - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ARROW, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace next - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ARROW, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace prev + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_TAB, .modifiers = HID_KEYBOARD_MODIFIER_LEFTALT }}, // window switch + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ARROW, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace next + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_W, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [x] tab close - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_W, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [x] tab close + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_MOD }}, + { .type = KeyActionType_None }, } }, @@ -209,100 +209,100 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = // { .type = KEY_ACTION_NONE }, // { .type = KEY_ACTION_NONE }, // { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableUsb }}, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableI2c }}, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableKeyMatrixScan }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_SYSTEM, .scancode = SYSTEM_WAKE_UP }}, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_Test, .test = { .testAction = TestAction_DisableUsb }}, + { .type = KeyActionType_Test, .test = { .testAction = TestAction_DisableI2c }}, + { .type = KeyActionType_Test, .test = { .testAction = TestAction_DisableKeyMatrixScan }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_System, .scancode = SYSTEM_WAKE_UP }}, + { .type = KeyActionType_None }, // Row 2 // { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = MEDIA_PLAY_PAUSE }}, // { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = MEDIA_VOLUME_UP }}, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableLedSdb }}, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableLedFetPwm }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = MEDIA_STOP }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_SYSTEM, .scancode = SYSTEM_SLEEP }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_SYSTEM, .scancode = SYSTEM_POWER_DOWN }}, + { .type = KeyActionType_Test, .test = { .testAction = TestAction_DisableLedSdb }}, + { .type = KeyActionType_Test, .test = { .testAction = TestAction_DisableLedFetPwm }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = MEDIA_STOP }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_System, .scancode = SYSTEM_SLEEP }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_System, .scancode = SYSTEM_POWER_DOWN }}, // { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableLedDriverPwm }}, + { .type = KeyActionType_Test, .test = { .testAction = TestAction_DisableLedDriverPwm }}, // Row 3 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = MEDIA_PREVIOUS }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = MEDIA_VOLUME_DOWN }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = MEDIA_NEXT }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = MEDIA_PREVIOUS }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = MEDIA_VOLUME_DOWN }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = MEDIA_NEXT }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 4 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = MEDIA_VOLUME_MUTE }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = MEDIA_VOLUME_MUTE }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KeyActionType_None }, // Row 5 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_FN }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left keyboard half { // Row 1 - { .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 }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 2 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = HID_CONSUMER_AC_CANCEL }}, // HID_CONSUMER_AC_STOP - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = CONSUMER_BROWSER_REFRESH }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = HID_CONSUMER_AC_CANCEL }}, // HID_CONSUMER_AC_STOP + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = CONSUMER_BROWSER_REFRESH }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 3 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = CONSUMER_BROWSER_BACK }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = CONSUMER_EXPLORER }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = CONSUMER_BROWSER_FORWARD }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = CONSUMER_BROWSER_BACK }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = CONSUMER_EXPLORER }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = CONSUMER_BROWSER_FORWARD }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = CONSUMER_SCREENSAVER }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = HID_CONSUMER_AC_SEARCH }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = CONSUMER_CALCULATOR }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = HID_CONSUMER_EJECT }}, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = CONSUMER_SCREENSAVER }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = HID_CONSUMER_AC_SEARCH }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = CONSUMER_CALCULATOR }}, + { .type = KeyActionType_Keystroke, .keystroke = { .keystrokeType = KeystrokeType_Media, .scancode = HID_CONSUMER_EJECT }}, + { .type = KeyActionType_None }, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_FN }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, } }, @@ -311,97 +311,97 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = // Right keyboard half { // Row 1 - { .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 }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 2 - { .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 }}, + { .type = KeyActionType_Mouse, .mouse = { .buttonActions = MouseButton_4 }}, + { .type = KeyActionType_Mouse, .mouse = { .moveActions = MouseMove_Up }}, + { .type = KeyActionType_Mouse, .mouse = { .buttonActions = MouseButton_5 }}, + { .type = KeyActionType_Mouse, .mouse = { .buttonActions = MouseButton_t }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Mouse, .mouse = { .scrollActions = MouseScroll_Up }}, // Row 3 - { .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 }}, + { .type = KeyActionType_Mouse, .mouse = { .moveActions = MouseMove_Left }}, + { .type = KeyActionType_Mouse, .mouse = { .moveActions = MouseMove_Down }}, + { .type = KeyActionType_Mouse, .mouse = { .moveActions = MouseMove_Right }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Mouse, .mouse = { .scrollActions = MouseScroll_Down }}, // Row 4 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, + { .type = KeyActionType_None }, // Row 5 - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, }, // Left keyboard half { // Row 1 - { .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 }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 2 - { .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 }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 3 - { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOUSE }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_RIGHT }}, - { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_MIDDLE }}, - { .type = KEY_ACTION_MOUSE, .mouse = { .buttonActions = MOUSE_BUTTON_LEFT }}, - { .type = KEY_ACTION_NONE }, - { .type = KEY_ACTION_NONE }, + { .type = KeyActionType_SwitchLayer, .switchLayer = { .layer = LAYER_ID_MOUSE }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_Mouse, .mouse = { .buttonActions = MouseButton_Right }}, + { .type = KeyActionType_Mouse, .mouse = { .buttonActions = MouseButton_Middle }}, + { .type = KeyActionType_Mouse, .mouse = { .buttonActions = MouseButton_Left }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 4 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = 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 }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, + { .type = KeyActionType_None }, // Row 5 - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, - { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = 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 }, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, + { .type = KeyActionType_Keystroke, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, + { .type = KeyActionType_None }, + { .type = KeyActionType_Mouse, .mouse = { .moveActions = MouseMove_Decelerate }}, + { .type = KeyActionType_Mouse, .mouse = { .moveActions = MouseMove_Accelerate }}, + { .type = KeyActionType_None }, } }, }; diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c index 16b5e0b..39e5957 100644 --- a/right/src/usb_report_updater.c +++ b/right/src/usb_report_updater.c @@ -28,43 +28,43 @@ void processMouseAction(key_action_t action) if (action.mouse.scrollActions) { if (mouseWheelDivisorCounter == MOUSE_WHEEL_DIVISOR) { mouseWheelDivisorCounter = 0; - if (action.mouse.scrollActions & MOUSE_SCROLL_UP) { + if (action.mouse.scrollActions & MouseScroll_Up) { UsbMouseReport.wheelX = 1; } - if (action.mouse.scrollActions & MOUSE_SCROLL_DOWN) { + if (action.mouse.scrollActions & MouseScroll_Down) { UsbMouseReport.wheelX = -1; } } } - if (action.mouse.moveActions & MOUSE_ACCELERATE || action.mouse.moveActions & MOUSE_DECELERATE) { + if (action.mouse.moveActions & MouseMove_Accelerate || action.mouse.moveActions & MouseMove_Decelerate) { mouseSpeedAccelDivisorCounter++; if (mouseSpeedAccelDivisorCounter == MOUSE_SPEED_ACCEL_DIVISOR) { mouseSpeedAccelDivisorCounter = 0; - if (action.mouse.moveActions & MOUSE_ACCELERATE) { + if (action.mouse.moveActions & MouseMove_Accelerate) { if (mouseSpeed < MOUSE_MAX_SPEED) { mouseSpeed++; } } - if (action.mouse.moveActions & MOUSE_DECELERATE) { + if (action.mouse.moveActions & MouseMove_Decelerate) { if (mouseSpeed > 1) { mouseSpeed--; } } } } else if (action.mouse.moveActions) { - if (action.mouse.moveActions & MOUSE_MOVE_LEFT) { + if (action.mouse.moveActions & MouseMove_Left) { UsbMouseReport.x = -mouseSpeed; } - if (action.mouse.moveActions & MOUSE_MOVE_RIGHT) { + if (action.mouse.moveActions & MouseMove_Right) { UsbMouseReport.x = mouseSpeed; } - if (action.mouse.moveActions & MOUSE_MOVE_UP) { + if (action.mouse.moveActions & MouseMove_Up) { UsbMouseReport.y = -mouseSpeed; } - if (action.mouse.moveActions & MOUSE_MOVE_DOWN) { + if (action.mouse.moveActions & MouseMove_Down) { UsbMouseReport.y = mouseSpeed; } } @@ -120,7 +120,7 @@ void UpdateActiveUsbReports() { for (uint8_t keyId=0; keyIdmodifiers |= action.keystroke.modifiers; switch (action.keystroke.keystrokeType) { - case KEYSTROKE_BASIC: + case KeystrokeType_Basic: if (basicScancodeIndex >= USB_BASIC_KEYBOARD_MAX_KEYS) { break; } ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = action.keystroke.scancode; break; - case KEYSTROKE_MEDIA: + case KeystrokeType_Media: if (mediaScancodeIndex >= USB_MEDIA_KEYBOARD_MAX_KEYS) { break; } ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = action.keystroke.scancode; break; - case KEYSTROKE_SYSTEM: + case KeystrokeType_System: if (systemScancodeIndex >= USB_SYSTEM_KEYBOARD_MAX_KEYS) { break; } @@ -160,10 +160,10 @@ void UpdateActiveUsbReports() { break; } break; - case KEY_ACTION_MOUSE: + case KeyActionType_Mouse: processMouseAction(action); break; - case KEY_ACTION_TEST: + case KeyActionType_Test: processTestAction(action); break; }