aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Hung <kennysubs+github@outlook.com>2018-08-02 21:47:06 +0100
committerDrashna Jaelre <drashna@live.com>2018-08-02 13:47:06 -0700
commit6c20c6219cfcb061235d4bee2b8e0641b0026162 (patch)
tree83b085e821d2ad8bfe1d0f93a8717e476cf1c5b7
parentf0f1a363d2d0c3277fcddc7b7b30d341fb7c329b (diff)
downloadqmk_firmware-6c20c6219cfcb061235d4bee2b8e0641b0026162.tar.gz
qmk_firmware-6c20c6219cfcb061235d4bee2b8e0641b0026162.zip
Keymap: Refactor symbols layer with layer tap workaround (#3520)
* Squash layout to fit on Planck * Replace AST with PAST keycode so that it works with layer tap * Review markups
Diffstat
-rw-r--r--keyboards/xd75/keymaps/skewwhiffy/keymap.c259
-rw-r--r--quantum/keymap_extras/keymap_uk.h19
2 files changed, 187 insertions, 91 deletions
diff --git a/keyboards/xd75/keymaps/skewwhiffy/keymap.c b/keyboards/xd75/keymaps/skewwhiffy/keymap.c
index 9c3e755f6..11fa2f0e6 100644
--- a/keyboards/xd75/keymaps/skewwhiffy/keymap.c
+++ b/keyboards/xd75/keymaps/skewwhiffy/keymap.c
@@ -20,20 +20,29 @@
20 20
21// Layer shorthand 21// Layer shorthand
22#define _CM 0 // Colemak 22#define _CM 0 // Colemak
23#define _NB 1 // Numbers 23#define _DV 1 // Dvorak
24#define _SYL 2 // Symbols left 24#define _QW 2 // QWERTY
25#define _SYR 3 // Symbols right 25#define _NB 3 // Numbers
26#define _NAV 4 // Navigation 26#define _SY 4 // Symbols
27#define _NAV 5 // Navigation
27 28
28// Layer buttons 29// Layer buttons
29#define _Z_SFT SFT_T(UK_Z) 30#define _Z_SFT SFT_T(UK_Z)
31#define _SCLSH SFT_T(UK_SCLN)
30#define _SLSH SFT_T(UK_SLSH) 32#define _SLSH SFT_T(UK_SLSH)
31#define _X_NB LT(_NB, UK_X) 33#define _X_NB LT(_NB, UK_X)
34#define _Q_NB LT(_NB, UK_Q)
32#define _DOT_NB LT(_NB, UK_DOT) 35#define _DOT_NB LT(_NB, UK_DOT)
33#define _C_SY LT(_SYL, UK_C) 36#define _V_NB LT(_NB, UK_V)
34#define _COM_SY LT(_SYR, UK_COMM) 37#define _C_SY LT(_SY, UK_C)
38#define _J_SY LT(_SY, UK_J)
39#define _W_SY LT(_SY, UK_W)
40#define _COM_SY LT(_SY, UK_COMM)
41#define _AST_SY LT(_SY, UK_PAST)
35#define _B_NAV LT(_NAV, UK_B) 42#define _B_NAV LT(_NAV, UK_B)
43#define _X_NAV LT(_NAV, UK_X)
36#define _K_NAV LT(_NAV, UK_K) 44#define _K_NAV LT(_NAV, UK_K)
45#define _N_NAV LT(_NAV, UK_N)
37#define _F1_NB LT(_NB, UK_F1) 46#define _F1_NB LT(_NB, UK_F1)
38#define _3_NB LT(_NB, UK_3) 47#define _3_NB LT(_NB, UK_3)
39 48
@@ -45,98 +54,142 @@
45#define _A_LEFT LALT(UK_LEFT) 54#define _A_LEFT LALT(UK_LEFT)
46#define _A_RGHT LALT(UK_RGHT) 55#define _A_RGHT LALT(UK_RGHT)
47 56
57enum custom_keycodes {
58 L_NEXT = SAFE_RANGE,
59 L_SB
60};
61
48const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 62const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
49 63
50/* Colemak _CM 64/* Colemak _CM
51 * .--------------------------------------------------------------------------------------------------------------------------------------. 65 * .--------------------------------------------------------------------------------------------------------------------------------------.
66 * | | | | | | | | | | | | | | L_NEXT | L_SB |
67 * |--------------------------------------------------------------------------------------------------------------------------------------|
68 * | Q | W | F | P | G | | | | | | J | L | U | Y | ; |
69 * |--------------------------------------------------------------------------------------------------------------------------------------|
70 * | A | R | S | T | D | | | | | | H | N | E | I | O |
71 * |--------------------------------------------------------------------------------------------------------------------------------------|
72 * | Z | X | C | V | B | | | | | | K | M | , | . | / |
73 * | SHIFT | NUMBER | SYMBOL | | NAV | | | | | | NAV | | SYMBOL | FUNC | SHIFT |
74 * |--------------------------------------------------------------------------------------------------------------------------------------|
75 * | LSHIFT | LCTRL | LALT | LGUI | SPACE | ENT | | | | DEL | BKSPC | RGUI | RALT | RCTRL | RSHIFT |
76 * .--------------------------------------------------------------------------------------------------------------------------------------.
77 */
78 [_CM] = {
79 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, L_NEXT, L_SB },
80 { UK_Q, UK_W, UK_F, UK_P, UK_G, _______, _______, _______, _______, _______, UK_J, UK_L, UK_U, UK_Y, UK_SCLN },
81 { UK_A, UK_R, UK_S, UK_T, UK_D, _______, _______, _______, _______, _______, UK_H, UK_N, UK_E, UK_I, UK_O },
82 { _Z_SFT, _X_NB, _C_SY, UK_V, _B_NAV, _______, _______, _______, _______, _______, _K_NAV, UK_M, _COM_SY, _DOT_NB, _SLSH },
83 { UK_LSFT, UK_LCTL, UK_LALT, UK_LGUI, UK_SPC, UK_ENT, _______, _______, _______, UK_DEL, UK_BSPC, UK_RGUI, UK_RALT, UK_RCTL, UK_RSFT }
84 },
85
86/* DVORAK _DV
87 * .--------------------------------------------------------------------------------------------------------------------------------------.
52 * | | | | | | | | | | | | | | | | 88 * | | | | | | | | | | | | | | | |
53 * |--------------------------------------------------------------------------------------------------------------------------------------| 89 * |--------------------------------------------------------------------------------------------------------------------------------------|
54 * | | Q | W | F | P | G | | | | J | L | U | Y | ; | | 90 * | ' | , | . | P | Y | | | | | | F | G | C | R | L |
55 * |--------------------------------------------------------------------------------------------------------------------------------------| 91 * |--------------------------------------------------------------------------------------------------------------------------------------|
56 * | | A | R | S | T | D | | | | H | N | E | I | O | ENT | 92 * | A | O | E | U | I | | | | | | D | H | T | N | S |
57 * |--------------------------------------------------------------------------------------------------------------------------------------| 93 * |--------------------------------------------------------------------------------------------------------------------------------------|
58 * | | Z | X | C | V | B | | | | K | M | , | . | / | | 94 * | ; | Q | J | K | X | | | | | | B | M | W | V | Z |
59 * | | SHIFT | NUMBER | SYMBOL | | NAV | | | | NAV | | SYMBOL | FUNC | SHIFT | | 95 * | SHIFT | NUMBER | SYMBOL | | NAV | | | | | | NAV | | SYMBOL | FUNC | SHIFT |
60 * |--------------------------------------------------------------------------------------------------------------------------------------| 96 * |--------------------------------------------------------------------------------------------------------------------------------------|
61 * | LSHIFT | LCTRL | LALT | LGUI | TERM | SPACE | LCTRL | DEL | LALT | BACKSP | RGUI | RGUI | RALT | RCTRL | RSHIFT | 97 * | | | | | | | | | | | | | | | |
62 * |--------------------------------------------------------------------------------------------------------------------------------------| 98 * |--------------------------------------------------------------------------------------------------------------------------------------|
63 */ 99 */
64 [_CM] = { 100 [_DV] = {
101 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
102 { UK_QUOT, UK_COMM, UK_DOT, UK_P, UK_Y, _______, _______, _______, _______, _______, UK_F, UK_G, UK_C, UK_R, UK_L },
103 { UK_A, UK_O, UK_E, UK_U, UK_I, _______, _______, _______, _______, _______, UK_D, UK_H, UK_T, UK_N, UK_S },
104 { _SCLSH, _Q_NB, _J_SY, UK_K, _X_NAV, _______, _______, _______, _______, _______, _B_NAV, UK_M, _W_SY, _V_NB, _Z_SFT },
105 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }
106 },
107
108/* QWERTY _QW
109 * .--------------------------------------------------------------------------------------------------------------------------------------.
110 * | | | | | | | | | | | | | | | |
111 * |--------------------------------------------------------------------------------------------------------------------------------------|
112 * | Q | W | E | R | T | | | | | | Y | U | I | O | P |
113 * |--------------------------------------------------------------------------------------------------------------------------------------|
114 * | A | S | D | F | G | | | | | | H | J | K | L | ; |
115 * |--------------------------------------------------------------------------------------------------------------------------------------|
116 * | Z | X | C | V | B | | | | | | N | M | , | . | / |
117 * | SHIFT | NUMBER | SYMBOL | | NAV | | | | | | NAV | | SYMBOL | FUNC | SHIFT |
118 * |--------------------------------------------------------------------------------------------------------------------------------------|
119 * | | | | | | | | | | | | | | | |
120 * |--------------------------------------------------------------------------------------------------------------------------------------|
121 * | LSHIFT | LCTRL | LALT | LGUI | SPACE | ENT | | | | DEL | BKSPC | RGUI | RALT | RCTRL | RSHIFT |
122 * .--------------------------------------------------------------------------------------------------------------------------------------.
123 */
124 [_QW] = {
65 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 125 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
66 { _______, UK_Q, UK_W, UK_F, UK_P, UK_G, _______, _______, _______, UK_J, UK_L, UK_U, UK_Y, UK_SCLN, _______ }, 126 { UK_Q, UK_W, UK_E, UK_R, UK_T, _______, _______, _______, _______, _______, UK_Y, UK_U, UK_I, UK_O, UK_P },
67 { _______, UK_A, UK_R, UK_S, UK_T, UK_D, _______, _______, _______, UK_H, UK_N, UK_E, UK_I, UK_O, UK_ENT }, 127 { UK_A, UK_S, UK_D, UK_F, UK_G, _______, _______, _______, _______, _______, UK_H, UK_J, UK_K, UK_L, UK_SCLN },
68 { _______, _Z_SFT, _X_NB, _C_SY, UK_V, _B_NAV, _______, _______, _______, _K_NAV, UK_M, _COM_SY, _DOT_NB, _SLSH, _______ }, 128 { _Z_SFT, _X_NB, _C_SY, UK_V, _B_NAV, _______, _______, _______, _______, _______, _N_NAV, UK_M, _COM_SY, _DOT_NB, _SLSH },
69 { UK_LSFT, UK_LCTL, UK_LALT, UK_LGUI, _TERM, UK_SPC, UK_LCTL, UK_DEL , UK_LALT, UK_BSPC, UK_RGUI, UK_RGUI, UK_RALT, UK_RCTL, UK_RSFT }, 129 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }
70 }, 130 },
71 131
72/* Numbers _NB 132/* Numbers _NB
73 * .--------------------------------------------------------------------------------------------------------------------------------------. 133 * .--------------------------------------------------------------------------------------------------------------------------------------.
74 * | | | | | | | | | | | | | | | | 134 * | | | | | | | | | | | | | | | |
75 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------| 135 * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
76 * | | | F7 | F8 | F9 | F10 | | | | | 7 | 8 | 9 | | | 136 * | | F7 | F8 | F9 | F10 | | | | | | | 7 | 8 | 9 | |
77 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 137 * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
78 * | | | F4 | F5 | F6 | F11 | | | | | 4 | 5 | 6 | | | 138 * | | F4 | F5 | F6 | F11 | | | | | | | 4 | 5 | 6 | |
79 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------| 139 * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
80 * | | | F1 | F2 | F3 | F12 | | | | | 1 | 2 | 3 | | | 140 * | | F1 | F2 | F3 | F12 | | | | | | 0 | 1 | 2 | 3 | . |
81 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------| 141 * |-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------+--------|
82 * | | | | | | | | | | | 0 | 0 | . | | | 142 * | | | | | | | | | | | | | | | |
83 * '--------------------------------------------------------------------------------------------------------------------------------------' 143 * '--------------------------------------------------------------------------------------------------------------------------------------'
84 */ 144 */
85 [_NB] = { 145 [_NB] = {
86 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 146 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
87 { _______, _______, UK_F7, UK_F8, UK_F9, UK_F10, _______, _______, _______, _______, UK_7, UK_8, UK_9, _______, _______ }, 147 { _______, UK_F7, UK_F8, UK_F9, UK_F10, _______, _______, _______, _______, _______, _______, UK_7, UK_8, UK_9, _______ },
88 { _______, _______, UK_F4, UK_F5, UK_F6, UK_F11, _______, _______, _______, _______, UK_4, UK_5, UK_6, _______, _______ }, 148 { _______, UK_F4, UK_F5, UK_F6, UK_F11, _______, _______, _______, _______, _______, _______, UK_4, UK_5, UK_6, _______ },
89 { _______, _______, _F1_NB, UK_F2, UK_F3, UK_F12, _______, _______, _______, _______, UK_1, UK_2, _3_NB, _______, _______ }, 149 { _______, _F1_NB, UK_F2, UK_F3, UK_F12, _______, _______, _______, _______, _______, UK_0, UK_1, UK_2, _3_NB, UK_DOT },
90 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UK_0, UK_0, UK_DOT, _______, _______ }, 150 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }
91 }, 151 },
92 152
93/* Symbols _SYL and _SYR - For some reason, combining this into the same layer causes problems. 153/* Symbols _SY
94 * .--------------------------------------------------------------------------------------------------------------------------------------. 154 * .--------------------------------------------------------------------------------------------------------------------------------------.
95 * | | | | | | | | | | | | | | | | 155 * | | | | | | | | | | | | | | | |
96 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 156 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
97 * | | ! | £ | _ | - | ~ | | | | \ | { | } | / | # | | 157 * | ! | £ | _ | - | ~ | | | | | | \ | { | } | / | # |
98 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 158 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
99 * | | $ | % | + | = | | | | | " | ( | ) | ' | @ | | 159 * | $ | % | + | = | | | | | | | " | ( | ) | ' | @ |
100 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 160 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
101 * | | ^ | & | * | | | | | | | < | [ | ] | > | ` | | 161 * | ^ | & | * | | | | | | | | | < | [ | ] | > | ` |
102 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 162 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
103 * | | | | | | | | | | | | | | | | 163 * | | | | | | | | | | | | | | | |
104 * '--------------------------------------------------------------------------------------------------------------------------------------' 164 * '--------------------------------------------------------------------------------------------------------------------------------------'
105 */ 165 */
106 [_SYL] = { 166 [_SY] = {
107 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
108 { _______, UK_EXLM, UK_PND, UK_UNDS, UK_MINS, UK_TILD, _______, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH, _______ },
109 { _______, UK_DLR, UK_PERC, UK_PLUS, UK_EQL, _______, _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT, _______ },
110 { _______, UK_CIRC, UK_AMPR, _C_SY, UK_PIPE, _______, _______, _______, _______, UK_LABK, UK_LBRC, UK_RBRC, UK_RABK, UK_GRV, _______ },
111 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
112 },
113 [_SYR] = {
114 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
115 { _______, UK_EXLM, UK_PND, UK_UNDS, UK_MINS, UK_TILD, _______, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH, _______ },
116 { _______, UK_DLR, UK_PERC, UK_PLUS, UK_EQL, _______, _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT, _______ },
117 { _______, UK_CIRC, UK_AMPR, UK_ASTR, UK_PIPE, _______, _______, _______, _______, UK_LABK, UK_LBRC, _COM_SY, UK_RABK, UK_GRV, _______ },
118 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 167 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
168 { UK_EXLM, UK_PND, UK_UNDS, UK_MINS, UK_TILD, _______, _______, _______, _______, _______, UK_BSLS, UK_LCBR, UK_RCBR, UK_SLSH, UK_HASH },
169 { UK_DLR, UK_PERC, UK_PLUS, UK_EQL, _______, _______, _______, _______, _______, _______, UK_DQUO, UK_LPRN, UK_RPRN, UK_QUOT, UK_AT },
170 { UK_CIRC, UK_AMPR, _AST_SY, UK_PIPE, _______, _______, _______, _______, _______, _______, UK_LABK, UK_LBRC, _COM_SY, UK_RABK, UK_GRV },
171 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }
119 }, 172 },
120/* 173/*
121 * Navigation 174 * Navigation
122 * .--------------------------------------------------------------------------------------------------------------------------------------. 175 * .--------------------------------------------------------------------------------------------------------------------------------------.
123 * | | | | | | | | | | | | | | | | 176 * | RESET | COLEMA | DVORAK | QWERTY | | | | | | | | | | | |
124 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 177 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
125 * | | Esc | Ctrl L | Up | Ctrl R | | | | | | PtSn | ScLk | Pause | | | 178 * | Esc | Ctrl L | Up | Ctrl R | | RGB HD | RGB HI | | | | | PtSn | ScLk | Pause | |
179 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
180 * | Tab | Left | Down | Right | | RGB SD | RGB SI | | | | | Insert | Home | PgUp | Term |
181 * +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
182 * | ShTab | Alt L | Shift | Alt R | | RGB VD | RGB VI | | | | | ScLk | End | PgDn | |
126 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| 183 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
127 * | | Tab | Left | Down | Right | | | | | | Insert | Home | PgUp | | | 184 * | | | | | | RGB RMD| RGB MD | | | | | | | | |
128 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
129 * | | ShTab | Alt L | Shift | Alt R | | | | | | ScLk | End | PgDn | | |
130 * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
131 * | | | | | | | | | | | | | | | RESET |
132 * '--------------------------------------------------------------------------------------------------------------------------------------' 185 * '--------------------------------------------------------------------------------------------------------------------------------------'
133 */ 186 */
134 [_NAV] = { 187 [_NAV] = {
135 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, 188 { RESET, DF(_CM), DF(_DV), DF(_QW), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
136 { _______, UK_ESC, _C_LEFT, UK_UP , _C_RGHT, _______, _______, _______, _______, _______, UK_PSCR, UK_SLCK, UK_PAUS, _______, _______ }, 189 { UK_ESC, _C_LEFT, UK_UP , _C_RGHT, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, UK_PSCR, UK_SLCK, UK_PAUS, _______ },
137 { _______, UK_TAB, UK_LEFT, UK_DOWN, UK_RGHT, _______, _______, _______, _______, _______, UK_INS, UK_HOME, UK_PGUP, _______, _______ }, 190 { UK_TAB, UK_LEFT, UK_DOWN, UK_RGHT, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, UK_INS, UK_HOME, UK_PGUP, _TERM },
138 { _______, _S_TAB, _A_LEFT, UK_LSFT, _A_RGHT, _B_NAV, _______, _______, _______, _K_NAV, UK_SLCK, UK_END, UK_PGDN, _______, _______ }, 191 { _S_TAB, _A_LEFT, UK_LSFT, _A_RGHT, _B_NAV, RGB_VAD, RGB_VAI, _______, _______, _______, _K_NAV, UK_SLCK, UK_END, UK_PGDN, _______ },
139 { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET }, 192 { _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______ }
140 }, 193 },
141}; 194};
142 195
@@ -162,50 +215,74 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
162 return MACRO_NONE; 215 return MACRO_NONE;
163}; 216};
164 217
165bool CTRLDOWN = false; 218bool lightsOn = true;
166bool ALTDOWN = false; 219int keyPresses = 0;
167bool WINDOWN = false; 220int effect = 0;
168bool SHIFTDOWN = false; 221uint32_t key_timer;
169bool TERMINALOPEN = false; 222
223void resetCounts(void) {
224 effect++;
225 keyPresses = 0;
226 key_timer = timer_read32();
227}
170 228
171void matrix_scan_user(void) { 229void matrix_scan_user(void) {
172 if (TERMINALOPEN) { 230 if (!lightsOn) {
173 rgblight_effect_rainbow_swirl(128);
174 } else if (SHIFTDOWN) {
175 rgblight_effect_breathing(3);
176 } else if (CTRLDOWN) {
177 rgblight_effect_knight(3);
178 } else if (WINDOWN) {
179 rgblight_effect_snake(3);
180 } else {
181 rgblight_setrgb(0, 0, 0); 231 rgblight_setrgb(0, 0, 0);
232 return;
182 } 233 }
183} 234 if (timer_elapsed32(key_timer) > 60000) {
184 235 resetCounts();
185bool process_record_user(uint16_t keycode, keyrecord_t *record) { 236 }
186 switch (keycode) { 237 switch (effect) {
187 case UK_LGUI: 238 case 0:
188 case UK_RGUI: 239 rgblight_effect_breathing(3);
189 WINDOWN = record->event.pressed;
190 TERMINALOPEN = false;
191 break; 240 break;
192 case UK_LCTL: 241 case 1:
193 case UK_RCTL: 242 rgblight_effect_knight(3);
194 CTRLDOWN = record->event.pressed;
195 break; 243 break;
196 case UK_LSFT: 244 case 2:
197 case UK_RSFT: 245 rgblight_effect_rainbow_swirl(128);
198 SHIFTDOWN = record->event.pressed;
199 break; 246 break;
200 case UK_LALT: 247 case 3:
201 case UK_RALT: 248 rgblight_effect_snake(30);
202 ALTDOWN = record-> event.pressed;
203 break; 249 break;
204 case _TERM: 250 case 4:
205 if (record->event.pressed) { 251 rgblight_effect_rainbow_swirl(128);
206 TERMINALOPEN = !TERMINALOPEN; 252 break;
207 } 253 case 5:
254 rgblight_effect_rainbow_mood(128);
255 break;
256 case 6:
257 rgblight_effect_christmas();
258 break;
259 case 7:
260 rgblight_effect_rgbtest();
261 break;
262 default:
263 effect = 0;
208 break; 264 break;
209 } 265 }
266}
267
268bool process_record_user(uint16_t keycode, keyrecord_t *record) {
269 if (!record->event.pressed) return true;
270 if (keycode == L_SB) {
271 lightsOn = !lightsOn;
272 if (!lightsOn) {
273 keyPresses = 0;
274 } else {
275 resetCounts();
276 }
277 return true;
278 }
279 if (keycode == L_NEXT) {
280 resetCounts();
281 return true;
282 }
283 keyPresses++;
284 if (keyPresses > 100) {
285 resetCounts();
286 }
210 return true; 287 return true;
211} 288}
diff --git a/quantum/keymap_extras/keymap_uk.h b/quantum/keymap_extras/keymap_uk.h
index 1d1969a6a..de47103cb 100644
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@@ -132,6 +132,25 @@
132#define UK_ASTR KC_ASTR 132#define UK_ASTR KC_ASTR
133#define UK_QUOT KC_QUOT 133#define UK_QUOT KC_QUOT
134 134
135#define UK_P1 KC_P1
136#define UK_P2 KC_P2
137#define UK_P3 KC_P3
138#define UK_P4 KC_P4
139#define UK_P5 KC_P5
140#define UK_P6 KC_P6
141#define UK_P7 KC_P7
142#define UK_P8 KC_P8
143#define UK_P9 KC_P9
144#define UK_P0 KC_P0
145#define UK_PDOT KC_PDOT
146#define UK_PCMM KC_PCMM
147#define UK_PSLS KC_PSLS
148#define UK_PAST KC_PAST
149#define UK_PMNS KC_PMNS
150#define UK_PPLS KC_PPLS
151#define UK_PEQL KC_PEQL
152#define UK_PENT KC_PENT
153
135#define UK_TAB KC_TAB 154#define UK_TAB KC_TAB
136#define UK_ENT KC_ENT 155#define UK_ENT KC_ENT
137#define UK_LSFT KC_LSFT 156#define UK_LSFT KC_LSFT
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-03 18:22:19 +0000