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

12 files changed, 352 insertions, 1 deletions

diff --git a/keyboards/nk87/config.h b/keyboards/nk87/config.h
index 4a1098a900..091d80efb8 100755
--- a/keyboards/nk87/config.h
+++ b/keyboards/nk87/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 17
 
 #define MATRIX_ROW_PINS { A7, B3, B4, B5, A8, A4 }
-#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5, B1, B10 }
+#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B2, B0, A6, A0, A1, A2, A3, A5, B1, B10 }
 // To enable debugger set A13 A14 -> A5 A7
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/prototypist/j01/config.h b/keyboards/prototypist/j01/config.h
new file mode 100644
index 0000000000..4d15e1349b
--- /dev/null
+++ b/keyboards/prototypist/j01/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2020 Shaun Mitchell (Flex)
+ *
+ * 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       0x5450
+#define PRODUCT_ID      0x6A31
+#define DEVICE_VER      0x0001
+#define MANUFACTURER Prototypist
+#define PRODUCT J-01 Rev1
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 18
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { B3, B2, B0, F6, F5 }
+#define MATRIX_COL_PINS { B1, F0, F7, F1, F4, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 5
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
diff --git a/keyboards/prototypist/j01/info.json b/keyboards/prototypist/j01/info.json
new file mode 100644
index 0000000000..252bffe69b
--- /dev/null
+++ b/keyboards/prototypist/j01/info.json
@@ -0,0 +1,95 @@
+{
+    "keyboard_name": "J-01",
+    "url": "https://prototypist.net/",
+    "maintainer": "Flexerm",
+    "width": 19,
+    "height": 5.25,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"K00 (B3,B1)", "x":0, "y":0},
+                {"label":"K01 (B3,F0)", "x":1, "y":0},
+                {"label":"K02 (B3,F7)", "x":2.5, "y":0},
+                {"label":"K03 (B3,F1)", "x":3.5, "y":0},
+                {"label":"K04 (B3,F4)", "x":4.5, "y":0},
+                {"label":"K05 (B3,C7)", "x":5.5, "y":0},
+                {"label":"K06 (B3,C6)", "x":6.5, "y":0},
+                {"label":"K07 (B3,B6)", "x":7.5, "y":0},
+                {"label":"K08 (B3,B5)", "x":8.5, "y":0},
+                {"label":"K09 (B3,B4)", "x":9.5, "y":0},
+                {"label":"K0A (B3,D7)", "x":10.5, "y":0},
+                {"label":"K0B (B3,D6)", "x":11.5, "y":0},
+                {"label":"K0C (B3,D4)", "x":12.5, "y":0},
+                {"label":"K0D (B3,D5)", "x":13.5, "y":0},
+                {"label":"K0E (B3,D3)", "x":14.5, "y":0},
+                {"label":"K0F (B3,D2)", "x":15.5, "y":0},
+                {"label":"K0G (B3,D1)", "x":16.5, "y":0},
+                {"label":"K0H (B3,D0)", "x":18, "y":0},
+                {"label":"K10 (B2,B1)", "x":0, "y":1},
+                {"label":"K11 (B2,F0)", "x":1, "y":1},
+                {"label":"K12 (B2,F7)", "x":2.5, "y":1, "w":1.5},
+                {"label":"K13 (B2,F1)", "x":4, "y":1},
+                {"label":"K14 (B2,F4)", "x":5, "y":1},
+                {"label":"K15 (B2,C7)", "x":6, "y":1},
+                {"label":"K16 (B2,C6)", "x":7, "y":1},
+                {"label":"K17 (B2,B6)", "x":8, "y":1},
+                {"label":"K18 (B2,B5)", "x":9, "y":1},
+                {"label":"K19 (B2,B4)", "x":10, "y":1},
+                {"label":"K1A (B2,D7)", "x":11, "y":1},
+                {"label":"K1B (B2,D6)", "x":12, "y":1},
+                {"label":"K1C (B2,D4)", "x":13, "y":1},
+                {"label":"K1D (B2,D5)", "x":14, "y":1},
+                {"label":"K1E (B2,D3)", "x":15, "y":1},
+                {"label":"K1F (B2,D2)", "x":16, "y":1, "w":1.5},
+                {"label":"K1H (B2,D0)", "x":18, "y":1},
+                {"label":"K20 (B0,B1)", "x":0, "y":2},
+                {"label":"K21 (B0,F0)", "x":1, "y":2},
+                {"label":"K22 (B0,F7)", "x":2.5, "y":2, "w":1.75},
+                {"label":"K23 (B0,F1)", "x":4.25, "y":2},
+                {"label":"K24 (B0,F4)", "x":5.25, "y":2},
+                {"label":"K25 (B0,C7)", "x":6.25, "y":2},
+                {"label":"K26 (B0,C6)", "x":7.25, "y":2},
+                {"label":"K27 (B0,B6)", "x":8.25, "y":2},
+                {"label":"K28 (B0,B5)", "x":9.25, "y":2},
+                {"label":"K29 (B0,B4)", "x":10.25, "y":2},
+                {"label":"K2A (B0,D7)", "x":11.25, "y":2},
+                {"label":"K2B (B0,D6)", "x":12.25, "y":2},
+                {"label":"K2C (B0,D4)", "x":13.25, "y":2},
+                {"label":"K2D (B0,D5)", "x":14.25, "y":2},
+                {"label":"K2E (B0,D3)", "x":15.25, "y":2},
+                {"label":"K2F (B0,D2)", "x":16.25, "y":2, "w":1.25},
+                {"label":"K2H (B0,D0)", "x":18, "y":2},
+                {"label":"K30 (F6,B1)", "x":0, "y":3},
+                {"label":"K31 (F6,F0)", "x":1, "y":3},
+                {"label":"K32 (F6,F7)", "x":2.5, "y":3, "w":1.25},
+                {"label":"K33 (F6,F1)", "x":3.75, "y":3},
+                {"label":"K34 (F6,F4)", "x":4.75, "y":3},
+                {"label":"K35 (F6,C7)", "x":5.75, "y":3},
+                {"label":"K36 (F6,C6)", "x":6.75, "y":3},
+                {"label":"K37 (F6,B6)", "x":7.75, "y":3},
+                {"label":"K38 (F6,B5)", "x":8.75, "y":3},
+                {"label":"K39 (F6,B4)", "x":9.75, "y":3},
+                {"label":"K3A (F6,D7)", "x":10.75, "y":3},
+                {"label":"K3B (F6,D6)", "x":11.75, "y":3},
+                {"label":"K3C (F6,D4)", "x":12.75, "y":3},
+                {"label":"K3D (F6,D5)", "x":13.75, "y":3},
+                {"label":"K3E (F6,D3)", "x":14.75, "y":3, "w":1.75},
+                {"label":"K3G (F6,D1)", "x":16.75, "y":3.25},
+                {"label":"K3H (F6,D0)", "x":18, "y":3},
+                {"label":"K40 (F5,B1)", "x":0, "y":4},
+                {"label":"K41 (F5,F0)", "x":1, "y":4},
+                {"label":"K42 (F5,F7)", "x":2.5, "y":4, "w":1.5},
+                {"label":"K43 (F5,F1)", "x":4, "y":4},
+                {"label":"K44 (F5,F4)", "x":5, "y":4, "w":1.5},
+                {"label":"K46 (F5,C6)", "x":6.5, "y":4, "w":2.25},
+                {"label":"K48 (F5,B5)", "x":8.75, "y":4, "w":2.75},
+                {"label":"K4B (F5,D6)", "x":11.5, "y":4, "w":1.5},
+                {"label":"K4C (F5,D4)", "x":13, "y":4},
+                {"label":"K4D (F5,D5)", "x":14, "y":4, "w":1.5},
+                {"label":"K4F (F5,D2)", "x":15.75, "y":4.25},
+                {"label":"K4G (F5,D1)", "x":16.75, "y":4.25},
+                {"label":"K4H (F5,D0)", "x":17.75, "y":4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/prototypist/j01/j01.c b/keyboards/prototypist/j01/j01.c
new file mode 100644
index 0000000000..4ebe2d351c
--- /dev/null
+++ b/keyboards/prototypist/j01/j01.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Shaun Mitchell (Flex)
+ *
+ * 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 "j01.h"
diff --git a/keyboards/prototypist/j01/j01.h b/keyboards/prototypist/j01/j01.h
new file mode 100644
index 0000000000..1edb9d7812
--- /dev/null
+++ b/keyboards/prototypist/j01/j01.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Shaun Mitchell (Flexerm)
+ *
+ * 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 ___ KC_NO
+
+#define LAYOUT_all( \
+    K00, K01,   K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,    K0H,   \
+    K10, K11,   K12,    K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,      K1H,   \
+    K20, K21,   K22,     K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F,     K2H,   \
+    K30, K31,   K32,  K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      K3G,   K3H,   \
+    K40, K41,   K42,    K43, K44,   K46,       K48,          K4B,    K4C, K4D,    K4F, K4G, K4H      \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   K0H   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   ___,   K1H   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   ___,   K2H   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   ___,   K3G,   K3H   }, \
+    { K40,   K41,   K42,   K43,   K44,   ___,   K46,   ___,   K48,   ___,   ___,   K4B,   K4C,   K4D,   ___,   K4F,   K4G,   K4H   }, \
+}
diff --git a/keyboards/prototypist/j01/keymaps/default/keymap.c b/keyboards/prototypist/j01/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f0601ffa85
--- /dev/null
+++ b/keyboards/prototypist/j01/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2020 Shaun Mitchell (Flexerm) 
+ * 
+ * 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] = {
+
+    // Default layer
+    [0] = LAYOUT_all(
+        KC_F1,   KC_F2,       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_BSPC,      KC_PSCR,
+        KC_F3,   KC_F4,       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_DEL,
+        KC_F5,   KC_F6,       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_NUHS, KC_ENT,         KC_PGUP,
+        KC_F7,   KC_F8,       KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,      KC_PGDN,
+        KC_F9,   KC_F10,      KC_LCTL,      KC_LGUI, KC_LALT,     KC_SPC,             KC_SPC,                  KC_RALT,      KC_RGUI, MO(1),         KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+
+    // Fn1 layer
+    [1] = LAYOUT_all(
+        BL_TOGG, BL_STEP,     KC_TILD, 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,
+        BL_DEC,  BL_INC,      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/prototypist/j01/keymaps/default/readme.md b/keyboards/prototypist/j01/keymaps/default/readme.md
new file mode 100644
index 0000000000..ef72054f19
--- /dev/null
+++ b/keyboards/prototypist/j01/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for the Proto[Typist] J-01 rev1 keyboard
diff --git a/keyboards/prototypist/j01/keymaps/via/keymap.c b/keyboards/prototypist/j01/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ed33d87b7d
--- /dev/null
+++ b/keyboards/prototypist/j01/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2020 Shaun Mitchell (Flexerm) 
+ * 
+ * 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] = {
+
+    // Default layer
+    [0] = LAYOUT_all(
+        KC_F1,   KC_F2,       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_BSPC,      KC_PSCR,
+        KC_F3,   KC_F4,       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_DEL,
+        KC_F5,   KC_F6,       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_NUHS, KC_ENT,         KC_PGUP,
+        KC_F7,   KC_F8,       KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,      KC_PGDN,
+        KC_F9,   KC_F10,      KC_LCTL,      KC_LGUI, KC_LALT,     KC_SPC,             KC_SPC,                  KC_RALT,      KC_RGUI, MO(1),         KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    // Fn1 layer
+    [1] = LAYOUT_all(
+        BL_TOGG, BL_STEP,     KC_TILD, 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,
+        BL_DEC,  BL_INC,      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
+    ),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		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, 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
+    ),
+
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		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, 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/prototypist/j01/keymaps/via/readme.md b/keyboards/prototypist/j01/keymaps/via/readme.md
new file mode 100644
index 0000000000..9783843b17
--- /dev/null
+++ b/keyboards/prototypist/j01/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default VIA keymap for the Proto[Typist] J-01 rev1 keyboard
diff --git a/keyboards/prototypist/j01/keymaps/via/rules.mk b/keyboards/prototypist/j01/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/prototypist/j01/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/prototypist/j01/readme.md b/keyboards/prototypist/j01/readme.md
new file mode 100644
index 0000000000..c55c444260
--- /dev/null
+++ b/keyboards/prototypist/j01/readme.md
@@ -0,0 +1,13 @@
+# Prototypist J-01
+
+The J-01 is a keyboard supporting and exploded 65% layout with 12 key left hand macro pad, PCB designed by Flex of FLX Keyboards, keyboard designed by Prototypist. 
+
+* Keyboard Maintainer: [Flexerm](https://github.com/Flexerm)
+* Hardware Supported: J-01 rev1 PCB
+* Hardware Availability: Public Groupbuy was held in October 2020.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make prototypist/j01: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/prototypist/j01/rules.mk b/keyboards/prototypist/j01/rules.mk
new file mode 100644
index 0000000000..3de5d7ea3a
--- /dev/null
+++ b/keyboards/prototypist/j01/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # 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 = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes