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

9 files changed, 429 insertions, 0 deletions

diff --git a/keyboards/novelkeys/nk_plus/config.h b/keyboards/novelkeys/nk_plus/config.h
new file mode 100644
index 0000000000..2d3322bab2
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/config.h
@@ -0,0 +1,80 @@
+/*
+Copyright 2022 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
+
+/* RGB options */
+
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 1
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_DMA_CHANNEL 3
+
+#define RGB_MATRIX_LED_COUNT 76
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/novelkeys/nk_plus/halconf.h b/keyboards/novelkeys/nk_plus/halconf.h
new file mode 100644
index 0000000000..ce14bc0c41
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 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
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/info.json
new file mode 100755
index 0000000000..29230e3f16
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/info.json
@@ -0,0 +1,196 @@
+{
+    "keyboard_name": "NK+",
+    "manufacturer": "Yiancar-Designs",
+    "url": "www.yiancar-designs.com",
+    "maintainer": "Yiancar",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E51",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["A2", "A1", "A0", "A3", "A4", "A5", "A6", "A7", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14"],
+        "rows": ["B2", "B1", "B0", "B10", "B3"]
+    },
+    "features": {
+        "backlight": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true,
+        "rgblight": false
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "layout": [
+            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
+            { "flags": 1, "matrix": [0, 1], "x": 13, "y": 0 },
+            { "flags": 1, "matrix": [0, 2], "x": 32, "y": 0 },
+            { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0 },
+            { "flags": 4, "matrix": [0, 4], "x": 58, "y": 0 },
+            { "flags": 4, "matrix": [0, 5], "x": 70, "y": 0 },
+            { "flags": 4, "matrix": [0, 6], "x": 83, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 96, "y": 0 },
+            { "flags": 4, "matrix": [0, 8], "x": 109, "y": 0 },
+            { "flags": 4, "matrix": [0, 9], "x": 122, "y": 0 },
+            { "flags": 4, "matrix": [0, 10], "x": 134, "y": 0 },
+            { "flags": 4, "matrix": [0, 11], "x": 147, "y": 0 },
+            { "flags": 4, "matrix": [0, 12], "x": 160, "y": 0 },
+            { "flags": 4, "matrix": [0, 13], "x": 173, "y": 0 },
+            { "flags": 4, "matrix": [0, 14], "x": 186, "y": 0 },
+            { "flags": 1, "matrix": [0, 15], "x": 205, "y": 0 },
+            { "flags": 1, "matrix": [0, 16], "x": 224, "y": 0 },
+            { "flags": 1, "matrix": [1, 16], "x": 224, "y": 16 },
+            { "flags": 4, "matrix": [1, 15], "x": 208, "y": 16 },
+            { "flags": 4, "matrix": [1, 14], "x": 192, "y": 16 },
+            { "flags": 4, "matrix": [1, 13], "x": 179, "y": 16 },
+            { "flags": 4, "matrix": [1, 12], "x": 166, "y": 16 },
+            { "flags": 4, "matrix": [1, 11], "x": 154, "y": 16 },
+            { "flags": 4, "matrix": [1, 10], "x": 141, "y": 16 },
+            { "flags": 4, "matrix": [1, 9], "x": 128, "y": 16 },
+            { "flags": 4, "matrix": [1, 8], "x": 115, "y": 16 },
+            { "flags": 4, "matrix": [1, 7], "x": 102, "y": 16 },
+            { "flags": 4, "matrix": [1, 6], "x": 90, "y": 16 },
+            { "flags": 4, "matrix": [1, 5], "x": 77, "y": 16 },
+            { "flags": 4, "matrix": [1, 4], "x": 64, "y": 16 },
+            { "flags": 4, "matrix": [1, 3], "x": 51, "y": 16 },
+            { "flags": 1, "matrix": [1, 2], "x": 35, "y": 16 },
+            { "flags": 1, "matrix": [1, 1], "x": 13, "y": 16 },
+            { "flags": 1, "matrix": [1, 0], "x": 0, "y": 16 },
+            { "flags": 1, "matrix": [2, 0], "x": 0, "y": 32 },
+            { "flags": 1, "matrix": [2, 1], "x": 13, "y": 32 },
+            { "flags": 1, "matrix": [2, 2], "x": 37, "y": 32 },
+            { "flags": 4, "matrix": [2, 3], "x": 54, "y": 32 },
+            { "flags": 4, "matrix": [2, 4], "x": 67, "y": 32 },
+            { "flags": 4, "matrix": [2, 5], "x": 80, "y": 32 },
+            { "flags": 4, "matrix": [2, 6], "x": 93, "y": 32 },
+            { "flags": 4, "matrix": [2, 7], "x": 106, "y": 32 },
+            { "flags": 4, "matrix": [2, 8], "x": 118, "y": 32 },
+            { "flags": 4, "matrix": [2, 9], "x": 131, "y": 32 },
+            { "flags": 4, "matrix": [2, 10], "x": 144, "y": 32 },
+            { "flags": 4, "matrix": [2, 11], "x": 157, "y": 32 },
+            { "flags": 4, "matrix": [2, 12], "x": 170, "y": 32 },
+            { "flags": 4, "matrix": [2, 13], "x": 182, "y": 32 },
+            { "flags": 1, "matrix": [2, 15], "x": 203, "y": 32 },
+            { "flags": 1, "matrix": [2, 16], "x": 224, "y": 32 },
+            { "flags": 1, "matrix": [3, 16], "x": 224, "y": 48 },
+            { "flags": 1, "matrix": [3, 15], "x": 211, "y": 48 },
+            { "flags": 1, "matrix": [3, 14], "x": 194, "y": 48 },
+            { "flags": 4, "matrix": [3, 13], "x": 176, "y": 48 },
+            { "flags": 4, "matrix": [3, 12], "x": 163, "y": 48 },
+            { "flags": 4, "matrix": [3, 11], "x": 150, "y": 48 },
+            { "flags": 4, "matrix": [3, 10], "x": 138, "y": 48 },
+            { "flags": 4, "matrix": [3, 9], "x": 125, "y": 48 },
+            { "flags": 4, "matrix": [3, 8], "x": 112, "y": 48 },
+            { "flags": 4, "matrix": [3, 7], "x": 99, "y": 48 },
+            { "flags": 4, "matrix": [3, 6], "x": 86, "y": 48 },
+            { "flags": 4, "matrix": [3, 5], "x": 74, "y": 48 },
+            { "flags": 4, "matrix": [3, 4], "x": 61, "y": 48 },
+            { "flags": 1, "matrix": [3, 2], "x": 40, "y": 48 },
+            { "flags": 1, "matrix": [3, 1], "x": 13, "y": 48 },
+            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 48 },
+            { "flags": 1, "matrix": [4, 0], "x": 0, "y": 64 },
+            { "flags": 1, "matrix": [4, 1], "x": 13, "y": 64 },
+            { "flags": 1, "matrix": [4, 2], "x": 35, "y": 64 },
+            { "flags": 1, "matrix": [4, 3], "x": 51, "y": 64 },
+            { "flags": 1, "matrix": [4, 4], "x": 67, "y": 64 },
+            { "flags": 4, "matrix": [4, 8], "x": 122, "y": 64 },
+            { "flags": 1, "matrix": [4, 13], "x": 176, "y": 64 },
+            { "flags": 1, "matrix": [4, 14], "x": 198, "y": 64 },
+            { "flags": 1, "matrix": [4, 15], "x": 211, "y": 64 },
+            { "flags": 1, "matrix": [4, 16], "x": 224, "y": 64 }
+        ],
+        "max_brightness": 120
+    },
+    "rgblight": {
+        "pin": "B4"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2.5, "y": 0 },
+                { "matrix": [0, 3], "x": 3.5, "y": 0 },
+                { "matrix": [0, 4], "x": 4.5, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.5, "y": 0 },
+                { "matrix": [0, 10], "x": 10.5, "y": 0 },
+                { "matrix": [0, 11], "x": 11.5, "y": 0 },
+                { "matrix": [0, 12], "x": 12.5, "y": 0 },
+                { "matrix": [0, 13], "x": 13.5, "y": 0 },
+                { "matrix": [0, 14], "x": 14.5, "y": 0 },
+                { "matrix": [0, 15], "x": 15.5, "y": 0 },
+                { "matrix": [0, 16], "x": 17.5, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 4, "y": 1 },
+                { "matrix": [1, 4], "x": 5, "y": 1 },
+                { "matrix": [1, 5], "x": 6, "y": 1 },
+                { "matrix": [1, 6], "x": 7, "y": 1 },
+                { "matrix": [1, 7], "x": 8, "y": 1 },
+                { "matrix": [1, 8], "x": 9, "y": 1 },
+                { "matrix": [1, 9], "x": 10, "y": 1 },
+                { "matrix": [1, 10], "x": 11, "y": 1 },
+                { "matrix": [1, 11], "x": 12, "y": 1 },
+                { "matrix": [1, 12], "x": 13, "y": 1 },
+                { "matrix": [1, 13], "x": 14, "y": 1 },
+                { "matrix": [1, 14], "x": 15, "y": 1 },
+                { "matrix": [1, 15], "x": 16, "y": 1 },
+                { "matrix": [1, 16], "x": 17.5, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2.5, "y": 2 },
+                { "matrix": [2, 3], "x": 4.25, "y": 2 },
+                { "matrix": [2, 4], "x": 5.25, "y": 2 },
+                { "matrix": [2, 5], "x": 6.25, "y": 2 },
+                { "matrix": [2, 6], "x": 7.25, "y": 2 },
+                { "matrix": [2, 7], "x": 8.25, "y": 2 },
+                { "matrix": [2, 8], "x": 9.25, "y": 2 },
+                { "matrix": [2, 9], "x": 10.25, "y": 2 },
+                { "matrix": [2, 10], "x": 11.25, "y": 2 },
+                { "matrix": [2, 11], "x": 12.25, "y": 2 },
+                { "matrix": [2, 12], "x": 13.25, "y": 2 },
+                { "matrix": [2, 13], "x": 14.25, "y": 2 },
+                { "matrix": [2, 15], "x": 15.25, "y": 2 },
+                { "matrix": [2, 16], "x": 17.5, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2.5, "y": 3 },
+                { "matrix": [3, 4], "x": 4.75, "y": 3 },
+                { "matrix": [3, 5], "x": 5.75, "y": 3 },
+                { "matrix": [3, 6], "x": 6.75, "y": 3 },
+                { "matrix": [3, 7], "x": 7.75, "y": 3 },
+                { "matrix": [3, 8], "x": 8.75, "y": 3 },
+                { "matrix": [3, 9], "x": 9.75, "y": 3 },
+                { "matrix": [3, 10], "x": 10.75, "y": 3 },
+                { "matrix": [3, 11], "x": 11.75, "y": 3 },
+                { "matrix": [3, 12], "x": 12.75, "y": 3 },
+                { "matrix": [3, 13], "x": 13.75, "y": 3 },
+                { "matrix": [3, 14], "x": 14.75, "y": 3 },
+                { "matrix": [3, 15], "x": 16.5, "y": 3 },
+                { "matrix": [3, 16], "x": 17.5, "y": 3 },
+                { "matrix": [4, 0], "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1, "y": 4 },
+                { "matrix": [4, 2], "x": 2.5, "y": 4 },
+                { "matrix": [4, 3], "x": 4, "y": 4 },
+                { "matrix": [4, 4], "x": 5, "y": 4 },
+                { "matrix": [4, 8], "x": 6.5, "y": 4 },
+                { "matrix": [4, 13], "x": 13.5, "y": 4 },
+                { "matrix": [4, 14], "x": 15.5, "y": 4 },
+                { "matrix": [4, 15], "x": 16.5, "y": 4 },
+                { "matrix": [4, 16], "x": 17.5, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/novelkeys/nk_plus/keymaps/default/keymap.c b/keyboards/novelkeys/nk_plus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b5697a731d
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2022 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT( /* Base */
+    KC_F1, KC_F2,  QK_GESC, 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_HOME,
+    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_PGUP,
+    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_ENT,  KC_PGDN,
+    KC_F7, KC_F8,  KC_LSFT, 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_END,
+    KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                   MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT( /* FN */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/novelkeys/nk_plus/keymaps/via/keymap.c b/keyboards/novelkeys/nk_plus/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9e877b9804
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT( /* Base */
+    KC_F1, KC_F2,  QK_GESC, 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_HOME,
+    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_PGUP,
+    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_ENT,  KC_PGDN,
+    KC_F7, KC_F8,  KC_LSFT, 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_END,
+    KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                   MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT( /* FN */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+
+};
diff --git a/keyboards/novelkeys/nk_plus/keymaps/via/rules.mk b/keyboards/novelkeys/nk_plus/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/novelkeys/nk_plus/mcuconf.h b/keyboards/novelkeys/nk_plus/mcuconf.h
new file mode 100644
index 0000000000..7cf6a48904
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 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
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
diff --git a/keyboards/novelkeys/nk_plus/readme.md b/keyboards/novelkeys/nk_plus/readme.md
new file mode 100644
index 0000000000..e436728959
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/readme.md
@@ -0,0 +1,32 @@
+# NK+
+
+This is a 65% with macro keys PCB. It supports VIA and full per-key RGB.
+
+* Keyboard Maintainer: [Yiancar](https://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 65% with macro keys keyboard with STM32F072CB or APM compatible
+* Hardware Availability: https://novelkeys.com/
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make novelkeys/nk_plus: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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or dfu-util (`make novelkeys/nk_plus:<keymap>:dfu-util`)
diff --git a/keyboards/novelkeys/nk_plus/rules.mk b/keyboards/novelkeys/nk_plus/rules.mk
new file mode 100644
index 0000000000..a68122281a
--- /dev/null
+++ b/keyboards/novelkeys/nk_plus/rules.mk
@@ -0,0 +1,12 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Build Options
+#   change yes to no to disable
+#
+WS2812_DRIVER = pwm         # Per-key RGB MCU Driver