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

7 files changed, 298 insertions, 0 deletions

diff --git a/keyboards/neson_design/nico/info.json b/keyboards/neson_design/nico/info.json
new file mode 100644
index 0000000000..f21b644f56
--- /dev/null
+++ b/keyboards/neson_design/nico/info.json
@@ -0,0 +1,121 @@
+{
+    "manufacturer": "Neson Design",
+    "keyboard_name": "Nico",
+    "maintainer": "yulei",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "indicators": {
+        "caps_lock": "E2"
+    },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7", "B3", "B2", "B1", "F6", "F7"],
+        "rows": ["F0", "E6", "F5", "F4", "F1"]
+    },
+    "processor": "atmega32u4",
+    "ws2812": {
+        "pin": "B0"
+    },
+    "rgblight": {
+        "led_count": 5
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "no_startup_check": true,
+        "pid": "0x6E65",
+        "vid": "0x4E65"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K017", "matrix": [0, 15], "x": 0, "y": 0 },
+                { "label": "K018", "matrix": [0, 16], "x": 1, "y": 0 },
+                { "label": "K00", "matrix": [0, 0], "x": 2.5, "y": 0 },
+                { "label": "K01", "matrix": [0, 1], "x": 3.5, "y": 0 },
+                { "label": "K02", "matrix": [0, 2], "x": 4.5, "y": 0 },
+                { "label": "K03", "matrix": [0, 3], "x": 5.5, "y": 0 },
+                { "label": "K04", "matrix": [0, 4], "x": 6.5, "y": 0 },
+                { "label": "K05", "matrix": [0, 5], "x": 7.5, "y": 0 },
+                { "label": "K06", "matrix": [0, 6], "x": 8.5, "y": 0 },
+                { "label": "K07", "matrix": [0, 7], "x": 9.5, "y": 0 },
+                { "label": "K08", "matrix": [0, 8], "x": 10.5, "y": 0 },
+                { "label": "K09", "matrix": [0, 9], "x": 11.5, "y": 0 },
+                { "label": "K0A", "matrix": [0, 10], "x": 12.5, "y": 0 },
+                { "label": "K0B", "matrix": [0, 11], "x": 13.5, "y": 0 },
+                { "label": "K0C", "matrix": [0, 12], "x": 14.5, "y": 0 },
+                { "label": "K0D", "matrix": [0, 13], "x": 15.5, "y": 0 },
+                { "label": "K0E", "matrix": [0, 14], "x": 16.5, "y": 0 },
+                { "label": "K4E", "matrix": [4, 14], "x": 17.5, "y": 0 },
+                { "label": "K116", "matrix": [1, 15], "x": 0, "y": 1 },
+                { "label": "K117", "matrix": [1, 16], "x": 1, "y": 1 },
+                { "label": "K10", "matrix": [1, 0], "w": 1.5, "x": 2.5, "y": 1 },
+                { "label": "K11", "matrix": [1, 1], "x": 4, "y": 1 },
+                { "label": "K12", "matrix": [1, 2], "x": 5, "y": 1 },
+                { "label": "K13", "matrix": [1, 3], "x": 6, "y": 1 },
+                { "label": "K14", "matrix": [1, 4], "x": 7, "y": 1 },
+                { "label": "K15", "matrix": [1, 5], "x": 8, "y": 1 },
+                { "label": "K16", "matrix": [1, 6], "x": 9, "y": 1 },
+                { "label": "K17", "matrix": [1, 7], "x": 10, "y": 1 },
+                { "label": "K18", "matrix": [1, 8], "x": 11, "y": 1 },
+                { "label": "K19", "matrix": [1, 9], "x": 12, "y": 1 },
+                { "label": "K1A", "matrix": [1, 10], "x": 13, "y": 1 },
+                { "label": "K1B", "matrix": [1, 11], "x": 14, "y": 1 },
+                { "label": "K1C", "matrix": [1, 12], "x": 15, "y": 1 },
+                { "label": "K1D", "matrix": [1, 13], "w": 1.5, "x": 16, "y": 1 },
+                { "label": "K1E", "matrix": [1, 14], "x": 17.5, "y": 1 },
+                { "label": "K216", "matrix": [2, 15], "x": 0, "y": 2 },
+                { "label": "K217", "matrix": [2, 16], "x": 1, "y": 2 },
+                { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 2.5, "y": 2 },
+                { "label": "K21", "matrix": [2, 1], "x": 4.25, "y": 2 },
+                { "label": "K22", "matrix": [2, 2], "x": 5.25, "y": 2 },
+                { "label": "K23", "matrix": [2, 3], "x": 6.25, "y": 2 },
+                { "label": "K24", "matrix": [2, 4], "x": 7.25, "y": 2 },
+                { "label": "K25", "matrix": [2, 5], "x": 8.25, "y": 2 },
+                { "label": "K26", "matrix": [2, 6], "x": 9.25, "y": 2 },
+                { "label": "K27", "matrix": [2, 7], "x": 10.25, "y": 2 },
+                { "label": "K28", "matrix": [2, 8], "x": 11.25, "y": 2 },
+                { "label": "K29", "matrix": [2, 9], "x": 12.25, "y": 2 },
+                { "label": "K2A", "matrix": [2, 10], "x": 13.25, "y": 2 },
+                { "label": "K2B", "matrix": [2, 11], "x": 14.25, "y": 2 },
+                { "label": "K2D", "matrix": [2, 13], "w": 2.25, "x": 15.25, "y": 2 },
+                { "label": "K2E", "matrix": [2, 14], "x": 17.5, "y": 2 },
+                { "label": "K316", "matrix": [3, 15], "x": 0, "y": 3 },
+                { "label": "K317", "matrix": [3, 16], "x": 1, "y": 3 },
+                { "label": "K30", "matrix": [3, 0], "w": 2.25, "x": 2.5, "y": 3 },
+                { "label": "K32", "matrix": [3, 2], "x": 4.75, "y": 3 },
+                { "label": "K33", "matrix": [3, 3], "x": 5.75, "y": 3 },
+                { "label": "K34", "matrix": [3, 4], "x": 6.75, "y": 3 },
+                { "label": "K35", "matrix": [3, 5], "x": 7.75, "y": 3 },
+                { "label": "K36", "matrix": [3, 6], "x": 8.75, "y": 3 },
+                { "label": "K37", "matrix": [3, 7], "x": 9.75, "y": 3 },
+                { "label": "K38", "matrix": [3, 8], "x": 10.75, "y": 3 },
+                { "label": "K39", "matrix": [3, 9], "x": 11.75, "y": 3 },
+                { "label": "K3A", "matrix": [3, 10], "x": 12.75, "y": 3 },
+                { "label": "K3B", "matrix": [3, 11], "x": 13.75, "y": 3 },
+                { "label": "K3C", "matrix": [3, 12], "w": 1.75, "x": 14.75, "y": 3 },
+                { "label": "K3D", "matrix": [3, 13], "x": 16.5, "y": 3 },
+                { "label": "K3E", "matrix": [3, 14], "x": 17.5, "y": 3 },
+                { "label": "K416", "matrix": [4, 15], "x": 0, "y": 4 },
+                { "label": "K417", "matrix": [4, 16], "x": 1, "y": 4 },
+                { "label": "K40", "matrix": [4, 0], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K41", "matrix": [4, 1], "w": 1.25, "x": 3.75, "y": 4 },
+                { "label": "K42", "matrix": [4, 2], "w": 1.25, "x": 5, "y": 4 },
+                { "label": "K48", "matrix": [4, 8], "w": 6.25, "x": 6.25, "y": 4 },
+                { "label": "K49", "matrix": [4, 9], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "K4A", "matrix": [4, 10], "w": 1.25, "x": 13.75, "y": 4 },
+                { "label": "K4B", "matrix": [4, 11], "x": 15.5, "y": 4 },
+                { "label": "K4C", "matrix": [4, 12], "x": 16.5, "y": 4 },
+                { "label": "K4D", "matrix": [4, 13], "x": 17.5, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/neson_design/nico/keymaps/default/keymap.c b/keyboards/neson_design/nico/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d481379e21
--- /dev/null
+++ b/keyboards/neson_design/nico/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/**
+    Copyright 2023 astro 
+
+    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(
+      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_DEL, 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_HOME,
+      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_END,
+      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,   MO(1),
+      KC_F9,KC_F10,     KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,                KC_LEFT,KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT(
+      _______, _______, _______,  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,_______,
+      _______, _______, QK_BOOT,          RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,
+      _______, _______, _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,        _______,_______,
+      _______, _______, _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,
+      _______, _______, _______,_______,_______,                        _______,                        _______,_______,        _______,_______,_______),
+};
diff --git a/keyboards/neson_design/nico/keymaps/via/keymap.c b/keyboards/neson_design/nico/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9de688505e
--- /dev/null
+++ b/keyboards/neson_design/nico/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/**
+    Copyright 2023 astro 
+
+    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(
+      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_DEL, 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_HOME,
+      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_END,
+      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,   MO(1),
+      KC_F9,KC_F10,     KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,                KC_LEFT,KC_DOWN, KC_RIGHT),
+
+    [1] = LAYOUT(
+      _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+      _______, _______, QK_BOOT,        RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+      _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
+      _______, _______, _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,
+      _______, _______, _______,_______,_______,                        _______,                        _______,_______,        _______,_______,_______)
+};
diff --git a/keyboards/neson_design/nico/keymaps/via/rules.mk b/keyboards/neson_design/nico/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/neson_design/nico/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/neson_design/nico/nico.c b/keyboards/neson_design/nico/nico.c
new file mode 100644
index 0000000000..63f08b8639
--- /dev/null
+++ b/keyboards/neson_design/nico/nico.c
@@ -0,0 +1,85 @@
+/**
+ * @file nico.c
+ *
+    Copyright 2023 astro
+
+    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 "quantum.h"
+#ifdef RGBLIGHT_ENABLE
+
+static bool alert = false;
+static bool backup = false;
+static LED_TYPE caps_led;
+static uint16_t last_ticks = 0;
+
+#define ALERT_INTERVAL      500
+#define ALERM_LED_R     0xFF
+#define ALERM_LED_G     0xA5
+#define ALERM_LED_B     0x00
+//golden 0xFF, 0xD9, 0x00
+
+void housekeeping_task_kb(void)
+{
+    if (host_keyboard_led_state().caps_lock) {
+        if (!backup) {
+            caps_led.r = led[4].r;
+            caps_led.g = led[4].g;
+            caps_led.b = led[4].b;
+            backup = true;
+        }
+        if(alert) {
+            led[4].r = ALERM_LED_G;
+            led[4].g = ALERM_LED_R;
+            led[4].b = ALERM_LED_B;
+        } else {
+            led[4].r = 0;
+            led[4].g = 0;
+            led[4].b = 0;
+        }
+        if (timer_elapsed(last_ticks) > ALERT_INTERVAL) {
+            alert = !alert;
+            last_ticks = timer_read();
+        }
+        ws2812_setleds(led, RGBLED_NUM);
+    } else {
+        if (backup) {
+            led[4].r = caps_led.r;
+            led[4].g = caps_led.g;
+            led[4].b = caps_led.b;
+            backup = false;
+            ws2812_setleds(led, RGBLED_NUM);
+        }
+    }
+    housekeeping_task_user();
+}
+
+void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
+{
+    start_led[2].r = start_led[0].r;
+    start_led[2].g = start_led[0].g;
+    start_led[2].b = start_led[0].b;
+
+    start_led[3].r = start_led[1].r;
+    start_led[3].g = start_led[1].g;
+    start_led[3].b = start_led[1].b;
+
+    uint8_t tmp = start_led[4].g;
+    start_led[4].g = start_led[4].r;
+    start_led[4].r = tmp;
+    ws2812_setleds(start_led, RGBLED_NUM);
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/neson_design/nico/readme.md b/keyboards/neson_design/nico/readme.md
new file mode 100644
index 0000000000..9b821c16d0
--- /dev/null
+++ b/keyboards/neson_design/nico/readme.md
@@ -0,0 +1,21 @@
+# Neson Design (formerly iNETT Studio) Nico
+
+A 65% keyboard with F area from the Neson Design's N series.
+
+* Keyboard Maintainer: [astro](https://github.com/yulei)  
+* Hardware Supported: Nico keyboard
+* Hardware Availability: Limited gb
+
+Make example for this keyboard (after setting up your build environment):
+
+    make neson_design/nico: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).
+
+## 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 *RST* button on the back of the PCB.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
\ No newline at end of file
diff --git a/keyboards/neson_design/nico/rules.mk b/keyboards/neson_design/nico/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/neson_design/nico/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank