Roadkit refactor and Configurator support (#3303)

* Matrix refactor: rename KEYMAP to LAYOUT_numpad_4x4

* Keymap refactor: QMK_KEYBOARD_H, matrix renames, readability

* Configurator support

* Add numpad_4x4 LAYOUT to rules.mk

1 files changed, 58 insertions, 57 deletions

diff --git a/keyboards/roadkit/keymaps/khord/keymap.c b/keyboards/roadkit/keymaps/khord/keymap.c
index 4eab6d082f..9111f4f898 100644
--- a/keyboards/roadkit/keymaps/khord/keymap.c
+++ b/keyboards/roadkit/keymaps/khord/keymap.c
@@ -1,6 +1,4 @@
-#include "roadkit.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
@@ -22,57 +20,60 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* Numpad
- * ,-----------------------.
- * |  7  |  8  |  9  |Bksp |
- * |-----`-----`-----`-----|
- * |  4  |  5  |  6  | Tab |
- * |-----`-----`-----`-----|
- * |  1  |  2  |  3  |Enter|
- * |-----`-----`-----`-----|
- * |  0  |Space|  .  |  /  |
- * `-----`-----`-----`-----'
- * | L1  | L2  |     |     | Layer hold
- */
-  [_NP] = /* Numpad */
-    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),
+  /* Numpad
+   * ,-----------------------.
+   * |  7  |  8  |  9  |Bksp |
+   * |-----`-----`-----`-----|
+   * |  4  |  5  |  6  | Tab |
+   * |-----`-----`-----`-----|
+   * |  1  |  2  |  3  |Enter|
+   * |-----`-----`-----`-----|
+   * |  0  |Space|  .  |  /  |
+   * `-----`-----`-----`-----'
+   * | L1  | L2  |     |     | Layer hold
+   */
+  [_NP] = LAYOUT_ortho_4x4( /* Numpad */
+    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
+  ),
 
-/* L1
- * ,-----------------------.
- * |Reset|     |     | Del |
- * |-----`-----`-----`-----|
- * | Left| Down| Up  |Right|
- * |-----`-----`-----`-----|
- * | 192.| 255 |     |     |
- * |-----`-----`-----`-----|
- * |_____| LED |  .  |     |
- * `-----`-----`-----`-----'
- */
-  [_L1] = /* LAYER 1 */
-    LAYOUT_ortho_4x4(RESET,   XXXXXXX, XXXXXXX, KC_DEL, \
-                   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, \
-                   STR192,  STR255,  XXXXXXX, XXXXXXX, \
-                   _______, BL_STEP, _______, XXXXXXX),
- 
-/* L2
- * ,-----------------------.
- * |     |     | str | str |
- * |-----`-----`-----`-----|
- * |     |     |     |     |
- * |-----`-----`-----`-----|
- * |     |     |     |     |
- * |-----`-----`-----`-----|
- * |     |_____|     |     |
- * `-----`-----`-----`-----'
- */
-  [_L2] = /* LAYER 2 */
-    LAYOUT_ortho_4x4(XXXXXXX, XXXXXXX, ADMIN,   SMSPC1, \
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-                   XXXXXXX, _______, XXXXXXX, XXXXXXX)
+  /* L1
+   * ,-----------------------.
+   * |Reset|     |     | Del |
+   * |-----`-----`-----`-----|
+   * | Left| Down| Up  |Right|
+   * |-----`-----`-----`-----|
+   * | 192.| 255 |     |     |
+   * |-----`-----`-----`-----|
+   * |_____| LED |  .  |     |
+   * `-----`-----`-----`-----'
+   */
+  [_L1] = LAYOUT_ortho_4x4( /* LAYER 1 */
+    RESET,   XXXXXXX, XXXXXXX, KC_DEL, \
+    KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, \
+    STR192,  STR255,  XXXXXXX, XXXXXXX, \
+    _______, BL_STEP, _______, XXXXXXX
+  ),
+
+  /* L2
+   * ,-----------------------.
+   * |     |     | str | str |
+   * |-----`-----`-----`-----|
+   * |     |     |     |     |
+   * |-----`-----`-----`-----|
+   * |     |     |     |     |
+   * |-----`-----`-----`-----|
+   * |     |_____|     |     |
+   * `-----`-----`-----`-----'
+   */
+  [_L2] = LAYOUT_ortho_4x4( /* LAYER 2 */
+    XXXXXXX, XXXXXXX, ADMIN,   SMSPC1, \
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+    XXXXXXX, _______, XXXXXXX, XXXXXXX
+  )
 };
 
 void persistent_default_layer_set(uint16_t default_layer) {
@@ -84,25 +85,25 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case ADMIN:
       if (record->event.pressed) {
-	SEND_STRING("Administrator");
+  SEND_STRING("Administrator");
       }
       return false;
       break;
     case SMSPC1:
       if (record->event.pressed) {
-	SEND_STRING("Simspace1!");
+  SEND_STRING("Simspace1!");
       }
       return false;
       break;
     case STR192:
       if (record->event.pressed) {
-	SEND_STRING("192.168.");
+  SEND_STRING("192.168.");
       }
       return false;
       break;
     case STR255:
       if (record->event.pressed) {
-	SEND_STRING("255");
+  SEND_STRING("255");
       }
       return false;
       break;