diff options
Diffstat (limited to 'keyboards/kona_classic')
| -rw-r--r-- | keyboards/kona_classic/keymaps/ansi/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/ansi_arrows/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/ansi_split/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/default/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/iso/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/iso_arrows/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/iso_split/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c | 38 |
10 files changed, 160 insertions, 220 deletions
diff --git a/keyboards/kona_classic/keymaps/ansi/keymap.c b/keyboards/kona_classic/keymaps/ansi/keymap.c index 3d2061e80..3eba76d63 100644 --- a/keyboards/kona_classic/keymaps/ansi/keymap.c +++ b/keyboards/kona_classic/keymaps/ansi/keymap.c | |||
| @@ -15,9 +15,13 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | enum custom_keycodes { | ||
| 22 | SFT_ESC = SAFE_RANGE | ||
| 23 | }; | ||
| 24 | |||
| 21 | // Helpful defines | 25 | // Helpful defines |
| 22 | #define _______ KC_TRNS | 26 | #define _______ KC_TRNS |
| 23 | #define XXXXXXX KC_NO | 27 | #define XXXXXXX KC_NO |
| @@ -29,7 +33,7 @@ | |||
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_ansi( | 35 | [_DEFAULT] = LAYOUT_ansi( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 34 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 38 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c b/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c index 6e281f951..43c27c503 100644 --- a/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c +++ b/keyboards/kona_classic/keymaps/ansi_arrows/keymap.c | |||
| @@ -15,9 +15,13 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | enum custom_keycodes { | ||
| 22 | SFT_ESC = SAFE_RANGE | ||
| 23 | }; | ||
| 24 | |||
| 21 | // Helpful defines | 25 | // Helpful defines |
| 22 | #define _______ KC_TRNS | 26 | #define _______ KC_TRNS |
| 23 | #define XXXXXXX KC_NO | 27 | #define XXXXXXX KC_NO |
| @@ -29,7 +33,7 @@ | |||
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_ansi_arrows( | 35 | [_DEFAULT] = LAYOUT_ansi_arrows( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 34 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 38 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c index b74a6c3d7..47f8d625b 100644 --- a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c +++ b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/keymap.c | |||
| @@ -15,9 +15,13 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | enum custom_keycodes { | ||
| 22 | SFT_ESC = SAFE_RANGE | ||
| 23 | }; | ||
| 24 | |||
| 21 | // Helpful defines | 25 | // Helpful defines |
| 22 | #define _______ KC_TRNS | 26 | #define _______ KC_TRNS |
| 23 | #define XXXXXXX KC_NO | 27 | #define XXXXXXX KC_NO |
| @@ -29,7 +33,7 @@ | |||
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_ansi_arrows( | 35 | [_DEFAULT] = LAYOUT_ansi_arrows( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 34 | KC_F5, KC_F6, KC_LCAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 38 | KC_F5, KC_F6, KC_LCAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/ansi_split/keymap.c b/keyboards/kona_classic/keymaps/ansi_split/keymap.c index d60e162f6..f3c0dd707 100644 --- a/keyboards/kona_classic/keymaps/ansi_split/keymap.c +++ b/keyboards/kona_classic/keymaps/ansi_split/keymap.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | // Helpful defines | 21 | // Helpful defines |
| @@ -25,11 +25,15 @@ | |||
| 25 | #define _DEFAULT 0 | 25 | #define _DEFAULT 0 |
| 26 | #define _FN 1 | 26 | #define _FN 1 |
| 27 | 27 | ||
| 28 | enum custom_keycodes { | ||
| 29 | SFT_ESC = SAFE_RANGE | ||
| 30 | }; | ||
| 31 | |||
| 28 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD | 32 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD |
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_ansi_split( | 35 | [_DEFAULT] = LAYOUT_ansi_split( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 34 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 38 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c b/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c index 181f2f14c..9a6f7421c 100644 --- a/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c +++ b/keyboards/kona_classic/keymaps/ansi_split_arrows/keymap.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | // Helpful defines | 21 | // Helpful defines |
| @@ -25,11 +25,15 @@ | |||
| 25 | #define _DEFAULT 0 | 25 | #define _DEFAULT 0 |
| 26 | #define _FN 1 | 26 | #define _FN 1 |
| 27 | 27 | ||
| 28 | enum custom_keycodes { | ||
| 29 | SFT_ESC = SAFE_RANGE | ||
| 30 | }; | ||
| 31 | |||
| 28 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD | 32 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD |
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_ansi_split_arrows( | 35 | [_DEFAULT] = LAYOUT_ansi_split_arrows( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 34 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 38 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/default/keymap.c b/keyboards/kona_classic/keymaps/default/keymap.c index 84a2f9cbd..74f138d2c 100644 --- a/keyboards/kona_classic/keymaps/default/keymap.c +++ b/keyboards/kona_classic/keymaps/default/keymap.c | |||
| @@ -15,9 +15,13 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | enum custom_keycodes { | ||
| 22 | SFT_ESC = SAFE_RANGE | ||
| 23 | }; | ||
| 24 | |||
| 21 | // Helpful defines | 25 | // Helpful defines |
| 22 | #define _______ KC_TRNS | 26 | #define _______ KC_TRNS |
| 23 | #define XXXXXXX KC_NO | 27 | #define XXXXXXX KC_NO |
| @@ -29,7 +33,7 @@ | |||
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_all( | 35 | [_DEFAULT] = LAYOUT_all( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 34 | KC_F5, KC_F6, MO(_FN), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 38 | KC_F5, KC_F6, MO(_FN), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ | 39 | KC_F7, KC_F8, KC_LSFT, _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/iso/keymap.c b/keyboards/kona_classic/keymaps/iso/keymap.c index ff9d3dcb8..3ce8255e8 100644 --- a/keyboards/kona_classic/keymaps/iso/keymap.c +++ b/keyboards/kona_classic/keymaps/iso/keymap.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | // Helpful defines | 21 | // Helpful defines |
| @@ -25,11 +25,15 @@ | |||
| 25 | #define _DEFAULT 0 | 25 | #define _DEFAULT 0 |
| 26 | #define _FN 1 | 26 | #define _FN 1 |
| 27 | 27 | ||
| 28 | enum custom_keycodes { | ||
| 29 | SFT_ESC = SAFE_RANGE | ||
| 30 | }; | ||
| 31 | |||
| 28 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD | 32 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD |
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_iso( | 35 | [_DEFAULT] = LAYOUT_iso( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ |
| 34 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ | 38 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/iso_arrows/keymap.c b/keyboards/kona_classic/keymaps/iso_arrows/keymap.c index 79e52360c..44fb94fd9 100644 --- a/keyboards/kona_classic/keymaps/iso_arrows/keymap.c +++ b/keyboards/kona_classic/keymaps/iso_arrows/keymap.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | // Helpful defines | 21 | // Helpful defines |
| @@ -25,11 +25,15 @@ | |||
| 25 | #define _DEFAULT 0 | 25 | #define _DEFAULT 0 |
| 26 | #define _FN 1 | 26 | #define _FN 1 |
| 27 | 27 | ||
| 28 | enum custom_keycodes { | ||
| 29 | SFT_ESC = SAFE_RANGE | ||
| 30 | }; | ||
| 31 | |||
| 28 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD | 32 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD |
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_iso_arrows( | 35 | [_DEFAULT] = LAYOUT_iso_arrows( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ |
| 34 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ | 38 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/iso_split/keymap.c b/keyboards/kona_classic/keymaps/iso_split/keymap.c index 51d329773..425a4c980 100644 --- a/keyboards/kona_classic/keymaps/iso_split/keymap.c +++ b/keyboards/kona_classic/keymaps/iso_split/keymap.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | // Helpful defines | 21 | // Helpful defines |
| @@ -25,11 +25,15 @@ | |||
| 25 | #define _DEFAULT 0 | 25 | #define _DEFAULT 0 |
| 26 | #define _FN 1 | 26 | #define _FN 1 |
| 27 | 27 | ||
| 28 | enum custom_keycodes { | ||
| 29 | SFT_ESC = SAFE_RANGE | ||
| 30 | }; | ||
| 31 | |||
| 28 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD | 32 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD |
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_iso_split( | 35 | [_DEFAULT] = LAYOUT_iso_split( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ |
| 34 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ | 38 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
diff --git a/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c b/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c index ea81de4bc..ba74a2512 100644 --- a/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c +++ b/keyboards/kona_classic/keymaps/iso_split_arrows/keymap.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #define MODS_SHFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 18 | #define MODS_SHIFT_GUI_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) | 19 | #define MODS_GUI_MASK (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)) |
| 20 | 20 | ||
| 21 | // Helpful defines | 21 | // Helpful defines |
| @@ -25,11 +25,15 @@ | |||
| 25 | #define _DEFAULT 0 | 25 | #define _DEFAULT 0 |
| 26 | #define _FN 1 | 26 | #define _FN 1 |
| 27 | 27 | ||
| 28 | enum custom_keycodes { | ||
| 29 | SFT_ESC = SAFE_RANGE | ||
| 30 | }; | ||
| 31 | |||
| 28 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD | 32 | //RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD |
| 29 | 33 | ||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | [_DEFAULT] = LAYOUT_iso_split_arrows( | 35 | [_DEFAULT] = LAYOUT_iso_split_arrows( |
| 32 | KC_F1, KC_F2, F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ | 36 | KC_F1, KC_F2, SFT_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ |
| 33 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ | 37 | KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, \ |
| 34 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ | 38 | KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, \ |
| 35 | KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ | 39 | KC_F7, KC_F8, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(_FN), \ |
| @@ -55,29 +59,15 @@ void matrix_scan_user(void) { | |||
| 55 | 59 | ||
| 56 | } | 60 | } |
| 57 | 61 | ||
| 58 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
| 59 | return true; | ||
| 60 | } | ||
| 61 | |||
| 62 | void led_set_user(uint8_t usb_led) { | 62 | void led_set_user(uint8_t usb_led) { |
| 63 | 63 | ||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | enum function_id { | 66 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 67 | ESCAPE, | 67 | switch (keycode) { |
| 68 | }; | 68 | case SFT_ESC: |
| 69 | |||
| 70 | const uint16_t PROGMEM fn_actions[] = { | ||
| 71 | [0] = ACTION_FUNCTION(ESCAPE), | ||
| 72 | }; | ||
| 73 | |||
| 74 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 75 | static uint8_t shift_esc_shift_mask; | ||
| 76 | switch (id) { | ||
| 77 | case ESCAPE: | ||
| 78 | shift_esc_shift_mask = get_mods()&MODS_SHFT_MASK; | ||
| 79 | if (record->event.pressed) { | 69 | if (record->event.pressed) { |
| 80 | if (shift_esc_shift_mask) { | 70 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 81 | add_key(KC_GRV); | 71 | add_key(KC_GRV); |
| 82 | send_keyboard_report(); | 72 | send_keyboard_report(); |
| 83 | } else { | 73 | } else { |
| @@ -85,7 +75,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 85 | send_keyboard_report(); | 75 | send_keyboard_report(); |
| 86 | } | 76 | } |
| 87 | } else { | 77 | } else { |
| 88 | if (shift_esc_shift_mask) { | 78 | if (get_mods() & MODS_SHIFT_GUI_MASK) { |
| 89 | del_key(KC_GRV); | 79 | del_key(KC_GRV); |
| 90 | send_keyboard_report(); | 80 | send_keyboard_report(); |
| 91 | } else { | 81 | } else { |
| @@ -93,6 +83,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
| 93 | send_keyboard_report(); | 83 | send_keyboard_report(); |
| 94 | } | 84 | } |
| 95 | } | 85 | } |
| 96 | break; | 86 | |
| 87 | return false; | ||
| 88 | |||
| 89 | default: | ||
| 90 | return true; | ||
| 97 | } | 91 | } |
| 98 | } | 92 | } |
