aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-12-14 21:36:03 -0800
committerDrashna Jaelre <drashna@live.com>2018-12-14 21:36:03 -0800
commit45591ee443f57000bf5ad39f45bfa5d44f43dce0 (patch)
tree9a2322770607eb1c7efa17063c4e3f3e45c048fb
parent8f790948e5f7ed62b2c56e1a6aa63dae89d5c860 (diff)
downloadqmk_firmware-45591ee443f57000bf5ad39f45bfa5d44f43dce0.tar.gz
qmk_firmware-45591ee443f57000bf5ad39f45bfa5d44f43dce0.zip
Keyboard: Chimera Ortho refactor (#4652)
* Layout macro refactor - Renamed KC_KEYMAP to LAYOUT_kc - Renamed KEYMAP to LAYOUT - moved LAYOUT above LAYOUT_kc (Hoping this encourages users to use LAYOUT.) - updated layout macro name in info.json - white space changes for readability * Keymap refactor: default Default keymap now uses `#include QMK_KEYBOARD_H` and LAYOUT macro (from KC_KEYMAP/LAYOUT_kc). Keymap was also refactored to use process_record_user function instead of deprecated action_get_macro from TMK. Also moved LONGPRESS_DELAY and LAYER_TOGGLE_DELAY definitions to config.h. * Keymap refactor: dcompact - Changed chimera_ortho.h include for QMK_KEYBOARD_H - Updated layout name on keymap layers * Coding conventions fix in default keymap * Keymap refactor: gordon - Changed chimera_ortho.h include for QMK_KEYBOARD_H - Removed redundant includes of action_layer.h and process_tap_dance.h (superseded by QMK_KEYBOARD_H) - Removed redundant definitions for KC_NO and KC_TRNS - Updated layout name on keymap layers
Diffstat
-rw-r--r--keyboards/chimera_ortho/chimera_ortho.h33
-rw-r--r--keyboards/chimera_ortho/info.json280
-rw-r--r--keyboards/chimera_ortho/keymaps/dcompact/keymap.c12
-rw-r--r--keyboards/chimera_ortho/keymaps/default/config.h5
-rw-r--r--keyboards/chimera_ortho/keymaps/default/keymap.c218
-rw-r--r--keyboards/chimera_ortho/keymaps/gordon/keymap.c58
6 files changed, 206 insertions, 400 deletions
diff --git a/keyboards/chimera_ortho/chimera_ortho.h b/keyboards/chimera_ortho/chimera_ortho.h
index 3b7690d43..598125275 100644
--- a/keyboards/chimera_ortho/chimera_ortho.h
+++ b/keyboards/chimera_ortho/chimera_ortho.h
@@ -49,31 +49,32 @@
49// This a shortcut to help you visually see your layout. 49// This a shortcut to help you visually see your layout.
50// The first section contains all of the arguements 50// The first section contains all of the arguements
51// The second converts the arguments into a two-dimensional array 51// The second converts the arguments into a two-dimensional array
52#define KC_KEYMAP( \ 52#define LAYOUT( \
53 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \ 53 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
54 k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \ 54 k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \
55 k28, k29, k31, k32, k33, k34, k35, k36, k37, k38, k41, k42, k43, k44,\ 55 k28, k29, k31, k32, k33, k34, k35, k36, k37, k38, k41, k42, k43, k44, \
56 k45, k46, k47, k48 \ 56 k45, k46, k47, k48 \
57) \ 57) \
58{ \ 58{ \
59 { KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k08, KC_##k09, KC_##k10, KC_##k11, KC_##k12 }, \ 59 { k01, k02, k03, k04, k05, k08, k09, k10, k11, k12 }, \
60 { KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26 }, \ 60 { k15, k16, k17, k18, k19, k22, k23, k24, k25, k26 }, \
61 { KC_##k29, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k37, KC_##k38, KC_##k41, KC_##k42, KC_##k43 }, \ 61 { k29, k31, k32, k33, k34, k37, k38, k41, k42, k43 }, \
62 { KC_NO, KC_##k06, KC_##k20, KC_##k35, KC_##k46, KC_##k47, KC_##k36, KC_##k21, KC_##k07, KC_NO }, \ 62 { KC_NO, k06, k20, k35, k46, k47, k36, k21, k07, KC_NO }, \
63 { KC_NO, KC_##k28, KC_##k14, KC_##k00, KC_##k45, KC_##k48, KC_##k13, KC_##k27, KC_##k44, KC_NO }, \ 63 { KC_NO, k28, k14, k00, k45, k48, k13, k27, k44, KC_NO } \
64} 64}
65 65
66#define KEYMAP( \ 66#define LAYOUT_kc( \
67 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \ 67 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
68 k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \ 68 k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \
69 k28, k29, k31, k32, k33, k34, k35, k36, k37, k38, k41, k42, k43, k44,\ 69 k28, k29, k31, k32, k33, k34, k35, k36, k37, k38, k41, k42, k43, k44, \
70 k45, k46, k47, k48 \ 70 k45, k46, k47, k48 \
71) \ 71) \
72{ \ 72{ \
73 { k01, k02, k03, k04, k05, k08, k09, k10, k11, k12 }, \ 73 { KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k08, KC_##k09, KC_##k10, KC_##k11, KC_##k12 }, \
74 { k15, k16, k17, k18, k19, k22, k23, k24, k25, k26 }, \ 74 { KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26 }, \
75 { k29, k31, k32, k33, k34, k37, k38, k41, k42, k43 }, \ 75 { KC_##k29, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k37, KC_##k38, KC_##k41, KC_##k42, KC_##k43 }, \
76 { KC_NO, k06, k20, k35, k46, k47, k36, k21, k07, KC_NO }, \ 76 { KC_NO, KC_##k06, KC_##k20, KC_##k35, KC_##k46, KC_##k47, KC_##k36, KC_##k21, KC_##k07, KC_NO }, \
77 { KC_NO, k28, k14, k00, k45, k48, k13, k27, k44, KC_NO }, \ 77 { KC_NO, KC_##k28, KC_##k14, KC_##k00, KC_##k45, KC_##k48, KC_##k13, KC_##k27, KC_##k44, KC_NO } \
78} 78}
79
79#endif 80#endif
diff --git a/keyboards/chimera_ortho/info.json b/keyboards/chimera_ortho/info.json
index b1384379c..3f8481be4 100644
--- a/keyboards/chimera_ortho/info.json
+++ b/keyboards/chimera_ortho/info.json
@@ -1,240 +1,58 @@
1{ 1{
2 "keyboard_name": "Chimera Ortho",
3 "keyboard_folder": "chimera_ortho",
2 "maintainer": "qmk", 4 "maintainer": "qmk",
3 "width": 15.5, 5 "width": 15.5,
4 "height": 4.25, 6 "height": 4.25,
5 "layouts": { 7 "layouts": {
6 "KEYMAP": { 8 "LAYOUT": {
7 "layout": [ 9 "layout": [
8 { 10 {"label": "Esc", "x": 0, "y": 0},
9 "label": "Esc", 11 {"label": "Q", "x": 1, "y": 0},
10 "x": 0, 12 {"label": "W", "x": 2, "y": 0},
11 "y": 0 13 {"label": "E", "x": 3, "y": 0},
12 }, 14 {"label": "R", "x": 4, "y": 0},
13 { 15 {"label": "T", "x": 5, "y": 0},
14 "label": "Q", 16 {"label": "{", "x": 6, "y": 0},
15 "x": 1, 17 {"label": "}", "x": 8.5, "y": 0},
16 "y": 0 18 {"label": "Y", "x": 9.5, "y": 0},
17 }, 19 {"label": "U", "x": 10.5, "y": 0},
18 { 20 {"label": "I", "x": 11.5, "y": 0},
19 "label": "W", 21 {"label": "O", "x": 12.5, "y": 0},
20 "x": 2, 22 {"label": "P", "x": 13.5, "y": 0},
21 "y": 0 23 {"label": "\"", "x": 14.5, "y": 0},
22 }, 24 {"label": "Tab", "x": 0, "y": 1},
23 { 25 {"label": "A", "x": 1, "y": 1},
24 "label": "E", 26 {"label": "S", "x": 2, "y": 1},
25 "x": 3, 27 {"label": "D", "x": 3, "y": 1},
26 "y": 0 28 {"label": "F", "x": 4, "y": 1},
27 }, 29 {"label": "G", "x": 5, "y": 1},
28 { 30 {"label": "-", "x": 6, "y": 1},
29 "label": "R", 31 {"label": "1", "x": 8.5, "y": 1},
30 "x": 4, 32 {"label": "H", "x": 9.5, "y": 1},
31 "y": 0 33 {"label": "J", "x": 10.5, "y": 1},
32 }, 34 {"label": "K", "x": 11.5, "y": 1},
33 { 35 {"label": "L", "x": 12.5, "y": 1},
34 "label": "T", 36 {"label": ";", "x": 13.5, "y": 1},
35 "x": 5, 37 {"label": "Enter", "x": 14.5, "y": 1},
36 "y": 0 38 {"label": "(", "x": 0, "y": 2},
37 }, 39 {"label": "Z", "x": 1, "y": 2},
38 { 40 {"label": "X", "x": 2, "y": 2},
39 "label": "{", 41 {"label": "C", "x": 3, "y": 2},
40 "x": 6, 42 {"label": "V", "x": 4, "y": 2},
41 "y": 0 43 {"label": "B", "x": 5, "y": 2},
42 }, 44 {"label": "=", "x": 6, "y": 2},
43 { 45 {"label": "8", "x": 8.5, "y": 2},
44 "label": "}", 46 {"label": "N", "x": 9.5, "y": 2},
45 "x": 8.5, 47 {"label": "M", "x": 10.5, "y": 2},
46 "y": 0 48 {"label": ", ", "x": 11.5, "y": 2},
47 }, 49 {"label": ".", "x": 12.5, "y": 2},
48 { 50 {"label": "/", "x": 13.5, "y": 2},
49 "label": "Y", 51 {"label": ")", "x": 14.5, "y": 2},
50 "x": 9.5, 52 {"label": "Num Layer", "x": 4, "y": 3.25},
51 "y": 0 53 {"label": "Back Space", "x": 5, "y": 3.25},
52 }, 54 {"label": "Space", "x": 9.5, "y": 3.25},
53 { 55 {"label": "Symbol Layer", "x": 10.5, "y": 3.25}
54 "label": "U",
55 "x": 10.5,
56 "y": 0
57 },
58 {
59 "label": "I",
60 "x": 11.5,
61 "y": 0
62 },
63 {
64 "label": "O",
65 "x": 12.5,
66 "y": 0
67 },
68 {
69 "label": "P",
70 "x": 13.5,
71 "y": 0
72 },
73 {
74 "label": "\"",
75 "x": 14.5,
76 "y": 0
77 },
78 {
79 "label": "Tab",
80 "x": 0,
81 "y": 1
82 },
83 {
84 "label": "A",
85 "x": 1,
86 "y": 1
87 },
88 {
89 "label": "S",
90 "x": 2,
91 "y": 1
92 },
93 {
94 "label": "D",
95 "x": 3,
96 "y": 1
97 },
98 {
99 "label": "F",
100 "x": 4,
101 "y": 1
102 },
103 {
104 "label": "G",
105 "x": 5,
106 "y": 1
107 },
108 {
109 "label": "-",
110 "x": 6,
111 "y": 1
112 },
113 {
114 "label": "1",
115 "x": 8.5,
116 "y": 1
117 },
118 {
119 "label": "H",
120 "x": 9.5,
121 "y": 1
122 },
123 {
124 "label": "J",
125 "x": 10.5,
126 "y": 1
127 },
128 {
129 "label": "K",
130 "x": 11.5,
131 "y": 1
132 },
133 {
134 "label": "L",
135 "x": 12.5,
136 "y": 1
137 },
138 {
139 "label": ";",
140 "x": 13.5,
141 "y": 1
142 },
143 {
144 "label": "Enter",
145 "x": 14.5,
146 "y": 1
147 },
148 {
149 "label": "(",
150 "x": 0,
151 "y": 2
152 },
153 {
154 "label": "Z",
155 "x": 1,
156 "y": 2
157 },
158 {
159 "label": "X",
160 "x": 2,
161 "y": 2
162 },
163 {
164 "label": "C",
165 "x": 3,
166 "y": 2
167 },
168 {
169 "label": "V",
170 "x": 4,
171 "y": 2
172 },
173 {
174 "label": "B",
175 "x": 5,
176 "y": 2
177 },
178 {
179 "label": "=",
180 "x": 6,
181 "y": 2
182 },
183 {
184 "label": "8",
185 "x": 8.5,
186 "y": 2
187 },
188 {
189 "label": "N",
190 "x": 9.5,
191 "y": 2
192 },
193 {
194 "label": "M",
195 "x": 10.5,
196 "y": 2
197 },
198 {
199 "label": ",",
200 "x": 11.5,
201 "y": 2
202 },
203 {
204 "label": ".",
205 "x": 12.5,
206 "y": 2
207 },
208 {
209 "label": "/",
210 "x": 13.5,
211 "y": 2
212 },
213 {
214 "label": ")",
215 "x": 14.5,
216 "y": 2
217 },
218 {
219 "label": "Num Layer",
220 "x": 4,
221 "y": 3.25
222 },
223 {
224 "label": "Back Space",
225 "x": 5,
226 "y": 3.25
227 },
228 {
229 "label": "Space",
230 "x": 9.5,
231 "y": 3.25
232 },
233 {
234 "label": "Symbol Layer",
235 "x": 10.5,
236 "y": 3.25
237 }
238 ] 56 ]
239 } 57 }
240 } 58 }
diff --git a/keyboards/chimera_ortho/keymaps/dcompact/keymap.c b/keyboards/chimera_ortho/keymaps/dcompact/keymap.c
index 74c3a25cd..1c6ef7d6f 100644
--- a/keyboards/chimera_ortho/keymaps/dcompact/keymap.c
+++ b/keyboards/chimera_ortho/keymaps/dcompact/keymap.c
@@ -1,4 +1,4 @@
1#include "chimera_ortho.h" 1#include QMK_KEYBOARD_H
2 2
3enum chimera_ortho_layers 3enum chimera_ortho_layers
4{ 4{
@@ -34,7 +34,7 @@ enum chimera_ortho_layers
34 34
35const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 35const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 36
37 [_BASE] = KC_KEYMAP( 37 [_BASE] = LAYOUT_kc(
38 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. 38 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
39 LALT ,TAB ,QUOT ,COMM ,DOT ,P ,Y ,F ,G ,C ,R ,L ,SLSH ,FUNC 39 LALT ,TAB ,QUOT ,COMM ,DOT ,P ,Y ,F ,G ,C ,R ,L ,SLSH ,FUNC
40 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| 40 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46 //\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/ 46 //\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/
47 ), 47 ),
48 48
49 [_NAV] = KC_KEYMAP( 49 [_NAV] = LAYOUT_kc(
50 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. 50 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
51 , , , , , , , ,HOME ,PGDOWN ,PGUP ,END , , 51 , , , , , , , ,HOME ,PGDOWN ,PGUP ,END , ,
52 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| 52 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
58 //\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/ 58 //\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/
59 ), 59 ),
60 60
61 [_SYM] = KC_KEYMAP( 61 [_SYM] = LAYOUT_kc(
62 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. 62 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
63 ,QUAKE ,GRAVE ,TILDE ,BSLASH ,PIPE ,LPRN ,RPRN ,7 ,8 ,9 ,SLSH ,EQUAL , 63 ,QUAKE ,GRAVE ,TILDE ,BSLASH ,PIPE ,LPRN ,RPRN ,7 ,8 ,9 ,SLSH ,EQUAL ,
64 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| 64 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
70 //\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/ 70 //\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/
71 ), 71 ),
72 72
73 [_FUNC] = KC_KEYMAP( 73 [_FUNC] = LAYOUT_kc(
74 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. 74 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
75 ,RESET ,SLEP ,MRWD ,MPLY ,MFFD , , ,F9 ,F10 ,F11 ,F12 , , 75 ,RESET ,SLEP ,MRWD ,MPLY ,MFFD , , ,F9 ,F10 ,F11 ,F12 , ,
76 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| 76 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82 //\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/ 82 //\-------------------------------+-------+-------+-------/ \-------+-------+---------------------------------------/
83 ), 83 ),
84 84
85 [_MOUSE] = KC_KEYMAP( 85 [_MOUSE] = LAYOUT_kc(
86 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------. 86 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
87 , , , , , , , , , , , , , 87 , , , , , , , , , , , , ,
88 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------| 88 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
diff --git a/keyboards/chimera_ortho/keymaps/default/config.h b/keyboards/chimera_ortho/keymaps/default/config.h
new file mode 100644
index 000000000..bdfd4db80
--- /dev/null
+++ b/keyboards/chimera_ortho/keymaps/default/config.h
@@ -0,0 +1,5 @@
1#pragma once
2
3// place overrides here
4#define LONGPRESS_DELAY 150
5//#define LAYER_TOGGLE_DELAY 300
diff --git a/keyboards/chimera_ortho/keymaps/default/keymap.c b/keyboards/chimera_ortho/keymaps/default/keymap.c
index 6201eebac..6a676493d 100644
--- a/keyboards/chimera_ortho/keymaps/default/keymap.c
+++ b/keyboards/chimera_ortho/keymaps/default/keymap.c
@@ -1,20 +1,19 @@
1// this is the style you want to emulate. 1// this is the style you want to emulate.
2// This is the canonical layout file for the Quantum project. If you want to add another keyboard, 2// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
3 3
4#include "chimera_ortho.h" 4#include QMK_KEYBOARD_H
5 5
6// Each layer gets a name for readability, which is then used in the keymap matrix below. 6// Each layer gets a name for readability, which is then used in the keymap matrix below.
7// The underscores don't mean anything - you can have a layer called STUFF or any other name. 7// The underscores don't mean anything - you can have a layer called STUFF or any other name.
8// Layer names don't all need to be of the same length, obviously, and you can also skip them 8// Layer names don't all need to be of the same length, obviously, and you can also skip them
9// entirely and just use numbers. 9// entirely and just use numbers.
10enum chimera_ortho_layers 10enum chimera_ortho_layers {
11{ 11 _QWERTY,
12 _QWERTY, 12 _CAPS,
13 _CAPS, 13 _NUMPAD,
14 _NUMPAD, 14 _SYMBOLS,
15 _SYMBOLS, 15 _MACROS,
16 _MACROS, 16 _NAV
17 _NAV
18}; 17};
19 18
20#define KC_NMPD TG(_NUMPAD) 19#define KC_NMPD TG(_NUMPAD)
@@ -27,153 +26,140 @@ enum chimera_ortho_layers
27#define KC_GBRC MT(MOD_RGUI, KC_8) 26#define KC_GBRC MT(MOD_RGUI, KC_8)
28#define KC_GQOT MT(MOD_LGUI, KC_QUOT) 27#define KC_GQOT MT(MOD_LGUI, KC_QUOT)
29#define KC_MESC LT(_MACROS, KC_ESC) 28#define KC_MESC LT(_MACROS, KC_ESC)
30#define KC_INCL M(0)
31#define KC_PULL M(1)
32#define KC_PUSH M(2)
33#define KC_SCAP M(3)
34#define KC_SCOF M(4)
35#define KC_CAD LALT(LCTL(KC_DEL)) 29#define KC_CAD LALT(LCTL(KC_DEL))
36 30
37#define LONGPRESS_DELAY 150 31enum custom_keycodes {
38//#define LAYER_TOGGLE_DELAY 300 32 KC_INCL = SAFE_RANGE,
39 33 KC_PULL,
40// Fillers to make layering more clear 34 KC_PUSH,
41#define _______ KC_TRNS 35 KC_SCAP,
42#define XXXXXXX KC_NO 36 KC_SCOF
43#define KC_ KC_TRNS 37};
44 38
45const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 39const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46 40
47 [_QWERTY] = KC_KEYMAP( 41 [_QWERTY] = LAYOUT(
48 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 42 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
49 MESC, Q , W , E , R , T ,SCTL, SCTR, Y , U , I , O , P ,QUOT, 43 KC_MESC, KC_Q , KC_W , KC_E , KC_R , KC_T ,KC_SCTL, KC_SCTR, KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_QUOT,
50 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 44 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
51 TAB , A , S , D , F , G ,SPLT, SPRT, H , J , K , L ,SCLN,ENT , 45 KC_TAB , KC_A , KC_S , KC_D , KC_F , KC_G ,KC_SPLT, KC_SPRT, KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_ENT ,
52 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 46 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
53 LSPO, Z , X , C , V , B ,SPFN, GBRC, N , M ,COMM,DOT ,SLSH,RSPC, 47 KC_LSPO, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_SPFN, KC_GBRC, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC,
54 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 48 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
55 NMPD,BSPC, SPC ,SYMB 49 KC_NMPD,KC_BSPC, KC_SPC ,KC_SYMB
56 // \------------------+----+----+---/ \---+----+----+-------------------/ 50 // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
57 ), 51 ),
58 52
59 [_CAPS] = KC_KEYMAP( 53 [_CAPS] = LAYOUT(
60 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 54 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
61 , , , , , , , , , , , , , , 55 _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,
62 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 56 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
63 , , , , , ,UNDS, , , , , ,COLN, , 57 _______,_______,_______,_______,_______,_______,KC_UNDS, _______,_______,_______,_______,_______,KC_COLN,_______,
64 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 58 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
65 SCOF, , , , , , , , , , , , ,SCOF, 59 KC_SCOF,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,KC_SCOF,
66 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 60 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
67 , , , 61 _______,_______, _______,_______
68 // \------------------+----+----+---/ \---+----+----+-------------------/ 62 // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
69 ), 63 ),
70 64
71 [_NUMPAD] = KC_KEYMAP( 65 [_NUMPAD] = LAYOUT(
72 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 66 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
73 , ,COLN , , , , , , , 7 , 8 , 9 ,ASTR,MINS, 67 _______,_______,KC_COLN,_______,_______,_______,_______, _______,_______, KC_7 , KC_8 , KC_9 ,KC_ASTR,KC_MINS,
74 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 68 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
75 , ,DOT , , , , , , , 4 , 5 , 6 ,PLUS, , 69 _______,_______,KC_DOT ,_______,_______,_______,_______, _______,_______, KC_4 , KC_5 , KC_6 ,KC_PLUS,_______,
76 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 70 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
77 , , , , , , , , , 1 , 2 , 3 ,SLSH, , 71 _______,_______,_______,_______,_______,_______,_______, _______,_______, KC_1 , KC_2 , KC_3 ,KC_SLSH,_______,
78 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 72 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
79 , , , 0 73 _______,_______, _______, KC_0
80 // \------------------+----+----+---/ \---+----+----+-------------------/ 74 // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
81 ), 75 ),
82 76
83 [_SYMBOLS] = KC_KEYMAP( 77 [_SYMBOLS] = LAYOUT(
84 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 78 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
85 ,EXLM, AT ,HASH,DLR ,PERC, , ,CIRC,AMPR,ASTR,LPRN,RPRN,BSLS, 79 _______,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,_______, _______,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_BSLS,
86 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 80 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
87 , F1 , F2 , F3 , F4 , F5 , , ,TILD,COLN,UNDS,LCBR,RCBR, , 81 _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,_______, _______,KC_TILD,KC_COLN,KC_UNDS,KC_LCBR,KC_RCBR,_______,
88 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 82 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
89 , F6 , F7 , F8 , F9 ,F10 , , ,GRV ,SCLN,MINS,LBRC,RBRC, , 83 _______, KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,_______, _______,KC_GRV ,KC_SCLN,KC_MINS,KC_LBRC,KC_RBRC,_______,
90 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 84 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
91 PIPE, , , 85 KC_PIPE,_______, _______,_______
92 // \------------------+----+----+---/ \---+----+----+-------------------/ 86 // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
93 ), 87 ),
94 88
95 [_NAV] = KC_KEYMAP( 89 [_NAV] = LAYOUT(
96 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 90 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
97 , , , , , , , , , , UP , ,PSCR, , 91 _______,_______,_______,_______,_______,_______,_______, _______,_______,_______, KC_UP ,_______,KC_PSCR,_______,
98 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 92 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
99 , , , , , , , , ,LEFT,DOWN,RGHT, , , 93 _______,_______,_______,_______,_______,_______,_______, _______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,
100 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 94 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
101 , , , , , , , , ,PGUP,PGDN, , , , 95 _______,_______,_______,_______,_______,_______,_______, _______,_______,KC_PGUP,KC_PGDN,_______,_______,_______,
102 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 96 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
103 ,DEL , , 97 _______,KC_DEL , _______,_______
104 // \------------------+----+----+---/ \---+----+----+-------------------/ 98 // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
105 ), 99 ),
106 100
107 [_MACROS] = KC_KEYMAP( 101 [_MACROS] = LAYOUT(
108 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 102 //,-------+-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------+-------.
109 , , , , , , , , , ,INCL, , , , 103 _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,KC_INCL,_______,_______,_______,
110 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 104 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
111 , , ,CAD , , , , , , , , , , , 105 _______,_______,_______,KC_CAD ,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,
112 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 106 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
113 SCAP, , , , , , , , , ,PULL,PUSH, ,SCAP, 107 KC_SCAP,_______,_______,_______,_______,_______,_______, _______,_______,_______,KC_PULL,KC_PUSH,_______,KC_SCAP,
114 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 108 //|-------+-------+-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------+-------+-------|
115 , , , 109 _______,_______, _______,_______
116 // \------------------+----+----+---/ \---+----+----+-------------------/ 110 // \------------------------------+-------+-------+------/ \------+-------+-------+------------------------------/
117 ) 111 )
118 112
119}; 113};
120 114
121 115
122const uint16_t PROGMEM fn_actions[] = { 116bool process_record_user(uint16_t keycode, keyrecord_t *record) {
123 117 switch(keycode) {
124};
125
126const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
127{
128 switch(id) {
129 /* include some kind of library or header */ 118 /* include some kind of library or header */
130 case 0: 119 case KC_INCL:
131 if (record->event.pressed) { 120 if (record->event.pressed) {
132 SEND_STRING("#include <>"); 121 SEND_STRING("#include <>" SS_TAP(X_LEFT));
133 return MACRO( T(LEFT), END);
134 } 122 }
135 break; 123 return false;
136 case 1: 124 case KC_PULL:
137 if (record->event.pressed) { 125 if (record->event.pressed) {
138 SEND_STRING("git pull"); 126 SEND_STRING("git pull" SS_TAP(X_ENTER));
139 return MACRO( T(ENT), END );
140 } 127 }
141 break; 128 return false;
142 case 2: 129 case KC_PUSH:
143 if (record->event.pressed){ 130 if (record->event.pressed){
144 SEND_STRING("git push"); 131 SEND_STRING("git push" SS_TAP(X_ENTER));
145 return MACRO( T(ENT), END );
146 } 132 }
147 break; 133 return false;
148 case 3: 134 case KC_SCAP:
149 if (record->event.pressed){ 135 if (record->event.pressed){
150 layer_on(_CAPS); 136 layer_on(_CAPS);
151 register_code(KC_CAPSLOCK); 137 register_code(KC_CAPSLOCK);
152 unregister_code(KC_CAPSLOCK); 138 unregister_code(KC_CAPSLOCK);
153 } 139 }
154 break; 140 return false;
155 case 4: 141 case KC_SCOF:
156 if (record->event.pressed){ 142 if (record->event.pressed){
157 layer_off(_CAPS); 143 layer_off(_CAPS);
158 register_code(KC_CAPSLOCK); 144 register_code(KC_CAPSLOCK);
159 unregister_code(KC_CAPSLOCK); 145 unregister_code(KC_CAPSLOCK);
160 } 146 }
161 break; 147 return false;
162 } 148 }
163 return MACRO_NONE; 149 return true;
164}; 150};
165 151
166 152
167void matrix_scan_user(void) { 153void matrix_scan_user(void) {
168 uint8_t layer = biton32(layer_state); 154 uint8_t layer = biton32(layer_state);
169 155
170 switch (layer) { 156 switch (layer) {
171 case _QWERTY: 157 case _QWERTY:
172 set_led_green; 158 set_led_green;
173 break; 159 break;
174 case _CAPS: 160 case _CAPS:
175 set_led_white; 161 set_led_white;
176 break; 162 break;
177 case _NUMPAD: 163 case _NUMPAD:
178 set_led_blue; 164 set_led_blue;
179 break; 165 break;
@@ -181,11 +167,11 @@ void matrix_scan_user(void) {
181 set_led_red; 167 set_led_red;
182 break; 168 break;
183 case _NAV: 169 case _NAV:
184 set_led_magenta; 170 set_led_magenta;
185 break; 171 break;
186 case _MACROS: 172 case _MACROS:
187 set_led_cyan; 173 set_led_cyan;
188 break; 174 break;
189 default: 175 default:
190 set_led_green; 176 set_led_green;
191 break; 177 break;
diff --git a/keyboards/chimera_ortho/keymaps/gordon/keymap.c b/keyboards/chimera_ortho/keymaps/gordon/keymap.c
index c6d668f8f..c6766bed3 100644
--- a/keyboards/chimera_ortho/keymaps/gordon/keymap.c
+++ b/keyboards/chimera_ortho/keymaps/gordon/keymap.c
@@ -1,10 +1,8 @@
1// this is the style you want to emulate. 1// this is the style you want to emulate.
2// This is the canonical layout file for the Quantum project. If you want to add another keyboard, 2// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
3 3
4#include "chimera_ortho.h" 4#include QMK_KEYBOARD_H
5#include "action_layer.h"
6#include "version.h" 5#include "version.h"
7#include "process_keycode/process_tap_dance.h"
8#include "gordon.h" 6#include "gordon.h"
9 7
10// Each layer gets a name for readability, which is then used in the keymap matrix below. 8// Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -83,11 +81,9 @@
83//#define LAYER_TOGGLE_DELAY 300 81//#define LAYER_TOGGLE_DELAY 300
84 82
85// Fillers to make layering more clear 83// Fillers to make layering more clear
86#define _______ KC_TRNS 84#define KC_ KC_TRNS
87#define XXXXXXX KC_NO
88#define KC_ KC_TRNS
89 85
90/* TODO: 86/* TODO:
91 * 87 *
92 * DONE: RESET and CAD into macro layer. 88 * DONE: RESET and CAD into macro layer.
93 * DONE: WINUP AND WINDOWN in NAV layer 89 * DONE: WINUP AND WINDOWN in NAV layer
@@ -113,7 +109,7 @@
113 * Russain layer 109 * Russain layer
114 * Hebrew layer 110 * Hebrew layer
115 * Get rid of stupid git pull and push macros. 111 * Get rid of stupid git pull and push macros.
116 * 112 *
117*/ 113*/
118 114
119//Tap dance enums 115//Tap dance enums
@@ -127,14 +123,14 @@ enum {
127 CALC_PRINTSCREEN 123 CALC_PRINTSCREEN
128}; 124};
129 125
130static xtap ttt_state = { 126static xtap ttt_state = {
131 .is_press_action = true, 127 .is_press_action = true,
132 .state = 0 128 .state = 0
133}; 129};
134 130
135 131
136//Already exists in gordon.c, shouldn't need this anymore 132//Already exists in gordon.c, shouldn't need this anymore
137/*// To activate SINGLE_HOLD, you will need to hold for 200ms first. 133/*// To activate SINGLE_HOLD, you will need to hold for 200ms first.
138// This tap dance favors keys that are used frequently in typing like 'f' 134// This tap dance favors keys that are used frequently in typing like 'f'
139int cur_dance (qk_tap_dance_state_t *state) { 135int cur_dance (qk_tap_dance_state_t *state) {
140 if (state->count == 1) { 136 if (state->count == 1) {
@@ -151,8 +147,8 @@ int cur_dance (qk_tap_dance_state_t *state) {
151 else if (state->count == 2) { 147 else if (state->count == 2) {
152 if (state->interrupted) return DOUBLE_SINGLE_TAP; 148 if (state->interrupted) return DOUBLE_SINGLE_TAP;
153 else if (state->pressed) return DOUBLE_HOLD; 149 else if (state->pressed) return DOUBLE_HOLD;
154 else return DOUBLE_TAP; 150 else return DOUBLE_TAP;
155 } 151 }
156 else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP; 152 else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP;
157 else if (state->count == 3) return TRIPLE_HOLD; 153 else if (state->count == 3) return TRIPLE_HOLD;
158 else return 8; //magic number. At some point this method will expand to work for more presses 154 else return 8; //magic number. At some point this method will expand to work for more presses
@@ -194,7 +190,7 @@ void TTT_reset (qk_tap_dance_state_t *state, void *user_data) {
194 190
195qk_tap_dance_action_t tap_dance_actions[] = { 191qk_tap_dance_action_t tap_dance_actions[] = {
196 // simple tap dance 192 // simple tap dance
197 [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))), 193 [F12ETAPS] = ACTION_TAP_DANCE_DOUBLE(KC_F12,LSFT(LCTL(KC_F10))),
198 [CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER), 194 [CALCCOMP] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_MY_COMPUTER),
199 [CALC_PRINTSCREEN] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_PSCR), 195 [CALC_PRINTSCREEN] = ACTION_TAP_DANCE_DOUBLE(KC_CALCULATOR, KC_PSCR),
200 [ALTF4] = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)), 196 [ALTF4] = ACTION_TAP_DANCE_DOUBLE(KC_F4,LALT(KC_F4)),
@@ -206,7 +202,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
206 202
207const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 203const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
208 204
209 [_QWERTY] = KC_KEYMAP( 205 [_QWERTY] = LAYOUT_kc(
210 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 206 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
211 MESC, Q ,CSHW,ENAV, R , T ,SPC , CLPS, Y , U ,INAV, O , P ,TTT, 207 MESC, Q ,CSHW,ENAV, R , T ,SPC , CLPS, Y , U ,INAV, O , P ,TTT,
212 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 208 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -218,7 +214,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
218 // \------------------+----+----+---/ \---+----+----+-------------------/ 214 // \------------------+----+----+---/ \---+----+----+-------------------/
219 ), 215 ),
220 216
221 [_NUMPAD] = KC_KEYMAP( 217 [_NUMPAD] = LAYOUT_kc(
222 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 218 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
223 , , , ,ASTR, , , , , 7 , 8 , 9 ,ASTR,/**/, 219 , , , ,ASTR, , , , , 7 , 8 , 9 ,ASTR,/**/,
224 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 220 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -226,11 +222,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
226 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 222 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
227 , , , ,SLSH, , , , , 1 , 2 , 3 ,SLSH, , 223 , , , ,SLSH, , , , , 1 , 2 , 3 ,SLSH, ,
228 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 224 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
229 , , , 0 225 , , , 0
230 // \------------------+----+----+---/ \---+----+----+-------------------/ 226 // \------------------+----+----+---/ \---+----+----+-------------------/
231 ), 227 ),
232 228
233 [_SYMBOLS] = KC_KEYMAP( 229 [_SYMBOLS] = LAYOUT_kc(
234 //,----+----+-----+----+----+----+----. ,----+----+----+----+----+----+----. 230 //,----+----+-----+----+----+----+----. ,----+----+----+----+----+----+----.
235 ,EXLM, AT ,LCBR,RCBR,HASH, , ,CIRC,AMPR,ASTR,LPRN,RPRN,/**/, 231 ,EXLM, AT ,LCBR,RCBR,HASH, , ,CIRC,AMPR,ASTR,LPRN,RPRN,/**/,
236 //|----+----+-----+----+----+----+----| |----+----+----+----+----+----+----| 232 //|----+----+-----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -242,7 +238,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
242 // \-------------------+----+----+---/ \---+----+----+-------------------/ 238 // \-------------------+----+----+---/ \---+----+----+-------------------/
243 ), 239 ),
244 240
245 [_FUNCTION] = KC_KEYMAP( 241 [_FUNCTION] = LAYOUT_kc(
246 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 242 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
247 F6F7 ,F1 ,F2 ,F3 ,ALF4,F5 ,F6 , F7 ,F8 ,F9 ,F10 ,F11 ,F12 ,/**/, 243 F6F7 ,F1 ,F2 ,F3 ,ALF4,F5 ,F6 , F7 ,F8 ,F9 ,F10 ,F11 ,F12 ,/**/,
248 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 244 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -250,11 +246,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
250 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 246 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
251 , , , , , , , , , , , , , , 247 , , , , , , , , , , , , , ,
252 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 248 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
253 , , , 249 , , ,
254 // \------------------+----+----+---/ \---+----+----+-------------------/ 250 // \------------------+----+----+---/ \---+----+----+-------------------/
255 ), 251 ),
256 252
257 [_NAV] = KC_KEYMAP( 253 [_NAV] = LAYOUT_kc(
258 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 254 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
259 , ,SNAPLEFT,/**/,SNAPRIGHT,, , , , , UP , , , , 255 , ,SNAPLEFT,/**/,SNAPRIGHT,, , , , , UP , , , ,
260 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 256 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -262,11 +258,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
262 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 258 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
263 , ,WORKLEFT, ,WORKRIGHT,, , , ,PGUP,PGDN, , , , 259 , ,WORKLEFT, ,WORKRIGHT,, , , ,PGUP,PGDN, , , ,
264 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 260 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
265 CDEL ,DEL, , 261 CDEL ,DEL, ,
266 // \------------------+----+----+---/ \---+----+----+-------------------/ 262 // \------------------+----+----+---/ \---+----+----+-------------------/
267 ), 263 ),
268 264
269 [_TEXTNAV] = KC_KEYMAP( 265 [_TEXTNAV] = LAYOUT_kc(
270 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 266 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
271 , , , , , , , , , ,/**/, , , , 267 , , , , , , , , , ,/**/, , , ,
272 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 268 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -274,11 +270,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
274 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 270 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
275 , , , , , , , , , , , , , , 271 , , , , , , , , , , , , , ,
276 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 272 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
277 , , , 273 , , ,
278 // \------------------+----+----+---/ \---+----+----+-------------------/ 274 // \------------------+----+----+---/ \---+----+----+-------------------/
279 ), 275 ),
280 276
281 [_MOUSE] = KC_KEYMAP( 277 [_MOUSE] = LAYOUT_kc(
282 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 278 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
283 , , ,MS_UP, , , , , , , UP , , , ,/**/ 279 , , ,MS_UP, , , , , , , UP , , , ,/**/
284 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 280 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -286,12 +282,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
286 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 282 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
287 , , , , , , , , , , , , , , 283 , , , , , , , , , , , , , ,
288 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 284 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
289 ,MS_BTN1 ,MS_BTN2 , 285 ,MS_BTN1 ,MS_BTN2 ,
290 // \------------------+----+----+---/ \---+----+----+-------------------/ 286 // \------------------+----+----+---/ \---+----+----+-------------------/
291 ), 287 ),
292 288
293 289
294 [_MACROS] = KC_KEYMAP( 290 [_MACROS] = LAYOUT_kc(
295 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. 291 //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----.
296 /**/,RESET,SECRET_2,SECRET_3, , , ,SYSTEM_SLEEP, , ,INCL, , , , 292 /**/,RESET,SECRET_2,SECRET_3, , , ,SYSTEM_SLEEP, , ,INCL, , , ,
297 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 293 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
@@ -299,7 +295,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
299 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 295 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
300 SCAP, , , , , , , , , , , , ,SCAP, 296 SCAP, , , , , , , , , , , , ,SCAP,
301 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| 297 //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
302 , , , 298 , , ,
303 // \------------------+----+----+---/ \---+----+----+-------------------/ 299 // \------------------+----+----+---/ \---+----+----+-------------------/
304 ) 300 )
305 301
@@ -349,11 +345,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
349 } 345 }
350 return MACRO_NONE; 346 return MACRO_NONE;
351}; 347};
352 348
353 349
354void matrix_scan_user(void) { 350void matrix_scan_user(void) {
355 uint8_t layer = biton32(layer_state); 351 uint8_t layer = biton32(layer_state);
356 352
357 switch (layer) { 353 switch (layer) {
358 case _QWERTY: 354 case _QWERTY:
359 set_led_green; 355 set_led_green;
@@ -381,7 +377,7 @@ void matrix_scan_user(void) {
381 _delay_ms(45); 377 _delay_ms(45);
382 set_led_blue; 378 set_led_blue;
383 _delay_ms(45); 379 _delay_ms(45);
384 break; 380 break;
385 default: 381 default:
386 set_led_green; 382 set_led_green;
387 break; 383 break;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 19:43:37 +0000