diff --git a/keyboards/primekb/prime_m/info.json b/keyboards/primekb/prime_m/info.json
index 5332522022..822823e62a 100644
--- a/keyboards/primekb/prime_m/info.json
+++ b/keyboards/primekb/prime_m/info.json
@@ -1,3 +1,4 @@
+
{
"keyboard_name": "Prime_M",
"url": "https://www.primekb.com",
@@ -5,8 +6,43 @@
"width": 6,
"height": 5,
"layouts": {
- "LAYOUT": {
+ "LAYOUT_ortho_5x6": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}]
+ },
+ "LAYOUT_numpad_5x6": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+
+ {"x":0, "y":1},
+ {"x":1, "y":1},
+ {"x":2, "y":1},
+ {"x":3, "y":1},
+ {"x":4, "y":1},
+
+ {"x":0, "y":2},
+ {"x":1, "y":2},
+ {"x":2, "y":2},
+ {"x":3, "y":2},
+ {"x":4, "y":2},
+ {"x":5, "y":1, "h":2},
+
+ {"x":0, "y":3},
+ {"x":1, "y":3},
+ {"x":2, "y":3},
+ {"x":3, "y":3},
+ {"x":4, "y":3},
+
+ {"x":0, "y":4},
+ {"x":1, "y":4},
+ {"x":2, "y":4, "w":2},
+ {"x":4, "y":4},
+ {"x":5, "y":3, "h":2}
+ ]
}
- }
+}
}
diff --git a/keyboards/primekb/prime_m/keymaps/default/keymap.c b/keyboards/primekb/prime_m/keymaps/default/keymap.c
index d230439d08..6834624d83 100644
--- a/keyboards/primekb/prime_m/keymaps/default/keymap.c
+++ b/keyboards/primekb/prime_m/keymaps/default/keymap.c
@@ -22,28 +22,28 @@ enum custom_keycodes {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
- KC_ESC, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, LT(2, KC_BSPC),
- KC_F1, KC_F2, KC_P7, KC_P8, KC_P9, KC_DEL,
- KC_F3, KC_F4, KC_P4, KC_P5, KC_P6, KC_PMNS,
- KC_F5, KC_F6, KC_P1, KC_P2, KC_P3, KC_PPLS,
- KC_LCTL, KC_LALT, TO(1), KC_P0, KC_PDOT, KC_ENT
+ [0] = LAYOUT_ortho_5x6(
+ KC_ESC, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, LT(2, KC_BSPC),
+ KC_F1, KC_F2, KC_P7, KC_P8, KC_P9, KC_DEL,
+ KC_F3, KC_F4, KC_P4, KC_P5, KC_P6, KC_PMNS,
+ KC_F5, KC_F6, KC_P1, KC_P2, KC_P3, KC_PPLS,
+ KC_LCTL, KC_LALT, TO(1), KC_P0, KC_PDOT, KC_PENT
),
- [1] = LAYOUT(
- KC_ESC, KC_1, KC_2, KC_3, KC_4, LT(2, KC_F9),
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_LCTL, KC_LALT, TO(0), KC_P, KC_H, KC_SPC
+ [1] = LAYOUT_ortho_5x6(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, LT(2, KC_F9),
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
+ KC_LCTL, KC_LALT, TO(0), KC_P, KC_H, KC_SPC
),
-
- [2] = LAYOUT(
- BL_TOGG, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD
+
+ [2] = LAYOUT_ortho_5x6(
+ BL_TOGG, BL_STEP, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, KC_VOLU,
+ _______, _______, _______, _______, KC_MUTE, KC_VOLD
)
};
diff --git a/keyboards/primekb/prime_m/keymaps/numpad/config.h b/keyboards/primekb/prime_m/keymaps/numpad/config.h
new file mode 100644
index 0000000000..95917a65cd
--- /dev/null
+++ b/keyboards/primekb/prime_m/keymaps/numpad/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2018 Jumail Mundekkat
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+// place overrides here
diff --git a/keyboards/primekb/prime_m/keymaps/numpad/keymap.c b/keyboards/primekb/prime_m/keymaps/numpad/keymap.c
new file mode 100644
index 0000000000..35ff30a0c8
--- /dev/null
+++ b/keyboards/primekb/prime_m/keymaps/numpad/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2018 Jumail Mundekkat
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_numpad_5x6(
+ KC_ESC, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_A, KC_B, KC_P7, KC_P8, KC_P9,
+ KC_C, KC_D, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_E, KC_F, KC_P1, KC_P2, KC_P3,
+ KC_LCTL, TG(1), KC_P0, KC_PDOT, KC_PENT
+ ),
+ [1] = LAYOUT_numpad_5x6(
+ RESET, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_A, KC_B, KC_HOME, KC_UP, KC_PGUP,
+ KC_C, KC_D, KC_LEFT, KC_NO, KC_RGHT, KC_PPLS,
+ KC_E, KC_F, KC_END, KC_DOWN, KC_PGDN,
+ KC_LCTL, _______, KC_INS, KC_DEL, KC_PENT
+ ),
+};
diff --git a/keyboards/primekb/prime_m/keymaps/numpad/readme.md b/keyboards/primekb/prime_m/keymaps/numpad/readme.md
new file mode 100644
index 0000000000..5654918abb
--- /dev/null
+++ b/keyboards/primekb/prime_m/keymaps/numpad/readme.md
@@ -0,0 +1 @@
+# The default keymap for prime_m
\ No newline at end of file
diff --git a/keyboards/primekb/prime_m/prime_m.h b/keyboards/primekb/prime_m/prime_m.h
index 0449a66d9b..58d17eb6f6 100644
--- a/keyboards/primekb/prime_m/prime_m.h
+++ b/keyboards/primekb/prime_m/prime_m.h
@@ -13,12 +13,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-#ifndef PRIME_M_H
-#define PRIME_M_H
+#pragma once
#include "quantum.h"
+#define ___ KC_NO
-#define LAYOUT( \
+#define LAYOUT_ortho_5x6( \
K00, K01, K02, K03, K04, K05, \
K10, K11, K12, K13, K14, K15, \
K20, K21, K22, K23, K24, K25, \
@@ -32,4 +32,16 @@
{ K40, K41, K42, K43, K44, K45 } \
}
-#endif
+#define LAYOUT_numpad_5x6( \
+ K00, K01, K02, K03, K04, K05, \
+ K10, K11, K12, K13, K14, \
+ K20, K21, K22, K23, K24, K15, \
+ K30, K31, K32, K33, K34, \
+ K40, K41, K42, K44, K35 \
+) { \
+ { K00, K01, K02, K03, K04, K05 }, \
+ { K10, K11, K12, K13, K14, K15 }, \
+ { K20, K21, K22, K23, K24, ___ }, \
+ { K30, K31, K32, K33, K34, K35 }, \
+ { K40, K41, K42, ___, K44, ___ } \
+}
diff --git a/keyboards/primekb/prime_m/rules.mk b/keyboards/primekb/prime_m/rules.mk
index 8d3b835f18..72ad8325d3 100644
--- a/keyboards/primekb/prime_m/rules.mk
+++ b/keyboards/primekb/prime_m/rules.mk
@@ -78,3 +78,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
+
+LAYOUTS = ortho_5x6 numpad_5x6
diff --git a/layouts/default/numpad_5x6/default_numpad_5x6/keymap.c b/layouts/default/numpad_5x6/default_numpad_5x6/keymap.c
new file mode 100644
index 0000000000..527d089052
--- /dev/null
+++ b/layouts/default/numpad_5x6/default_numpad_5x6/keymap.c
@@ -0,0 +1,18 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_numpad_5x6(
+ KC_ESC, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_A, KC_B, KC_P7, KC_P8, KC_P9,
+ KC_C, KC_D, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_E, KC_F, KC_P1, KC_P2, KC_P3,
+ KC_LCTL, TG(1), KC_P0, KC_PDOT, KC_PENT
+ ),
+ [1] = LAYOUT_numpad_5x6(
+ RESET, KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_A, KC_B, KC_HOME, KC_UP, KC_PGUP,
+ KC_C, KC_D, KC_LEFT, KC_NO, KC_RGHT, KC_PPLS,
+ KC_E, KC_F, KC_END, KC_DOWN, KC_PGDN,
+ KC_LCTL, _______, KC_INS, KC_DEL, KC_PENT
+ ),
+};
diff --git a/layouts/default/numpad_5x6/layout.json b/layouts/default/numpad_5x6/layout.json
new file mode 100644
index 0000000000..7264cd5a6d
--- /dev/null
+++ b/layouts/default/numpad_5x6/layout.json
@@ -0,0 +1,6 @@
+["","","",""],
+[{y:0.5},"","","",""],
+["","","",{h:2},""],
+["","",""],
+["","","",{h:2},""],
+[{w:2},"",""]
diff --git a/layouts/default/numpad_5x6/readme.md b/layouts/default/numpad_5x6/readme.md
new file mode 100644
index 0000000000..147097c837
--- /dev/null
+++ b/layouts/default/numpad_5x6/readme.md
@@ -0,0 +1,3 @@
+# numpad_5x6
+
+ LAYOUT_numpad_5x6