summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskullY <skullydazed@gmail.com>2017-11-02 16:47:39 -0700
committerskullY <skullydazed@gmail.com>2017-11-02 16:47:39 -0700
commit685d4c2f9754e22de3b68379cfc959197495c0aa (patch)
tree37b4800cfac587c95fbcb067bd94a2f53a8df5b0
parent535c2f60a9336d67c1a3fbd2d335b6f24d8cca8d (diff)
downloadqmk_firmware-685d4c2f9754e22de3b68379cfc959197495c0aa.tar.gz
qmk_firmware-685d4c2f9754e22de3b68379cfc959197495c0aa.zip
Do some cleanup for the API
Diffstat
-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 bbad0ae730..dee7a14e0d 100644
--- a/keyboards/ergodone/rules.mk
+++ b/keyboards/ergodone/rules.mk
@@ -92,4 +92,4 @@ ONEHAND_ENABLE = no # Disable Onehand
RGBLIGHT_ENABLE = no
MIDI_ENABLE = no
-LAYOUTS = ergodox ergodox_80 \ No newline at end of file
+LAYOUTS = ergodox
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/ergodox_infinity/rules.mk
index cb11152556..e1cef51c1e 100644
--- a/keyboards/ergodox_infinity/rules.mk
+++ b/keyboards/ergodox_infinity/rules.mk
@@ -86,4 +86,4 @@ LED_DRIVER = is31fl3731c
LED_WIDTH = 7
LED_HEIGHT = 7
-LAYOUTS = ergodox ergodox_80 \ No newline at end of file
+LAYOUTS = ergodox
diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h
index d9cfa35a21..c5e1fbe0e6 100644
--- a/keyboards/lets_split/lets_split.h
+++ b/keyboards/lets_split/lets_split.h
@@ -23,7 +23,6 @@
KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
)
-#define LAYOUT_ortho_4x12 KEYMAP
#define KC_LAYOUT_ortho_4x12 KC_KEYMAP
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index 0c4e8e7de1..0bc106ef27 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -57,4 +57,6 @@
}
#endif
+#define LAYOUT_ortho_4x12 KEYMAP
+
#endif
diff --git a/keyboards/levinson/levinson.h b/keyboards/levinson/levinson.h
index 3d616195fe..9ab2dd116d 100644
--- a/keyboards/levinson/levinson.h
+++ b/keyboards/levinson/levinson.h
@@ -23,7 +23,6 @@
KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
)
-#define LAYOUT_ortho_4x12 KEYMAP
#define KC_LAYOUT_ortho_4x12 KC_KEYMAP
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/levinson/rev1/rev1.h b/keyboards/levinson/rev1/rev1.h
index 968095cba7..73ce92a80b 100644
--- a/keyboards/levinson/rev1/rev1.h
+++ b/keyboards/levinson/rev1/rev1.h
@@ -57,4 +57,6 @@
}
#endif
+#define LAYOUT_ortho_4x12 KEYMAP
+
#endif
diff --git a/keyboards/levinson/rev2/rev2.h b/keyboards/levinson/rev2/rev2.h
index 968095cba7..73ce92a80b 100644
--- a/keyboards/levinson/rev2/rev2.h
+++ b/keyboards/levinson/rev2/rev2.h
@@ -57,4 +57,6 @@
}
#endif
+#define LAYOUT_ortho_4x12 KEYMAP
+
#endif
diff --git a/keyboards/nyquist/nyquist.h b/keyboards/nyquist/nyquist.h
index 8d031b0505..4677079b41 100644
--- a/keyboards/nyquist/nyquist.h
+++ b/keyboards/nyquist/nyquist.h
@@ -23,6 +23,4 @@
KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
)
-#define LAYOUT_ortho_5x12 KEYMAP
-
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/nyquist/rev1/rev1.h b/keyboards/nyquist/rev1/rev1.h
index eeaf152728..abc5dd2c80 100644
--- a/keyboards/nyquist/rev1/rev1.h
+++ b/keyboards/nyquist/rev1/rev1.h
@@ -63,4 +63,6 @@
}
#endif
+#define LAYOUT_ortho_5x12 KEYMAP
+
#endif
diff --git a/keyboards/roadkit/keymaps/khord/keymap.c b/keyboards/roadkit/keymaps/khord/keymap.c
index 2f0b732015..4eab6d082f 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] = {
* | L1 | L2 | | | Layer hold
*/
[_NP] = /* Numpad */
- SINGLES_KEYMAP(KC_P7, KC_P8, KC_P9, KC_BSPC, \
+ LAYOUT_ortho_4x4(KC_P7, KC_P8, KC_P9, KC_BSPC, \
KC_P4, KC_P5, KC_P6, KC_TAB, \
KC_P1, KC_P2, KC_P3, KC_PENT, \
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] = {
* `-----`-----`-----`-----'
*/
[_L1] = /* LAYER 1 */
- SINGLES_KEYMAP(RESET, XXXXXXX, XXXXXXX, KC_DEL, \
+ LAYOUT_ortho_4x4(RESET, XXXXXXX, XXXXXXX, KC_DEL, \
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \
STR192, STR255, XXXXXXX, XXXXXXX, \
_______, BL_STEP, _______, XXXXXXX),
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----`-----`-----`-----'
*/
[_L2] = /* LAYER 2 */
- SINGLES_KEYMAP(XXXXXXX, XXXXXXX, ADMIN, SMSPC1, \
+ LAYOUT_ortho_4x4(XXXXXXX, XXXXXXX, ADMIN, SMSPC1, \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
XXXXXXX, _______, XXXXXXX, XXXXXXX)
diff --git a/keyboards/roadkit/keymaps/singles/keymap.c b/keyboards/roadkit/keymaps/singles/keymap.c
index 1c6aa7883f..79831652c7 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;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NP] = /* Numpad */
- SINGLES_KEYMAP(KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, \
+ LAYOUT_ortho_4x4(KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, \
KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, \
KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, \
KC_KP_0, KC_KP_DOT, TG(_L1), KC_BSPC),
[_L1] = /* LAYER 1 */
- SINGLES_KEYMAP(KC_NUMLOCK, KC_TRNS, KC_TRNS, KC_VOLU, \
+ LAYOUT_ortho_4x4(KC_NUMLOCK, KC_TRNS, KC_TRNS, KC_VOLU, \
KC_TRNS, KC_UP, KC_TRNS, KC_VOLD, \
KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, \
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 13197346a9..19640b52ef 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] = {
* `-----`-----`-----`-----'
*/
[_NP] = /* Numpad */
- SINGLES_KEYMAP(KC_7, KC_8, KC_9, KC_SLASH, \
+ LAYOUT_ortho_4x4(KC_7, KC_8, KC_9, KC_SLASH, \
KC_4, KC_5, KC_6, KC_KP_ASTERISK, \
KC_1, KC_2, KC_3, KC_MINUS, \
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] = {
* `-----`-----`-----`-----'
*/
[_L1] = /* LAYER 1 */
- SINGLES_KEYMAP(KC_ESCAPE, KC_BSPACE, KC_HOME, KC_PGUP, \
+ LAYOUT_ortho_4x4(KC_ESCAPE, KC_BSPACE, KC_HOME, KC_PGUP, \
KC_TAB, KC_UP, KC_END, KC_PGDOWN, \
KC_LEFT, KC_DOWN, KC_RIGHT, KC_KP_ENTER, \
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
@@ -181,7 +181,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----`-----`-----`-----'
*/
[_L2] = /* LAYER 2 */
- SINGLES_KEYMAP(KC_SYSTEM_SLEEP, KC_MS_BTN1, KC_MS_BTN2, KC_AUDIO_VOL_UP, \
+ LAYOUT_ortho_4x4(KC_SYSTEM_SLEEP, KC_MS_BTN1, KC_MS_BTN2, KC_AUDIO_VOL_UP, \
LALT(KC_F4), KC_F11, LGUI(KC_TAB), KC_AUDIO_VOL_DOWN, \
KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, \
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
@@ -199,7 +199,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----`-----`-----`-----'
*/
[_L3] = /* LAYER 3 */
- SINGLES_KEYMAP(KC_WWW_BACK, KC_WWW_HOME, KC_WWW_FORWARD, KC_F5, \
+ LAYOUT_ortho_4x4(KC_WWW_BACK, KC_WWW_HOME, KC_WWW_FORWARD, KC_F5, \
KC_CALCULATOR, LCTL(KC_Z), LCTL(KC_Y), KC_WWW_SEARCH, \
LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_F), \
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/roadkit/roadkit.h b/keyboards/roadkit/roadkit.h
index a82a62e1ed..486ba5059c 100644
--- a/keyboards/roadkit/roadkit.h
+++ b/keyboards/roadkit/roadkit.h
@@ -17,7 +17,7 @@
{ K30, KC_NO, K32, KC_NO } \
}
-#define SINGLES_KEYMAP( \
+#define LAYOUT_ortho_4x4 ( \
K00, K01, K02, K03, \
K10, K11, K12, K13, \
K20, K21, K22, K23, \
@@ -30,6 +30,4 @@
{ K30, K31, K32, K33 } \
}
-#define LAYOUT_ortho_4x4 SINGLES_KEYMAP
-
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 04:55:25 +0000