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

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

Browse Source
This commit is contained in:
László Monda
2017-03-03 22:49:20 +01:00
parent d2e3d6becf
commit fdb13d3a7e
4 changed files with 152 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
right/src/action.h
View File

@@ -10,14 +10,19 @@
typedef enum { typedef enum {
KEY_ACTION_NONE, KEY_ACTION_NONE,
KEY_ACTION_BASIC_KEYSTROKE, KEY_ACTION_KEYSTROKE,
KEY_ACTION_MEDIA_KEYSTROKE,
KEY_ACTION_MOUSE, KEY_ACTION_MOUSE,
KEY_ACTION_SWITCH_LAYER, KEY_ACTION_SWITCH_LAYER,
KEY_ACTION_SWITCH_KEYMAP, KEY_ACTION_SWITCH_KEYMAP,
KEY_ACTION_PLAY_MACRO, KEY_ACTION_PLAY_MACRO,
} key_action_type_t; } key_action_type_t;
typedef enum {
KEYSTROKE_BASIC,
KEYSTROKE_MEDIA,
KEYSTROKE_SYSTEM,
} keystroke_type_t;
enum { enum {
MOUSE_BUTTON_LEFT = (1 << 0), MOUSE_BUTTON_LEFT = (1 << 0),
MOUSE_BUTTON_RIGHT = (1 << 1), MOUSE_BUTTON_RIGHT = (1 << 1),
@@ -54,6 +59,7 @@ typedef struct {
uint8_t type; uint8_t type;
union { union {
struct { struct {
keystroke_type_t keystrokeType;
uint8_t longPressAction; uint8_t longPressAction;
uint8_t modifiers; uint8_t modifiers;
uint8_t scancode; uint8_t scancode;

268
right/src/current_keymap.c
View File

@@ -6,95 +6,95 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] =
// Right keyboard half // Right keyboard half
{ {
// Row 1 // Row 1
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_7_AND_AMPERSAND }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_7_AND_AMPERSAND }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_8_AND_ASTERISK }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_8_AND_ASTERISK }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_EQUAL_AND_PLUS }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_EQUAL_AND_PLUS }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_BACKSPACE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_BACKSPACE }},
// Row 2 // Row 2
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_U }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_U }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_I }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_I }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_O }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_O }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_P }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_P }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_BACKSLASH_AND_PIPE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_BACKSLASH_AND_PIPE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Y }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Y }},
// Row 3 // Row 3
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_J }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_J }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_K }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_K }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_L }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_L }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SEMICOLON_AND_COLON }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SEMICOLON_AND_COLON }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_ENTER }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_ENTER }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_H }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_H }},
// Row 4 // Row 4
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_N }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_N }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_M }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_M }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 5 // Row 5
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SPACE }}, { .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_MOD }},
{ .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }},
}, },
// Left keyboard half // Left keyboard half
{ {
// Row 1 // Row 1
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_1_AND_EXCLAMATION }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_1_AND_EXCLAMATION }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_2_AND_AT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_2_AND_AT }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_3_AND_HASHMARK }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_3_AND_HASHMARK }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_4_AND_DOLLAR }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_4_AND_DOLLAR }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_5_AND_PERCENTAGE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_5_AND_PERCENTAGE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_6_AND_CARET }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_6_AND_CARET }},
// Row 2 // Row 2
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_TAB }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_TAB }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Q }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Q }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_W }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_W }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_E }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_E }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_R }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_R }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_T }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_T }},
// Row 3 // Row 3
{ .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOUSE }}, { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOUSE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_A }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_A }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_S }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_S }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_D }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_D }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_G }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_G }},
// Row 4 // Row 4
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Z }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Z }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_X }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_X }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_C }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_C }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_V }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_V }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_B }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_B }},
// Row 5 // Row 5
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }},
{ .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SPACE }}, { .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_MOD }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
} }
@@ -105,32 +105,32 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] =
// Right keyboard half // Right keyboard half
{ {
// Row 1 // Row 1
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F7 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F7 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F8 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F8 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F9 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F9 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F10 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F10 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F11 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F11 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F12 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F12 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DELETE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DELETE }},
// Row 2 // Row 2
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_HOME }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_HOME }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_UP_ARROW }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_UP_ARROW }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_END }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_END }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DELETE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DELETE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PRINT_SCREEN }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PRINT_SCREEN }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SCROLL_LOCK }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_SCROLL_LOCK }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAUSE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAUSE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_UP }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_UP }},
// Row 3 // Row 3
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ARROW }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ARROW }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DOWN_ARROW }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_DOWN_ARROW }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ARROW }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ARROW }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_INSERT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_INSERT }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_DOWN }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_DOWN }},
// Row 4 // Row 4
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
@@ -138,60 +138,60 @@ 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_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 5 // Row 5
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }},
}, },
// Left keyboard half // Left keyboard half
{ {
// Row 1 // Row 1
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_ESCAPE }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_ESCAPE }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F1 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F1 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F2 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F2 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F3 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F3 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F4 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F4 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F5 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F5 }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F6 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_F6 }},
// Row 2 // Row 2
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_UP, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [<] tab prev { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_UP, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [<] tab prev
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_T, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [+] tab new { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_T, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [+] tab new
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_PAGE_DOWN, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [>] tab next { .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 = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 3 // Row 3
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_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_LEFT_ARROW, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace prev
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_TAB, .modifiers = HID_KEYBOARD_MODIFIER_LEFTALT }}, // window switch { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_TAB, .modifiers = HID_KEYBOARD_MODIFIER_LEFTALT }}, // window switch
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ARROW, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL | HID_KEYBOARD_MODIFIER_LEFTALT }}, // workspace next { .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 = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 4 // Row 4
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, { .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 = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_W, .modifiers = HID_KEYBOARD_MODIFIER_LEFTCTRL }}, // [x] tab close { .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 = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 5 // Row 5
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }}, { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_MOD }},
@@ -213,19 +213,19 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] =
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 2 // Row 2
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_PLAY }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_PLAY }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_VOLUME_UP }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_VOLUME_UP }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_STOP }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_STOP }},
{ .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_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_SLEEP }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_SLEEP }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 3 // Row 3
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_PREVIOUS_TRACK }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_PREVIOUS_TRACK }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_VOLUME_DOWN }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_VOLUME_DOWN }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_NEXT_TRACK }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_NEXT_TRACK }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
@@ -234,19 +234,19 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] =
// Row 4 // Row 4
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_MEDIA_KEYSTROKE, .keystroke = { .scancode = /*HID_KEYBOARD_SC_MEDIA_MUTE*/0xe2 }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA ,.scancode = /*HID_KEYBOARD_SC_MEDIA_MUTE*/0xe2 }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 5 // Row 5
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }},
}, },
// Left keyboard half // Left keyboard half
@@ -263,8 +263,8 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] =
// Row 2 // Row 2
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_STOP }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_STOP }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_RELOAD }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_RELOAD }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
@@ -273,24 +273,24 @@ 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_NONE },
{ .type = KEY_ACTION_NONE }, // TODO: hist- { .type = KEY_ACTION_NONE }, // TODO: hist-
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_WWW }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_WWW }},
{ .type = KEY_ACTION_NONE }, // TODO: hist+ { .type = KEY_ACTION_NONE }, // TODO: hist+
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 4 // Row 4
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_LOCK }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_LOCK }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_SEARCH }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_SEARCH }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_CALCULATOR }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_CALCULATOR }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_EJECT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_MEDIA_EJECT }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 5 // Row 5
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }},
{ .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }}, { .type = KEY_ACTION_SWITCH_LAYER, .switchLayer = { .layer = LAYER_ID_FN }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
@@ -336,16 +336,16 @@ 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_NONE },
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_SHIFT }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 5 // Row 5
{ .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_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_ALT }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_GUI }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_RIGHT_CONTROL }},
}, },
// Left keyboard half // Left keyboard half
@@ -378,7 +378,7 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] =
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 4 // Row 4
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_SHIFT }}, { .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 },
@@ -387,9 +387,9 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] =
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
// Row 5 // Row 5
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_CONTROL }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_GUI }},
{ .type = KEY_ACTION_BASIC_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }}, { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_LEFT_ALT }},
{ .type = KEY_ACTION_NONE }, { .type = KEY_ACTION_NONE },
{ .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_DECELERATE }}, { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_DECELERATE }},
{ .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_ACCELERATE }}, { .type = KEY_ACTION_MOUSE, .mouse = { .moveActions = MOUSE_ACCELERATE }},

2
right/src/deserialize.c
View File

@@ -106,7 +106,7 @@ static void processNoneAction(key_action_t *action, serialized_buffer_t *buffer)
static void processKeyStrokeAction(key_action_t *action, uint8_t actionType, serialized_buffer_t *buffer) { static void processKeyStrokeAction(key_action_t *action, uint8_t actionType, serialized_buffer_t *buffer) {
uint8_t flags = actionType - 1; uint8_t flags = actionType - 1;
action->type = KEY_ACTION_BASIC_KEYSTROKE; action->type = KEY_ACTION_KEYSTROKE;
if (flags & HAS_SCANCODE) { if (flags & HAS_SCANCODE) {
action->keystroke.scancode = readUInt8(buffer); action->keystroke.scancode = readUInt8(buffer);

14
right/src/usb_report_updater.c
View File

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