Refactor and Configurator updates for AMJ Pad (#3060)

* Refactor for AMJ Pad

* Configurator update for AMJ Pad

* Add hardware agnostic layouts numpad_6x4 and ortho_6x4

* Add agnostic layouts to rules.mk

* Refactor AMJ Pad to use new hardware agnostic layouts

6 files changed, 51 insertions, 0 deletions

diff --git a/layouts/default/numpad_6x4/default_numpad_6x4/keymap.c b/layouts/default/numpad_6x4/default_numpad_6x4/keymap.c
new file mode 100644
index 000000000..3901595b7
--- /dev/null
+++ b/layouts/default/numpad_6x4/default_numpad_6x4/keymap.c
@@ -0,0 +1,21 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_numpad_6x4(
+    KC_ESC,  KC_TAB,  MO(1),   KC_BSPC, \
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+    KC_P7,   KC_P8,   KC_P9,   \
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS, \
+    KC_P1,   KC_P2,   KC_P3,   \
+      KC_P0,          KC_PDOT, KC_PENT  \
+  ),
+
+  [1] = LAYOUT_numpad_6x4(
+    RESET,   KC_TAB,  KC_TRNS, KC_PEQL, \
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+    KC_HOME, KC_UP,   KC_PGUP, \
+    KC_LEFT, KC_NO,   KC_RGHT, KC_PPLS, \
+    KC_END,  KC_DOWN, KC_PGDN, \
+      KC_INS,         KC_DEL,  KC_PENT  \
+  ),
+};
diff --git a/layouts/default/numpad_6x4/layout.json b/layouts/default/numpad_6x4/layout.json
new file mode 100644
index 000000000..7264cd5a6
--- /dev/null
+++ b/layouts/default/numpad_6x4/layout.json
@@ -0,0 +1,6 @@
+["","","",""],
+[{y:0.5},"","","",""],
+["","","",{h:2},""],
+["","",""],
+["","","",{h:2},""],
+[{w:2},"",""]
diff --git a/layouts/default/numpad_6x4/readme.md b/layouts/default/numpad_6x4/readme.md
new file mode 100644
index 000000000..c539baef7
--- /dev/null
+++ b/layouts/default/numpad_6x4/readme.md
@@ -0,0 +1,3 @@
+# numpad_6x4
+
+    LAYOUT_numpad_6x4
\ No newline at end of file
diff --git a/layouts/default/ortho_6x4/default_ortho_6x4/keymap.c b/layouts/default/ortho_6x4/default_ortho_6x4/keymap.c
new file mode 100644
index 000000000..39c1ed481
--- /dev/null
+++ b/layouts/default/ortho_6x4/default_ortho_6x4/keymap.c
@@ -0,0 +1,12 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_6x4(
+    KC_F1,  KC_F2,  KC_F3,  KC_F4,  \
+    KC_F5,  KC_F6,  KC_F7,  KC_F8,  \
+    KC_F9,  KC_F10, KC_F11, KC_F12, \
+    KC_F13, KC_F14, KC_F15, KC_F16, \
+    KC_F17, KC_F18, KC_F19, KC_F20, \
+    KC_F21, KC_F22, KC_F23, KC_F24  \
+  ),
+};
diff --git a/layouts/default/ortho_6x4/layout.json b/layouts/default/ortho_6x4/layout.json
new file mode 100644
index 000000000..4db1bb0fd
--- /dev/null
+++ b/layouts/default/ortho_6x4/layout.json
@@ -0,0 +1,6 @@
+["","","",""],
+["","","",""],
+["","","",""],
+["","","",""],
+["","","",""],
+["","","",""],
diff --git a/layouts/default/ortho_6x4/readme.md b/layouts/default/ortho_6x4/readme.md
new file mode 100644
index 000000000..6014d4b19
--- /dev/null
+++ b/layouts/default/ortho_6x4/readme.md
@@ -0,0 +1,3 @@
+# ortho_6x4
+
+    LAYOUT_ortho_6x4
\ No newline at end of file