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

4 files changed, 65 insertions, 1 deletions

diff --git a/keyboards/nk65/readme.md b/keyboards/nk65/readme.md
index 5e7453a27d..3bd04210d1 100755
--- a/keyboards/nk65/readme.md
+++ b/keyboards/nk65/readme.md
@@ -11,13 +11,15 @@ Hardware Availability: https://novelkeys.xyz/
 
 Due to the RGB implementation, the NK65 is currently not compatible with community layouts.
 
+NOTE: For PCBs with revision v1.4 or later please use nk65/v1_4 in the make command.
+
 ## Instructions
 
 ### Build
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nk65:default_via
+    make nk65:via
 
 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/nk65/v1_4/config.h b/keyboards/nk65/v1_4/config.h
new file mode 100755
index 0000000000..88629e5c99
--- /dev/null
+++ b/keyboards/nk65/v1_4/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2021 Yiancar
+
+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
+
+#undef MATRIX_COL_PINS
+#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, B1, B0, A7, A0, A1, A2, A3, A5 }
+// To enable debugger set A13 A14 -> A5 A7
diff --git a/keyboards/nk65/v1_4/readme.md b/keyboards/nk65/v1_4/readme.md
new file mode 100755
index 0000000000..399919a8be
--- /dev/null
+++ b/keyboards/nk65/v1_4/readme.md
@@ -0,0 +1,39 @@
+NK65 V1.4
+=========
+
+![NK65](https://i.imgur.com/EXNbVpL.jpg)
+
+NOTE: Please use this directory only if you have revision 1.4 PCB or later.
+
+This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB.
+
+Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)   
+Hardware Supported: A 65% keyboard with STM32F303CC   
+Hardware Availability: https://novelkeys.xyz/   
+
+Due to the RGB implementation, the NK65 is currently not compatible with community layouts.
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nk65/v1_4:via
+
+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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or dfu-util (`make nk65/v1_4:<keymap>:dfu-util`)
diff --git a/keyboards/nk65/v1_4/rules.mk b/keyboards/nk65/v1_4/rules.mk
new file mode 100755
index 0000000000..8b13789179
--- /dev/null
+++ b/keyboards/nk65/v1_4/rules.mk
@@ -0,0 +1 @@
+