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

8 files changed, 262 insertions, 0 deletions

diff --git a/keyboards/evyd13/nt650/config.h b/keyboards/evyd13/nt650/config.h
new file mode 100644
index 0000000000..91cf8ceccb
--- /dev/null
+++ b/keyboards/evyd13/nt650/config.h
@@ -0,0 +1,22 @@
+// Copyright 2022 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define LED_PIN_ON_STATE 0
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/nt650/info.json b/keyboards/evyd13/nt650/info.json
new file mode 100644
index 0000000000..ca134daa2b
--- /dev/null
+++ b/keyboards/evyd13/nt650/info.json
@@ -0,0 +1,104 @@
+{
+    "manufacturer": "Evelien Dekkers",
+    "keyboard_name": "nt650",
+    "maintainer": "evyd13",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "E6",
+        "scroll_lock": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "C7", "C6", "B3", "B1", "B2", "B7", "D7", "B5", "B4", "D0", "B6", "D1"],
+        "rows": ["F7", "D6", "D4", "F1", "D5", "F0", "D3", "D2"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xD5DF",
+        "vid": "0x4705"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ansi_split_space"
+    },
+    "layouts": {
+        "LAYOUT_ansi_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
+                {"matrix": [1, 0], "label":"1", "x":1, "y":0},
+                {"matrix": [1, 1], "label":"2", "x":2, "y":0},
+                {"matrix": [1, 2], "label":"3", "x":3, "y":0},
+                {"matrix": [1, 3], "label":"4", "x":4, "y":0},
+                {"matrix": [2, 3], "label":"5", "x":5, "y":0},
+                {"matrix": [2, 4], "label":"6", "x":6, "y":0},
+                {"matrix": [1, 4], "label":"7", "x":7, "y":0},
+                {"matrix": [1, 5], "label":"8", "x":8, "y":0},
+                {"matrix": [1, 6], "label":"9", "x":9, "y":0},
+                {"matrix": [1, 7], "label":"0", "x":10, "y":0},
+                {"matrix": [2, 7], "label":"MINS", "x":11, "y":0},
+                {"matrix": [2, 5], "label":"EQL", "x":12, "y":0},
+                {"matrix": [3, 8], "label":"BSPC", "x":13, "y":0, "w":2},
+                {"matrix": [3, 0], "label":"TAB", "x":0, "y":1, "w":1.5},
+                {"matrix": [5, 0], "label":"Q", "x":1.5, "y":1},
+                {"matrix": [5, 1], "label":"W", "x":2.5, "y":1},
+                {"matrix": [5, 2], "label":"E", "x":3.5, "y":1},
+                {"matrix": [5, 3], "label":"R", "x":4.5, "y":1},
+                {"matrix": [3, 3], "label":"T", "x":5.5, "y":1},
+                {"matrix": [3, 4], "label":"Y", "x":6.5, "y":1},
+                {"matrix": [5, 4], "label":"U", "x":7.5, "y":1},
+                {"matrix": [5, 5], "label":"I", "x":8.5, "y":1},
+                {"matrix": [5, 6], "label":"O", "x":9.5, "y":1},
+                {"matrix": [5, 7], "label":"P", "x":10.5, "y":1},
+                {"matrix": [3, 7], "label":"LBRC", "x":11.5, "y":1},
+                {"matrix": [3, 5], "label":"RBRC", "x":12.5, "y":1},
+                {"matrix": [4, 8], "label":"BSLS", "x":13.5, "y":1, "w":1.5},
+                {"matrix": [3, 1], "label":"CAPS", "x":0, "y":2, "w":1.75},
+                {"matrix": [4, 0], "label":"A", "x":1.75, "y":2},
+                {"matrix": [4, 1], "label":"S", "x":2.75, "y":2},
+                {"matrix": [4, 2], "label":"D", "x":3.75, "y":2},
+                {"matrix": [4, 3], "label":"F", "x":4.75, "y":2},
+                {"matrix": [0, 3], "label":"G", "x":5.75, "y":2},
+                {"matrix": [0, 4], "label":"H", "x":6.75, "y":2},
+                {"matrix": [4, 4], "label":"J", "x":7.75, "y":2},
+                {"matrix": [4, 5], "label":"K", "x":8.75, "y":2},
+                {"matrix": [4, 6], "label":"L", "x":9.75, "y":2},
+                {"matrix": [4, 7], "label":"SCLN", "x":10.75, "y":2},
+                {"matrix": [0, 7], "label":"QUOT", "x":11.75, "y":2},
+                {"matrix": [6, 8], "label":"ENT", "x":12.75, "y":2, "w":2.25},
+                {"matrix": [3, 10], "label":"LSFT", "x":0, "y":3, "w":2.25},
+                {"matrix": [6, 0], "label":"Z", "x":2.25, "y":3},
+                {"matrix": [6, 1], "label":"X", "x":3.25, "y":3},
+                {"matrix": [6, 2], "label":"C", "x":4.25, "y":3},
+                {"matrix": [6, 3], "label":"V", "x":5.25, "y":3},
+                {"matrix": [7, 3], "label":"B", "x":6.25, "y":3},
+                {"matrix": [7, 4], "label":"N", "x":7.25, "y":3},
+                {"matrix": [6, 4], "label":"M", "x":8.25, "y":3},
+                {"matrix": [6, 5], "label":"COMM", "x":9.25, "y":3},
+                {"matrix": [6, 6], "label":"DOT", "x":10.25, "y":3},
+                {"matrix": [7, 7], "label":"SLSH", "x":11.25, "y":3},
+                {"matrix": [4, 10], "label":"RSFT", "x":12.25, "y":3, "w":1.75},
+                {"matrix": [3, 9], "label":"APP", "x":14, "y":3},
+                {"matrix": [2, 11], "label":"LCTL", "x":0, "y":4, "w":1.25},
+                {"matrix": [3, 11], "label":"LGUI", "x":1.25, "y":4},
+                {"matrix": [0, 9], "label":"LALT", "x":2.25, "y":4, "w":1.25},
+                {"matrix": [0, 13], "label":"SPC", "x":3.5, "y":4, "w":3},
+                {"matrix": [6, 9], "label":"SPC", "x":6.5, "y":4, "w":3},
+                {"matrix": [7, 9], "label":"RALT", "x":9.5, "y":4, "w":1.25},
+                {"matrix": [6, 11], "label":"RCTL", "x":10.75, "y":4},
+                {"matrix": [0, 12], "label":"UP", "x":13, "y":4},
+                {"matrix": [7, 12], "label":"LEFT", "x":12, "y":5},
+                {"matrix": [7, 13], "label":"DOWN", "x":13, "y":5},
+                {"matrix": [7, 14], "label":"RGHT", "x":14, "y":5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/evyd13/nt650/keymaps/default/keymap.c b/keyboards/evyd13/nt650/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a3e6de5a5e
--- /dev/null
+++ b/keyboards/evyd13/nt650/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+// Copyright 2022 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability.
+// The underscores don't mean anything - you can
+// have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same
+// length, and you can also skip them entirely
+// and just use numbers.
+enum layer_names {
+    _BASE,
+    _FUNC,
+    _LOCK,
+    _XTRA
+};
+
+#define LOCK_LED_PIN B0
+#define GRV_TG TG(_LOCK)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] = LAYOUT_ansi_split_space(
+        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FUNC),
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT, KC_RCTL,          KC_UP,
+                                                                                                           KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FUNC] = LAYOUT_ansi_split_space(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        _______, GRV_TG,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, _______,
+        _______, _______, _______,          _______,                   _______,          _______, KC_APP,           _______,
+                                                                                                           _______, _______, _______
+    ),
+    [_LOCK] = LAYOUT_ansi_split_space(
+        KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,                   _______,          _______, _______,          _______,
+                                                                                                           _______, _______, _______
+    ),
+    [_XTRA] = LAYOUT_ansi_split_space(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,                   _______,          _______, _______,          _______,
+                                                                                                           _______, _______, _______
+    )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    setPinOutput(LOCK_LED_PIN);
+    switch (get_highest_layer(state)) {
+        case _LOCK:
+            writePin(LOCK_LED_PIN, 0);
+            break;
+        default: //  for any other layers, or the default layer
+            writePin(LOCK_LED_PIN, 1);
+            break;
+    }
+    return state;
+}
diff --git a/keyboards/evyd13/nt650/keymaps/via/config.h b/keyboards/evyd13/nt650/keymaps/via/config.h
new file mode 100644
index 0000000000..fe36d02575
--- /dev/null
+++ b/keyboards/evyd13/nt650/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
\ No newline at end of file
diff --git a/keyboards/evyd13/nt650/keymaps/via/keymap.c b/keyboards/evyd13/nt650/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2d835522a7
--- /dev/null
+++ b/keyboards/evyd13/nt650/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2022 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ansi_split_space(
+        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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT, KC_RCTL,          KC_UP,
+                                                                                                           KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi_split_space(
+        KC_GRV,  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_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, _______,
+        _______, _______, _______,          _______,                   _______,          _______, KC_APP,           _______,
+                                                                                                           _______, _______, _______
+    ),
+    [2] = LAYOUT_ansi_split_space(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,                   _______,          _______, _______,          _______,
+                                                                                                           _______, _______, _______
+    )
+};
diff --git a/keyboards/evyd13/nt650/keymaps/via/rules.mk b/keyboards/evyd13/nt650/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/evyd13/nt650/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/evyd13/nt650/readme.md b/keyboards/evyd13/nt650/readme.md
new file mode 100644
index 0000000000..b4684a94b6
--- /dev/null
+++ b/keyboards/evyd13/nt650/readme.md
@@ -0,0 +1,27 @@
+# nt650
+
+![nt650](https://i.imgur.com/z0Xi6qoh.png)
+
+A replacement controller PCB for the Leopold FC650M.
+
+* Keyboard Maintainer: [Evelien Dekkers](https://github.com/evyd13)
+* Hardware Supported: nt-650 PCB
+* Hardware Availability: [Open source on GitHub](https://github.com/evyd13/nt-series/tree/main/nt-650)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/nt650:default
+
+Flashing example for this keyboard:
+
+    make evyd13/nt650:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/evyd13/nt650/rules.mk b/keyboards/evyd13/nt650/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/evyd13/nt650/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank