aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/ergodone/rules.mk2
-rw-r--r--keyboards/ergodox_infinity/rules.mk2
-rw-r--r--keyboards/lets_split/lets_split.h3
-rw-r--r--keyboards/lets_split/rev2/rev2.h2
-rw-r--r--keyboards/levinson/levinson.h3
-rw-r--r--keyboards/levinson/rev1/rev1.h2
-rw-r--r--keyboards/levinson/rev2/rev2.h2
-rw-r--r--keyboards/nyquist/nyquist.h4
-rw-r--r--keyboards/nyquist/rev1/rev1.h2
-rw-r--r--keyboards/roadkit/keymaps/khord/keymap.c6
-rw-r--r--keyboards/roadkit/keymaps/singles/keymap.c4
-rw-r--r--keyboards/roadkit/keymaps/singlesBrent/keymap.c8
-rw-r--r--keyboards/roadkit/roadkit.h4
13 files changed, 23 insertions, 21 deletions
diff --git a/keyboards/ergodone/rules.mk b/keyboards/ergodone/rules.mk
index bbad0ae73..dee7a14e0 100644
--- a/keyboards/ergodone/rules.mk
+++ b/keyboards/ergodone/rules.mk
@@ -92,4 +92,4 @@ ONEHAND_ENABLE = no # Disable Onehand
92RGBLIGHT_ENABLE = no 92RGBLIGHT_ENABLE = no
93MIDI_ENABLE = no 93MIDI_ENABLE = no
94 94
95LAYOUTS = ergodox ergodox_80 \ No newline at end of file 95LAYOUTS = ergodox
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/ergodox_infinity/rules.mk
index cb1115255..e1cef51c1 100644
--- a/keyboards/ergodox_infinity/rules.mk
+++ b/keyboards/ergodox_infinity/rules.mk
@@ -86,4 +86,4 @@ LED_DRIVER = is31fl3731c
86LED_WIDTH = 7 86LED_WIDTH = 7
87LED_HEIGHT = 7 87LED_HEIGHT = 7
88 88
89LAYOUTS = ergodox ergodox_80 \ No newline at end of file 89LAYOUTS = ergodox
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h
index d9cfa35a2..c5e1fbe0e 100644
--- a/keyboards/lets_split/lets_split.h
+++ b/keyboards/lets_split/lets_split.h
@@ -23,7 +23,6 @@
23 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \ 23 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
24 ) 24 )
25 25
26#define LAYOUT_ortho_4x12 KEYMAP
27#define KC_LAYOUT_ortho_4x12 KC_KEYMAP 26#define KC_LAYOUT_ortho_4x12 KC_KEYMAP
28 27
29#endif \ No newline at end of file 28#endif
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index 0c4e8e7de..0bc106ef2 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -57,4 +57,6 @@
57 } 57 }
58#endif 58#endif
59 59
60#define LAYOUT_ortho_4x12 KEYMAP
61
60#endif 62#endif
diff --git a/keyboards/levinson/levinson.h b/keyboards/levinson/levinson.h
index 3d616195f..9ab2dd116 100644
--- a/keyboards/levinson/levinson.h
+++ b/keyboards/levinson/levinson.h
@@ -23,7 +23,6 @@
23 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \ 23 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
24 ) 24 )
25 25
26#define LAYOUT_ortho_4x12 KEYMAP
27#define KC_LAYOUT_ortho_4x12 KC_KEYMAP 26#define KC_LAYOUT_ortho_4x12 KC_KEYMAP
28 27
29#endif \ No newline at end of file 28#endif
diff --git a/keyboards/levinson/rev1/rev1.h b/keyboards/levinson/rev1/rev1.h
index 968095cba..73ce92a80 100644
--- a/keyboards/levinson/rev1/rev1.h
+++ b/keyboards/levinson/rev1/rev1.h
@@ -57,4 +57,6 @@
57 } 57 }
58#endif 58#endif
59 59
60#define LAYOUT_ortho_4x12 KEYMAP
61
60#endif 62#endif
diff --git a/keyboards/levinson/rev2/rev2.h b/keyboards/levinson/rev2/rev2.h
index 968095cba..73ce92a80 100644
--- a/keyboards/levinson/rev2/rev2.h
+++ b/keyboards/levinson/rev2/rev2.h
@@ -57,4 +57,6 @@
57 } 57 }
58#endif 58#endif
59 59
60#define LAYOUT_ortho_4x12 KEYMAP
61
60#endif 62#endif
diff --git a/keyboards/nyquist/nyquist.h b/keyboards/nyquist/nyquist.h
index 8d031b050..4677079b4 100644
--- a/keyboards/nyquist/nyquist.h
+++ b/keyboards/nyquist/nyquist.h
@@ -23,6 +23,4 @@
23 KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \ 23 KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
24 ) 24 )
25 25
26#define LAYOUT_ortho_5x12 KEYMAP 26#endif
27
28#endif \ No newline at end of file
diff --git a/keyboards/nyquist/rev1/rev1.h b/keyboards/nyquist/rev1/rev1.h
index eeaf15272..abc5dd2c8 100644
--- a/keyboards/nyquist/rev1/rev1.h
+++ b/keyboards/nyquist/rev1/rev1.h
@@ -63,4 +63,6 @@
63 } 63 }
64#endif 64#endif
65 65
66#define LAYOUT_ortho_5x12 KEYMAP
67
66#endif 68#endif
diff --git a/keyboards/roadkit/keymaps/khord/keymap.c b/keyboards/roadkit/keymaps/khord/keymap.c
index 2f0b73201..4eab6d082 100644
--- a/keyboards/roadkit/keymaps/khord/keymap.c
+++ b/keyboards/roadkit/keymaps/khord/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 * | L1 | L2 | | | Layer hold 35 * | L1 | L2 | | | Layer hold
36 */ 36 */
37 [_NP] = /* Numpad */ 37 [_NP] = /* Numpad */
38 SINGLES_KEYMAP(KC_P7, KC_P8, KC_P9, KC_BSPC, \ 38 LAYOUT_ortho_4x4(KC_P7, KC_P8, KC_P9, KC_BSPC, \
39 KC_P4, KC_P5, KC_P6, KC_TAB, \ 39 KC_P4, KC_P5, KC_P6, KC_TAB, \
40 KC_P1, KC_P2, KC_P3, KC_PENT, \ 40 KC_P1, KC_P2, KC_P3, KC_PENT, \
41 LT(1, KC_P0), LT(2, KC_SPC), KC_PDOT, KC_PSLS), 41 LT(1, KC_P0), LT(2, KC_SPC), KC_PDOT, KC_PSLS),
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 * `-----`-----`-----`-----' 52 * `-----`-----`-----`-----'
53 */ 53 */
54 [_L1] = /* LAYER 1 */ 54 [_L1] = /* LAYER 1 */
55 SINGLES_KEYMAP(RESET, XXXXXXX, XXXXXXX, KC_DEL, \ 55 LAYOUT_ortho_4x4(RESET, XXXXXXX, XXXXXXX, KC_DEL, \
56 KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \ 56 KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \
57 STR192, STR255, XXXXXXX, XXXXXXX, \ 57 STR192, STR255, XXXXXXX, XXXXXXX, \
58 _______, BL_STEP, _______, XXXXXXX), 58 _______, BL_STEP, _______, XXXXXXX),
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
69 * `-----`-----`-----`-----' 69 * `-----`-----`-----`-----'
70 */ 70 */
71 [_L2] = /* LAYER 2 */ 71 [_L2] = /* LAYER 2 */
72 SINGLES_KEYMAP(XXXXXXX, XXXXXXX, ADMIN, SMSPC1, \ 72 LAYOUT_ortho_4x4(XXXXXXX, XXXXXXX, ADMIN, SMSPC1, \
73 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 73 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
74 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ 74 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
75 XXXXXXX, _______, XXXXXXX, XXXXXXX) 75 XXXXXXX, _______, XXXXXXX, XXXXXXX)
diff --git a/keyboards/roadkit/keymaps/singles/keymap.c b/keyboards/roadkit/keymaps/singles/keymap.c
index 1c6aa7883..79831652c 100644
--- a/keyboards/roadkit/keymaps/singles/keymap.c
+++ b/keyboards/roadkit/keymaps/singles/keymap.c
@@ -23,12 +23,12 @@ extern keymap_config_t keymap_config;
23 23
24const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 24const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25 [_NP] = /* Numpad */ 25 [_NP] = /* Numpad */
26 SINGLES_KEYMAP(KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, \ 26 LAYOUT_ortho_4x4(KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, \
27 KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, \ 27 KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, \
28 KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, \ 28 KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, \
29 KC_KP_0, KC_KP_DOT, TG(_L1), KC_BSPC), 29 KC_KP_0, KC_KP_DOT, TG(_L1), KC_BSPC),
30 [_L1] = /* LAYER 1 */ 30 [_L1] = /* LAYER 1 */
31 SINGLES_KEYMAP(KC_NUMLOCK, KC_TRNS, KC_TRNS, KC_VOLU, \ 31 LAYOUT_ortho_4x4(KC_NUMLOCK, KC_TRNS, KC_TRNS, KC_VOLU, \
32 KC_TRNS, KC_UP, KC_TRNS, KC_VOLD, \ 32 KC_TRNS, KC_UP, KC_TRNS, KC_VOLD, \
33 KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \ 33 KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) 34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
diff --git a/keyboards/roadkit/keymaps/singlesBrent/keymap.c b/keyboards/roadkit/keymaps/singlesBrent/keymap.c
index 13197346a..19640b52e 100644
--- a/keyboards/roadkit/keymaps/singlesBrent/keymap.c
+++ b/keyboards/roadkit/keymaps/singlesBrent/keymap.c
@@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
147 * `-----`-----`-----`-----' 147 * `-----`-----`-----`-----'
148 */ 148 */
149 [_NP] = /* Numpad */ 149 [_NP] = /* Numpad */
150 SINGLES_KEYMAP(KC_7, KC_8, KC_9, KC_SLASH, \ 150 LAYOUT_ortho_4x4(KC_7, KC_8, KC_9, KC_SLASH, \
151 KC_4, KC_5, KC_6, KC_KP_ASTERISK, \ 151 KC_4, KC_5, KC_6, KC_KP_ASTERISK, \
152 KC_1, KC_2, KC_3, KC_MINUS, \ 152 KC_1, KC_2, KC_3, KC_MINUS, \
153 TD(TD_0_L3), TD(TD_DOT_L2), TD(TD_KP_PLUS_L1), TD(TD_EQUAL_NP)), 153 TD(TD_0_L3), TD(TD_DOT_L2), TD(TD_KP_PLUS_L1), TD(TD_EQUAL_NP)),
@@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
164 * `-----`-----`-----`-----' 164 * `-----`-----`-----`-----'
165 */ 165 */
166 [_L1] = /* LAYER 1 */ 166 [_L1] = /* LAYER 1 */
167 SINGLES_KEYMAP(KC_ESCAPE, KC_BSPACE, KC_HOME, KC_PGUP, \ 167 LAYOUT_ortho_4x4(KC_ESCAPE, KC_BSPACE, KC_HOME, KC_PGUP, \
168 KC_TAB, KC_UP, KC_END, KC_PGDOWN, \ 168 KC_TAB, KC_UP, KC_END, KC_PGDOWN, \
169 KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER, \ 169 KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER, \
170 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 170 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
@@ -181,7 +181,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
181 * `-----`-----`-----`-----' 181 * `-----`-----`-----`-----'
182 */ 182 */
183 [_L2] = /* LAYER 2 */ 183 [_L2] = /* LAYER 2 */
184 SINGLES_KEYMAP(KC_SYSTEM_SLEEP, KC_MS_BTN1, KC_MS_BTN2, KC_AUDIO_VOL_UP, \ 184 LAYOUT_ortho_4x4(KC_SYSTEM_SLEEP, KC_MS_BTN1, KC_MS_BTN2, KC_AUDIO_VOL_UP, \
185 LALT(KC_F4), KC_F11, LGUI(KC_TAB), KC_AUDIO_VOL_DOWN, \ 185 LALT(KC_F4), KC_F11, LGUI(KC_TAB), KC_AUDIO_VOL_DOWN, \
186 KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, \ 186 KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, \
187 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 187 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
199 * `-----`-----`-----`-----' 199 * `-----`-----`-----`-----'
200 */ 200 */
201 [_L3] = /* LAYER 3 */ 201 [_L3] = /* LAYER 3 */
202 SINGLES_KEYMAP(KC_WWW_BACK, KC_WWW_HOME, KC_WWW_FORWARD, KC_F5, \ 202 LAYOUT_ortho_4x4(KC_WWW_BACK, KC_WWW_HOME, KC_WWW_FORWARD, KC_F5, \
203 KC_CALCULATOR, LCTL(KC_Z), LCTL(KC_Y), KC_WWW_SEARCH, \ 203 KC_CALCULATOR, LCTL(KC_Z), LCTL(KC_Y), KC_WWW_SEARCH, \
204 LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_F), \ 204 LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_F), \
205 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 205 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/roadkit/roadkit.h b/keyboards/roadkit/roadkit.h
index a82a62e1e..486ba5059 100644
--- a/keyboards/roadkit/roadkit.h
+++ b/keyboards/roadkit/roadkit.h
@@ -17,7 +17,7 @@
17 { K30, KC_NO, K32, KC_NO } \ 17 { K30, KC_NO, K32, KC_NO } \
18} 18}
19 19
20#define SINGLES_KEYMAP( \ 20#define LAYOUT_ortho_4x4 ( \
21 K00, K01, K02, K03, \ 21 K00, K01, K02, K03, \
22 K10, K11, K12, K13, \ 22 K10, K11, K12, K13, \
23 K20, K21, K22, K23, \ 23 K20, K21, K22, K23, \
@@ -30,6 +30,4 @@
30 { K30, K31, K32, K33 } \ 30 { K30, K31, K32, K33 } \
31} 31}
32 32
33#define LAYOUT_ortho_4x4 SINGLES_KEYMAP
34
35#endif 33#endif