Do some cleanup for the API

4 files changed, 10 insertions, 12 deletions

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] = {
  * | 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 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;
 
 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 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] = {
  * `-----`-----`-----`-----'
  */
   [_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 a82a62e1e..486ba5059 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