diff options
author | Ryan <fauxpark@gmail.com> | 2021-07-06 09:08:08 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-06 09:08:08 +1000 |
commit | 82137e14f24a12dbf16746b602d4912582b93b58 (patch) | |
tree | d554963112f942d90cab27fe560f6eee1336b70d /keyboards/mechmini | |
parent | 50d4dfd2e65904234d7ee138b57eccd4b6664e1f (diff) | |
download | qmk_firmware-82137e14f24a12dbf16746b602d4912582b93b58.tar.gz qmk_firmware-82137e14f24a12dbf16746b602d4912582b93b58.zip |
Migrate SHIFT_ESC and RGB `fn_actions` to Grave Escape and RGB keycodes (#13360)
Diffstat (limited to 'keyboards/mechmini')
-rw-r--r-- | keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c | 81 | ||||
-rwxr-xr-x | keyboards/mechmini/v2/keymaps/625_space/keymap.c | 37 | ||||
-rwxr-xr-x | keyboards/mechmini/v2/keymaps/ortho/keymap.c | 81 | ||||
-rwxr-xr-x | keyboards/mechmini/v2/keymaps/split_space/keymap.c | 37 |
4 files changed, 4 insertions, 232 deletions
diff --git a/keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c b/keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c index 1b2175003..90bb2ddd6 100644 --- a/keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c +++ b/keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c | |||
@@ -4,11 +4,10 @@ | |||
4 | #define _FN1 1 | 4 | #define _FN1 1 |
5 | #define _FN2 2 | 5 | #define _FN2 2 |
6 | 6 | ||
7 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | ||
8 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
9 | 8 | ||
10 | [_BL] = LAYOUT_2u_space_ortho( | 9 | [_BL] = LAYOUT_2u_space_ortho( |
11 | F(0), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 10 | KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
12 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 11 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
13 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, | 12 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, |
14 | KC_CAPS, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), | 13 | KC_CAPS, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), |
@@ -44,81 +43,3 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
44 | } | 43 | } |
45 | return MACRO_NONE; | 44 | return MACRO_NONE; |
46 | } | 45 | } |
47 | |||
48 | void matrix_init_user(void) { | ||
49 | } | ||
50 | |||
51 | void matrix_scan_user(void) { | ||
52 | } | ||
53 | |||
54 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
55 | return true; | ||
56 | } | ||
57 | |||
58 | void led_set_user(uint8_t usb_led) { | ||
59 | |||
60 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { | ||
61 | |||
62 | } else { | ||
63 | |||
64 | } | ||
65 | |||
66 | if (usb_led & (1 << USB_LED_CAPS_LOCK)) { | ||
67 | |||
68 | } else { | ||
69 | |||
70 | } | ||
71 | |||
72 | if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { | ||
73 | |||
74 | } else { | ||
75 | |||
76 | } | ||
77 | |||
78 | if (usb_led & (1 << USB_LED_COMPOSE)) { | ||
79 | |||
80 | } else { | ||
81 | |||
82 | } | ||
83 | |||
84 | if (usb_led & (1 << USB_LED_KANA)) { | ||
85 | |||
86 | } else { | ||
87 | |||
88 | } | ||
89 | |||
90 | } | ||
91 | |||
92 | enum function_id { | ||
93 | SHIFT_ESC, | ||
94 | }; | ||
95 | |||
96 | const uint16_t PROGMEM fn_actions[] = { | ||
97 | [0] = ACTION_FUNCTION(SHIFT_ESC), | ||
98 | }; | ||
99 | |||
100 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
101 | static uint8_t shift_esc_shift_mask; | ||
102 | switch (id) { | ||
103 | case SHIFT_ESC: | ||
104 | shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; | ||
105 | if (record->event.pressed) { | ||
106 | if (shift_esc_shift_mask) { | ||
107 | add_key(KC_GRV); | ||
108 | send_keyboard_report(); | ||
109 | } else { | ||
110 | add_key(KC_ESC); | ||
111 | send_keyboard_report(); | ||
112 | } | ||
113 | } else { | ||
114 | if (shift_esc_shift_mask) { | ||
115 | del_key(KC_GRV); | ||
116 | send_keyboard_report(); | ||
117 | } else { | ||
118 | del_key(KC_ESC); | ||
119 | send_keyboard_report(); | ||
120 | } | ||
121 | } | ||
122 | break; | ||
123 | } | ||
124 | } | ||
diff --git a/keyboards/mechmini/v2/keymaps/625_space/keymap.c b/keyboards/mechmini/v2/keymaps/625_space/keymap.c index 0746b8aec..4344d6d2b 100755 --- a/keyboards/mechmini/v2/keymaps/625_space/keymap.c +++ b/keyboards/mechmini/v2/keymaps/625_space/keymap.c | |||
@@ -4,11 +4,10 @@ | |||
4 | #define _FN1 1 | 4 | #define _FN1 1 |
5 | #define _FN2 2 | 5 | #define _FN2 2 |
6 | 6 | ||
7 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | ||
8 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
9 | 8 | ||
10 | [_BL] = LAYOUT_625_space( | 9 | [_BL] = LAYOUT_625_space( |
11 | F(0), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 10 | KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
12 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, | 11 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, |
13 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_LSFT, KC_DOT, | 12 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_LSFT, KC_DOT, |
14 | KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(1), MO(2)), | 13 | KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, MO(1), MO(2)), |
@@ -27,37 +26,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
27 | 26 | ||
28 | 27 | ||
29 | }; | 28 | }; |
30 | |||
31 | enum function_id { | ||
32 | SHIFT_ESC, | ||
33 | }; | ||
34 | |||
35 | const uint16_t PROGMEM fn_actions[] = { | ||
36 | [0] = ACTION_FUNCTION(SHIFT_ESC), | ||
37 | }; | ||
38 | |||
39 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
40 | static uint8_t shift_esc_shift_mask; | ||
41 | switch (id) { | ||
42 | case SHIFT_ESC: | ||
43 | shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; | ||
44 | if (record->event.pressed) { | ||
45 | if (shift_esc_shift_mask) { | ||
46 | add_key(KC_GRV); | ||
47 | send_keyboard_report(); | ||
48 | } else { | ||
49 | add_key(KC_ESC); | ||
50 | send_keyboard_report(); | ||
51 | } | ||
52 | } else { | ||
53 | if (shift_esc_shift_mask) { | ||
54 | del_key(KC_GRV); | ||
55 | send_keyboard_report(); | ||
56 | } else { | ||
57 | del_key(KC_ESC); | ||
58 | send_keyboard_report(); | ||
59 | } | ||
60 | } | ||
61 | break; | ||
62 | } | ||
63 | } | ||
diff --git a/keyboards/mechmini/v2/keymaps/ortho/keymap.c b/keyboards/mechmini/v2/keymaps/ortho/keymap.c index 3b8fbb168..31ccfa82a 100755 --- a/keyboards/mechmini/v2/keymaps/ortho/keymap.c +++ b/keyboards/mechmini/v2/keymaps/ortho/keymap.c | |||
@@ -4,11 +4,10 @@ | |||
4 | #define _FN1 1 | 4 | #define _FN1 1 |
5 | #define _FN2 2 | 5 | #define _FN2 2 |
6 | 6 | ||
7 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | ||
8 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
9 | 8 | ||
10 | [_BL] = LAYOUT_ortho( | 9 | [_BL] = LAYOUT_ortho( |
11 | F(0), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 10 | KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
12 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 11 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
13 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, | 12 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, |
14 | KC_CAPS, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), | 13 | KC_CAPS, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), |
@@ -44,81 +43,3 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | |||
44 | } | 43 | } |
45 | return MACRO_NONE; | 44 | return MACRO_NONE; |
46 | } | 45 | } |
47 | |||
48 | void matrix_init_user(void) { | ||
49 | } | ||
50 | |||
51 | void matrix_scan_user(void) { | ||
52 | } | ||
53 | |||
54 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||
55 | return true; | ||
56 | } | ||
57 | |||
58 | void led_set_user(uint8_t usb_led) { | ||
59 | |||
60 | if (usb_led & (1 << USB_LED_NUM_LOCK)) { | ||
61 | |||
62 | } else { | ||
63 | |||
64 | } | ||
65 | |||
66 | if (usb_led & (1 << USB_LED_CAPS_LOCK)) { | ||
67 | |||
68 | } else { | ||
69 | |||
70 | } | ||
71 | |||
72 | if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { | ||
73 | |||
74 | } else { | ||
75 | |||
76 | } | ||
77 | |||
78 | if (usb_led & (1 << USB_LED_COMPOSE)) { | ||
79 | |||
80 | } else { | ||
81 | |||
82 | } | ||
83 | |||
84 | if (usb_led & (1 << USB_LED_KANA)) { | ||
85 | |||
86 | } else { | ||
87 | |||
88 | } | ||
89 | |||
90 | } | ||
91 | |||
92 | enum function_id { | ||
93 | SHIFT_ESC, | ||
94 | }; | ||
95 | |||
96 | const uint16_t PROGMEM fn_actions[] = { | ||
97 | [0] = ACTION_FUNCTION(SHIFT_ESC), | ||
98 | }; | ||
99 | |||
100 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
101 | static uint8_t shift_esc_shift_mask; | ||
102 | switch (id) { | ||
103 | case SHIFT_ESC: | ||
104 | shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; | ||
105 | if (record->event.pressed) { | ||
106 | if (shift_esc_shift_mask) { | ||
107 | add_key(KC_GRV); | ||
108 | send_keyboard_report(); | ||
109 | } else { | ||
110 | add_key(KC_ESC); | ||
111 | send_keyboard_report(); | ||
112 | } | ||
113 | } else { | ||
114 | if (shift_esc_shift_mask) { | ||
115 | del_key(KC_GRV); | ||
116 | send_keyboard_report(); | ||
117 | } else { | ||
118 | del_key(KC_ESC); | ||
119 | send_keyboard_report(); | ||
120 | } | ||
121 | } | ||
122 | break; | ||
123 | } | ||
124 | } | ||
diff --git a/keyboards/mechmini/v2/keymaps/split_space/keymap.c b/keyboards/mechmini/v2/keymaps/split_space/keymap.c index e332c641a..635b4eacb 100755 --- a/keyboards/mechmini/v2/keymaps/split_space/keymap.c +++ b/keyboards/mechmini/v2/keymaps/split_space/keymap.c | |||
@@ -4,11 +4,10 @@ | |||
4 | #define _FN1 1 | 4 | #define _FN1 1 |
5 | #define _FN2 2 | 5 | #define _FN2 2 |
6 | 6 | ||
7 | #define MODS_CTRL_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)) | ||
8 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 7 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
9 | 8 | ||
10 | [_BL] = LAYOUT_split_space( | 9 | [_BL] = LAYOUT_split_space( |
11 | F(0), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 10 | KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
12 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, | 11 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, |
13 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT, KC_DOT, | 12 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT, KC_DOT, |
14 | KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RCTL, MO(1), MO(2)), | 13 | KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RCTL, MO(1), MO(2)), |
@@ -26,37 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
26 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | 25 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), |
27 | 26 | ||
28 | }; | 27 | }; |
29 | |||
30 | enum function_id { | ||
31 | SHIFT_ESC, | ||
32 | }; | ||
33 | |||
34 | const uint16_t PROGMEM fn_actions[] = { | ||
35 | [0] = ACTION_FUNCTION(SHIFT_ESC), | ||
36 | }; | ||
37 | |||
38 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
39 | static uint8_t shift_esc_shift_mask; | ||
40 | switch (id) { | ||
41 | case SHIFT_ESC: | ||
42 | shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; | ||
43 | if (record->event.pressed) { | ||
44 | if (shift_esc_shift_mask) { | ||
45 | add_key(KC_GRV); | ||
46 | send_keyboard_report(); | ||
47 | } else { | ||
48 | add_key(KC_ESC); | ||
49 | send_keyboard_report(); | ||
50 | } | ||
51 | } else { | ||
52 | if (shift_esc_shift_mask) { | ||
53 | del_key(KC_GRV); | ||
54 | send_keyboard_report(); | ||
55 | } else { | ||
56 | del_key(KC_ESC); | ||
57 | send_keyboard_report(); | ||
58 | } | ||
59 | } | ||
60 | break; | ||
61 | } | ||
62 | } | ||