From 3204dec09636f94275707368fb1ba37632c82042 Mon Sep 17 00:00:00 2001
From: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 4 Jul 2018 17:59:35 -0700
Subject: 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
---
 keyboards/roadkit/keymaps/flipphone/keymap.c | 59 +++++++++++++++-------------
 1 file changed, 31 insertions(+), 28 deletions(-)

(limited to 'keyboards/roadkit/keymaps/flipphone/keymap.c')

diff --git a/keyboards/roadkit/keymaps/flipphone/keymap.c b/keyboards/roadkit/keymaps/flipphone/keymap.c
index b48d72e9ee..fed9d02706 100644
--- a/keyboards/roadkit/keymaps/flipphone/keymap.c
+++ b/keyboards/roadkit/keymaps/flipphone/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;
 
@@ -47,31 +45,36 @@ enum roadkit_keycodes {
 #define XXXXXXX KC_NO
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_NUMPAD] = /* Numpad */
-    KEYMAP(KC_KP_7, KC_KP_8,   KC_KP_9, KC_KP_PLUS,  \
-           KC_KP_4, KC_KP_5,   KC_KP_6,              \
-           KC_KP_1, KC_KP_2,   KC_KP_3, KC_KP_ENTER, \
-           LT(_ADJUST, KC_KP_0),  KC_KP_DOT),
-  [_FPH] = /* Quiet T9 */
-    KEYMAP(FPH_7, FPH_8,   FPH_9, KC_KP_PLUS,  \
-           FPH_4, FPH_5,   FPH_6,              \
-           FPH_1, FPH_2,   FPH_3, SFT_T(KC_KP_ENTER), \
-           LT(_ADJUST, KC_SPACE),   KC_KP_DOT),
-  [_FPHNOISY] = /* Noisy T9 */
-    KEYMAP(FPH_7, FPH_8,   FPH_9, KC_KP_PLUS,  \
-           FPH_4, FPH_5,   FPH_6,              \
-           FPH_1, FPH_2,   FPH_3, SFT_T(KC_KP_ENTER), \
-           LT(_ADJUST, KC_SPACE),   KC_KP_DOT),
- [_ADJUST] = /* Adjustments */
-   KEYMAP(KC_NUMLOCK, TG(_FPHNOISY),  TG(_FPH), TG(_NUMPAD),  \
-         KC_BSPC, BACKLIT,   KC_DEL,              \
-         MACSLEEP, _______,   _______, _______, \
-         _______,           MO(_DYN)),
- [_DYN] = /* DYNAMIC MACRO */
-    KEYMAP(DYN_REC_START1, DYN_REC_START2, _______, DYN_REC_STOP,  \
-         _______, _______,  _______,              \
-         DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______, _______, \
-         _______,            _______),
+  [_NUMPAD] = LAYOUT_numpad_4x4( /* Numpad */
+    KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_PLUS,  \
+    KC_KP_4,    KC_KP_5,    KC_KP_6,                 \
+    KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_KP_ENTER, \
+    LT(_ADJUST, KC_KP_0),   KC_KP_DOT                \
+  ),
+  [_FPH] = LAYOUT_numpad_4x4( /* Quiet T9 */
+    FPH_7,      FPH_8,      FPH_9,      KC_KP_PLUS,         \
+    FPH_4,      FPH_5,      FPH_6,                          \
+    FPH_1,      FPH_2,      FPH_3,      SFT_T(KC_KP_ENTER), \
+    LT(_ADJUST, KC_SPACE),  KC_KP_DOT                       \
+  ),
+  [_FPHNOISY] = LAYOUT_numpad_4x4( /* Noisy T9 */
+    FPH_7,      FPH_8,      FPH_9,      KC_KP_PLUS,         \
+    FPH_4,      FPH_5,      FPH_6,                          \
+    FPH_1,      FPH_2,      FPH_3,      SFT_T(KC_KP_ENTER), \
+    LT(_ADJUST, KC_SPACE),  KC_KP_DOT                       \
+    ),
+  [_ADJUST] = LAYOUT_numpad_4x4( /* Adjustments */
+    KC_NUMLOCK, TG(_FPHNOISY), TG(_FPH), TG(_NUMPAD), \
+    KC_BSPC,    BACKLIT,       KC_DEL,                \
+    MACSLEEP,   _______,       _______,  _______,     \
+    _______,                   MO(_DYN)               \
+  ),
+  [_DYN] = LAYOUT_numpad_4x4( /* DYNAMIC MACRO */
+    DYN_REC_START1, DYN_REC_START2, _______, DYN_REC_STOP, \
+    _______, _______,  _______,                            \
+    DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, _______, _______,    \
+    _______,            _______                            \
+  ),
 };
 
 const uint16_t PROGMEM fn_actions[] = {
-- 
cgit v1.2.3