Refactor and Configurator updates for AMJ Pad (#3060)

[qmk_firmware.git] / keyboards / amjpad / keymaps / max / keymap.c

diff --git a/keyboards/amjpad/keymaps/max/keymap.c b/keyboards/amjpad/keymaps/max/keymap.c
index 926a494a907350f61cc1c165fc8c938181b948b4..463a265de13439190d66b9ef642198e8461ac7e0 100644 (file)
--- a/keyboards/amjpad/keymaps/max/keymap.c
+++ b/keyboards/amjpad/keymaps/max/keymap.c
@@ -1,4 +1,4 @@
-#include "amjpad.h"
+#include QMK_KEYBOARD_H
 
 #ifdef RGBLIGHT_ENABLE
 #include "rgblight.h"
@@ -33,14 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `-------------------'
    */
 
-[_BL] = MAXKEYMAP(
-
-  KC_ESC,  KC_TAB,  KC_MINS,KC_EQL,  \
-  KC_F1,   KC_F2,   KC_F3,  KC_F4,   \
-  KC_P7,   KC_P8,   KC_P9,  KC_PMNS, \
-  KC_P4,   KC_P5,   KC_P6,  KC_PENT, \
-  KC_P1,   KC_P2,   KC_P3,  KC_BSLS, \
-  KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT),
+  [_BL] = LAYOUT_ortho_6x4(
+    KC_ESC,  KC_TAB,  KC_MINS,KC_EQL,  \
+    KC_F1,   KC_F2,   KC_F3,  KC_F4,   \
+    KC_P7,   KC_P8,   KC_P9,  KC_PMNS, \
+    KC_P4,   KC_P5,   KC_P6,  KC_PENT, \
+    KC_P1,   KC_P2,   KC_P3,  KC_BSLS, \
+    KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT
+  ),
 
   /* Keymap _FL: Function Layer
    * ,-------------------.
@@ -57,14 +57,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |   0     |./FN|    |
    * `-------------------'
    */
-[_FL] = MAXKEYMAP(
-
-  KC_ESC,KC_TAB,KC_BSPC,KC_PEQL, \
-  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
-  KC_P7, KC_P8, KC_P9, RESET,  \
-  KC_P4, KC_P5, KC_P6, KC_PENT, \
-  KC_P1, KC_P2, KC_P3, KC_PENT, \
-  KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT),
+  [_FL] = LAYOUT_ortho_6x4(
+    KC_ESC,  KC_TAB,  KC_BSPC, KC_PEQL, \
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+    KC_P7,   KC_P8,   KC_P9,   RESET,   \
+    KC_P4,   KC_P5,   KC_P6,   KC_PENT, \
+    KC_P1,   KC_P2,   KC_P3,   KC_PENT, \
+    KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
+  ),
 };
 
 enum function_id {