Merge remote-tracking branch 'origin/master' into develop

9 files changed, 336 insertions, 0 deletions

diff --git a/keyboards/pkb65/config.h b/keyboards/pkb65/config.h
new file mode 100644
index 0000000000..7c6af9f84a
--- /dev/null
+++ b/keyboards/pkb65/config.h
@@ -0,0 +1,68 @@
+/*
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4D43 // MCKeebs
+#define PRODUCT_ID      0x6060 
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    MCKeebs
+#define PRODUCT         PKB65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/* 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 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 0
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* 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_ANIMATIONS
+#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
new file mode 100644
index 0000000000..e21010015d
--- /dev/null
+++ b/keyboards/pkb65/info.json
@@ -0,0 +1,77 @@
+{

+  "keyboard_name": "PKB65", 

+  "url": "", 

+  "maintainer": "qmk", 

+  "width": 16, 

+  "height": 5, 

+  "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}]

+      }

+  }

+}
\ No newline at end of file
diff --git a/keyboards/pkb65/keymaps/default/keymap.c b/keyboards/pkb65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..74528cd2b6
--- /dev/null
+++ b/keyboards/pkb65/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/*
+
+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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_END, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_DEL, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+	LAYOUT(
+		KC_GRAVE, 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 
+		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_TRNS, KC_TRNS),
+
+
+};
+
diff --git a/keyboards/pkb65/keymaps/via/keymap.c b/keyboards/pkb65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..fc33861452
--- /dev/null
+++ b/keyboards/pkb65/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+
+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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PSCR, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+	LAYOUT(
+		KC_GRAVE, 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 
+		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_TRNS, KC_TRNS),
+
+	LAYOUT(
+		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_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_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_TRNS, KC_TRNS),
+
+	LAYOUT(
+		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_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_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_TRNS, KC_TRNS),
+
+
+};
diff --git a/keyboards/pkb65/keymaps/via/rules.mk b/keyboards/pkb65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/pkb65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/pkb65/pkb65.c b/keyboards/pkb65/pkb65.c
new file mode 100644
index 0000000000..3e07960320
--- /dev/null
+++ b/keyboards/pkb65/pkb65.c
@@ -0,0 +1,20 @@
+/*
+
+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
new file mode 100644
index 0000000000..770f3db457
--- /dev/null
+++ b/keyboards/pkb65/pkb65.h
@@ -0,0 +1,38 @@
+/*
+
+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 }  \
+}
+
+
diff --git a/keyboards/pkb65/readme.md b/keyboards/pkb65/readme.md
new file mode 100644
index 0000000000..b47552da0f
--- /dev/null
+++ b/keyboards/pkb65/readme.md
@@ -0,0 +1,16 @@
+# PKB65
+
+![PKB65 Layout Image](https://i.imgur.com/0bqpIb8.png)
+
+A regular 65% layout keyboard. This will be the default layout flashed for all pkb65 boards.
+Made and sold by MCKeebs. [More info on MCKeebDeisgn](https://www.mckeebdesign.com)
+
+* Keyboard Maintainer: [MCKeebs](https://github.com/chrisquocmai)
+* Hardware Supported: [PKB65 PCB](https://https://mckeebdesign.com/PKB65/)
+* Hardware Availability: [PKB65](https://mckeebdesign.com/PKB65/)
+
+Make example for this keyboard (after setting up your build environment:
+    
+    make pkb65:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/pkb65/rules.mk b/keyboards/pkb65/rules.mk
new file mode 100644
index 0000000000..91f48bd442
--- /dev/null
+++ b/keyboards/pkb65/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output