Merge branch 'develop'

4 files changed, 82 insertions, 156 deletions

diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h
index fa0a4567f9..7f37e40119 100644
--- a/keyboards/pkb65/config.h
+++ b/keyboards/pkb65/config.h
@@ -21,35 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { C7, C6, B6, B7, F0 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, D4, D6, D7, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/pkb65/info.json b/keyboards/pkb65/info.json
index 50be7dff7d..325970dac8 100644
--- a/keyboards/pkb65/info.json
+++ b/keyboards/pkb65/info.json
@@ -1,83 +1,94 @@
 {
-  "keyboard_name": "PKB65", 
+  "keyboard_name": "PKB65",
   "manufacturer": "MCKeebs",
-  "url": "", 
-  "maintainer": "qmk", 
+  "url": "",
+  "maintainer": "qmk",
   "usb": {
     "vid": "0x4D43",
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+    "rows": ["C7", "C6", "B6", "B7", "F0"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-      "LAYOUT": {
-          "layout": [
-            {"label":"Esc", "x":0, "y":0}, 
-            {"label":"!", "x":1, "y":0}, 
-            {"label":"@", "x":2, "y":0}, 
-            {"label":"#", "x":3, "y":0}, 
-            {"label":"$", "x":4, "y":0}, 
-            {"label":"%", "x":5, "y":0}, 
-            {"label":"^", "x":6, "y":0}, 
-            {"label":"&", "x":7, "y":0}, 
-            {"label":"*", "x":8, "y":0}, 
-            {"label":"(", "x":9, "y":0}, 
-            {"label":")", "x":10, "y":0}, 
-            {"label":"_", "x":11, "y":0}, 
-            {"label":"+", "x":12, "y":0}, 
-            {"label":"Backspace", "x":13, "y":0, "w":2}, 
-            {"label":"Tab", "x":0, "y":1, "w":1.5}, 
-            {"label":"Q", "x":1.5, "y":1}, 
-            {"label":"W", "x":2.5, "y":1}, 
-            {"label":"E", "x":3.5, "y":1}, 
-            {"label":"R", "x":4.5, "y":1}, 
-            {"label":"T", "x":5.5, "y":1}, 
-            {"label":"Y", "x":6.5, "y":1}, 
-            {"label":"U", "x":7.5, "y":1}, 
-            {"label":"I", "x":8.5, "y":1}, 
-            {"label":"O", "x":9.5, "y":1}, 
-            {"label":"P", "x":10.5, "y":1}, 
-            {"label":"{", "x":11.5, "y":1}, 
-            {"label":"}", "x":12.5, "y":1}, 
-            {"label":"|", "x":13.5, "y":1, "w":1.5}, 
-            {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 
-            {"label":"A", "x":1.75, "y":2}, 
-            {"label":"S", "x":2.75, "y":2}, 
-            {"label":"D", "x":3.75, "y":2}, 
-            {"label":"F", "x":4.75, "y":2}, 
-            {"label":"G", "x":5.75, "y":2}, 
-            {"label":"H", "x":6.75, "y":2}, 
-            {"label":"J", "x":7.75, "y":2}, 
-            {"label":"K", "x":8.75, "y":2}, 
-            {"label":"L", "x":9.75, "y":2}, 
-            {"label":":", "x":10.75, "y":2}, 
-            {"label":"\"", "x":11.75, "y":2}, 
-            {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-            {"label":"Delete", "x":15, "y":2}, 
-            {"label":"Shift", "x":0, "y":3, "w":2.25}, 
-            {"label":"Z", "x":2.25, "y":3}, 
-            {"label":"X", "x":3.25, "y":3}, 
-            {"label":"C", "x":4.25, "y":3}, 
-            {"label":"V", "x":5.25, "y":3}, 
-            {"label":"B", "x":6.25, "y":3},
-            {"label":"N", "x":7.25, "y":3}, 
-            {"label":"M", "x":8.25, "y":3}, 
-            {"label":"<", "x":9.25, "y":3}, 
-            {"label":">", "x":10.25, "y":3}, 
-            {"label":"?", "x":11.25, "y":3}, 
-            {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
-            {"label":"\u2191", "x":14, "y":3}, 
-            {"label":"PrtSc", "x":15, "y":3}, 
-            {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-            {"label":"Win", "x":1.25, "y":4, "w":1.25}, 
-            {"label":"Alt", "x":2.5, "y":4, "w":1.25}, 
-            {"x":3.75, "y":4, "w":6.25}, 
-            {"label":"Alt", "x":10, "y":4, "w":1.25}, 
-            {"label":"Fn", "x":11.25, "y":4, "w":1.25}, 
-            {"label":"\u2190", "x":13, "y":4}, 
-            {"label":"\u2193", "x":14, "y":4}, 
-            {"label":"\u2192", "x":15, "y":4}]
-      }
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [2, 13], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
+        {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 12], "x": 14, "y": 3},
+        {"matrix": [3, 13], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 11], "x": 13, "y": 4},
+        {"matrix": [4, 12], "x": 14, "y": 4},
+        {"matrix": [4, 13], "x": 15, "y": 4}
+      ]
+    }
   }
 }
diff --git a/keyboards/pkb65/pkb65.c b/keyboards/pkb65/pkb65.c
deleted file mode 100644
index 3e07960320..0000000000
--- a/keyboards/pkb65/pkb65.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-
-Copyright 2021 MCKeebs <mckeebdesign@gmail.com>
-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 <http://www.gnu.org/licenses/>.
-
-
-*/
-#include "pkb65.h"
diff --git a/keyboards/pkb65/pkb65.h b/keyboards/pkb65/pkb65.h
deleted file mode 100644
index 770f3db457..0000000000
--- a/keyboards/pkb65/pkb65.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-Copyright 2021 MCKeebs <mckeebdesign@gmail.com>
-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 <http://www.gnu.org/licenses/>.
-
-
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
-	K400, K401, K402,             K405,                   K409, K410, K411, K412, K413  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313 }, \
-	{ K400,  K401,  K402,  KC_NO, KC_NO, K405,  KC_NO, KC_NO, KC_NO, K409,  K410,  K411,  K412,  K413 }  \
-}
-
-