From 5b07a528481cfeb08997cdece7049df94a118989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Tue, 23 May 2017 22:24:15 +0200 Subject: [PATCH] Move test actions to the Fn layer. --- right/src/current_keymap.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/right/src/current_keymap.c b/right/src/current_keymap.c index be5762d..e6dd855 100644 --- a/right/src/current_keymap.c +++ b/right/src/current_keymap.c @@ -8,12 +8,9 @@ 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_TEST, .test = { .testAction = TestAction_DisableUsb }}, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableI2c }}, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableKeyMatrixScan }}, + { .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 }}, @@ -21,17 +18,14 @@ key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE] = { .type = KEY_ACTION_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_TEST, .test = { .testAction = TestAction_DisableLedSdb }}, - { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableLedFetPwm }}, + { .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 = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableLedDriverPwm }}, + { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_Y }}, // Row 3 { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .scancode = HID_KEYBOARD_SC_J }}, @@ -213,23 +207,29 @@ 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_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 }, // 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_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 = KEY_ACTION_NONE }, +// { .type = KEY_ACTION_NONE }, + { .type = KEY_ACTION_TEST, .test = { .testAction = TestAction_DisableLedDriverPwm }}, // Row 3 { .type = KEY_ACTION_KEYSTROKE, .keystroke = { .keystrokeType = KEYSTROKE_MEDIA, .scancode = MEDIA_PREVIOUS }},