Move kbdpad_mk2 to kbdpad/mk2, add numpad layout to mk2.h (#15892)

qmk · Jan 29, 2022 · 2100a7c · 2100a7c
1 parent 3307a8e
commit 2100a7c
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 16 deletions.
diff --git a/keyboards/kbdfans/kbdpad_mk2/config.h → keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad_mk2/config.h → keyboards/kbdfans/kbdpad/mk2/config.h
diff --git a/keyboards/kbdfans/kbdpad_mk2/info.json → keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad_mk2/info.json → keyboards/kbdfans/kbdpad/mk2/info.json
diff --git a/...dfans/kbdpad_mk2/keymaps/default/keymap.c → ...dfans/kbdpad/mk2/keymaps/default/keymap.c b/...dfans/kbdpad_mk2/keymaps/default/keymap.c → ...dfans/kbdpad/mk2/keymaps/default/keymap.c
@@ -19,10 +19,10 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_6x4( /* Base */
     KC_ESC,  KC_LCTL, KC_LALT, KC_BSPC,
-	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-	KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-	KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_P0,   KC_P0,   KC_PDOT, KC_PENT
   ),
 };
diff --git a/...fans/kbdpad_mk2/keymaps/default/readme.md → ...fans/kbdpad/mk2/keymaps/default/readme.md b/...fans/kbdpad_mk2/keymaps/default/readme.md → ...fans/kbdpad/mk2/keymaps/default/readme.md
diff --git a/...bdpad_mk2/keymaps/iracing_replay/keymap.c → ...bdpad/mk2/keymaps/iracing_replay/keymap.c b/...bdpad_mk2/keymaps/iracing_replay/keymap.c → ...bdpad/mk2/keymaps/iracing_replay/keymap.c
diff --git a/...dpad_mk2/keymaps/iracing_replay/readme.md → ...dpad/mk2/keymaps/iracing_replay/readme.md b/...dpad_mk2/keymaps/iracing_replay/readme.md → ...dpad/mk2/keymaps/iracing_replay/readme.md
diff --git a/...bdpad_mk2/keymaps/iracing_replay/rules.mk → ...bdpad/mk2/keymaps/iracing_replay/rules.mk b/...bdpad_mk2/keymaps/iracing_replay/rules.mk → ...bdpad/mk2/keymaps/iracing_replay/rules.mk
diff --git a/...bdfans/kbdpad_mk2/keymaps/tester/keymap.c → ...bdfans/kbdpad/mk2/keymaps/tester/keymap.c b/...bdfans/kbdpad_mk2/keymaps/tester/keymap.c → ...bdfans/kbdpad/mk2/keymaps/tester/keymap.c
diff --git a/...dfans/kbdpad_mk2/keymaps/tester/readme.md → ...dfans/kbdpad/mk2/keymaps/tester/readme.md b/...dfans/kbdpad_mk2/keymaps/tester/readme.md → ...dfans/kbdpad/mk2/keymaps/tester/readme.md
diff --git a/...s/kbdfans/kbdpad_mk2/keymaps/via/keymap.c → ...s/kbdfans/kbdpad/mk2/keymaps/via/keymap.c b/...s/kbdfans/kbdpad_mk2/keymaps/via/keymap.c → ...s/kbdfans/kbdpad/mk2/keymaps/via/keymap.c
diff --git a/...s/kbdfans/kbdpad_mk2/keymaps/via/rules.mk → ...s/kbdfans/kbdpad/mk2/keymaps/via/rules.mk b/...s/kbdfans/kbdpad_mk2/keymaps/via/rules.mk → ...s/kbdfans/kbdpad/mk2/keymaps/via/rules.mk
diff --git a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c → keyboards/kbdfans/kbdpad/mk2/mk2.c b/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c → keyboards/kbdfans/kbdpad/mk2/mk2.c
@@ -13,4 +13,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "kbdpad_mk2.h"
+#include "mk2.h"
diff --git a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.h → keyboards/kbdfans/kbdpad/mk2/mk2.h b/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.h → keyboards/kbdfans/kbdpad/mk2/mk2.h
@@ -27,17 +27,34 @@
  */
 #define LAYOUT_ortho_6x4( \
     K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43, \
-	K50, K51, K52, K53  \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, K43, \
+    K50, K51, K52, K53  \
 ) \
 { \
     { K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }, \
-	{ K30, K31, K32, K33 }, \
-	{ K40, K41, K42, K43 }, \
-	{ K50, K51, K52, K53 }  \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, K33 }, \
+    { K40, K41, K42, K43 }, \
+    { K50, K51, K52, K53 }  \
+}
+
+#define LAYOUT_numpad_6x4( \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, \
+    K50,      K52, K53  \
+) \
+{ \
+    { K00, K01,   K02, K03 }, \
+    { K10, K11,   K12, K13 }, \
+    { K20, K21,   K22, KC_NO }, \
+    { K30, K31,   K32, K33 }, \
+    { K40, K41,   K42, KC_NO }, \
+    { K50, KC_NO, K52, K53 } \
 }
diff --git a/keyboards/kbdfans/kbdpad_mk2/readme.md → keyboards/kbdfans/kbdpad/mk2/readme.md b/keyboards/kbdfans/kbdpad_mk2/readme.md → keyboards/kbdfans/kbdpad/mk2/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/rules.mk → keyboards/kbdfans/kbdpad/mk2/rules.mk b/keyboards/kbdfans/kbdpad_mk2/rules.mk → keyboards/kbdfans/kbdpad/mk2/rules.mk