From dec6a26cdf38f8300615e4821bc790aadb0952ab Mon Sep 17 00:00:00 2001 From: GG Date: Tue, 20 Jun 2023 00:36:40 +0800 Subject: [PATCH 01/16] nemui65 --- keyboards/wuque/nemui65/info.json | 131 ++++++++++++++++++ .../wuque/nemui65/keymaps/default/keymap.c | 36 +++++ keyboards/wuque/nemui65/keymaps/via/keymap.c | 36 +++++ keyboards/wuque/nemui65/keymaps/via/rules.mk | 2 + keyboards/wuque/nemui65/readme.md | 27 ++++ keyboards/wuque/nemui65/rules.mk | 1 + 6 files changed, 233 insertions(+) create mode 100644 keyboards/wuque/nemui65/info.json create mode 100644 keyboards/wuque/nemui65/keymaps/default/keymap.c create mode 100644 keyboards/wuque/nemui65/keymaps/via/keymap.c create mode 100644 keyboards/wuque/nemui65/keymaps/via/rules.mk create mode 100644 keyboards/wuque/nemui65/readme.md create mode 100644 keyboards/wuque/nemui65/rules.mk diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json new file mode 100644 index 000000000000..8ce2905e3316 --- /dev/null +++ b/keyboards/wuque/nemui65/info.json @@ -0,0 +1,131 @@ +{ + "keyboard_name": "nemui65", + "manufacturer": "wuque", + "maintainer": "spbgzh", + "usb": { + "vid": "0x806E", + "pid": "0x0007", + "device_version": "0.0.1" + }, + "encoder": { + "rotary": [ + {"pin_a": "B0", "pin_b": "B1", "resolution": 2} + ] +}, + "indicators": { + "caps_lock": "F6", + "on_state": 0 + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "encoder": true + }, + "matrix_pins": { + "rows": ["F4", "F1", "F0", "C6", "B6", "F5"], + "cols": ["C7", "D5", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "F7"] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0}, + {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0}, + {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0}, + {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0}, + {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0}, + {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0}, + {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0}, + {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0}, + {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0}, + {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0}, + {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0}, + {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0}, + {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0}, + {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0}, + {"matrix": [0, 14], "label": "Encoder", "x": 15, "y": 0}, + + {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25}, + {"matrix": [1, 1], "label": "1", "x": 1, "y": 1.25}, + {"matrix": [1, 2], "label": "2", "x": 2, "y": 1.25}, + {"matrix": [1, 3], "label": "3", "x": 3, "y": 1.25}, + {"matrix": [1, 4], "label": "4", "x": 4, "y": 1.25}, + {"matrix": [1, 5], "label": "5", "x": 5, "y": 1.25}, + {"matrix": [1, 6], "label": "6", "x": 6, "y": 1.25}, + {"matrix": [1, 7], "label": "7", "x": 7, "y": 1.25}, + {"matrix": [1, 8], "label": "8", "x": 8, "y": 1.25}, + {"matrix": [1, 9], "label": "9", "x": 9, "y": 1.25}, + {"matrix": [1, 10], "label": "0", "x": 10, "y": 1.25}, + {"matrix": [1, 11], "label": "-", "x": 11, "y": 1.25}, + {"matrix": [1, 12], "label": "=", "x": 12, "y": 1.25}, + {"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25}, + {"matrix": [3, 13], "label": "Backspace1", "x": 14, "y": 1.25}, + {"matrix": [1, 14], "label": "Delect", "x": 15, "y": 1.25}, + + {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "label": "[", "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "label": "]", "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "label": "PageUp", "x": 15, "y": 2.25}, + + {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "label": ";", "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "label": "'", "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 14], "label": "PageDown", "x": 15, "y": 3.25}, + + {"matrix": [4, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "label": "Shift2", "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "label": ",", "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "label": ".", "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "label": "/", "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "label": "\u2191", "x": 14, "y": 4.25}, + + {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "label": "Space", "x": 3.75, "y": 5.25, "w": 2.25}, + {"matrix": [5, 6], "label": "Space", "x": 6, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "label": "Space", "x": 7.25, "y": 5.25, "w": 2.75}, + {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "label": "\u2190", "x": 13, "y": 5.25}, + {"matrix": [5, 13], "label": "\u2193", "x": 14, "y": 5.25}, + {"matrix": [5, 14], "label": "\u2192", "x": 15, "y": 5.25} + ] + } + } +} diff --git a/keyboards/wuque/nemui65/keymaps/default/keymap.c b/keyboards/wuque/nemui65/keymaps/default/keymap.c new file mode 100644 index 000000000000..36ed1ea50640 --- /dev/null +++ b/keyboards/wuque/nemui65/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2023 meletrix + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={ + [0] = LAYOUT( + KC_ESC, 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_F13, KC_MUTE, + KC_GRV, 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_DEL, + 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_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_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/wuque/nemui65/keymaps/via/keymap.c b/keyboards/wuque/nemui65/keymaps/via/keymap.c new file mode 100644 index 000000000000..569d66ac75ca --- /dev/null +++ b/keyboards/wuque/nemui65/keymaps/via/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2023 meletrix + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={ + [0] = LAYOUT( + KC_ESC, 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_F13, KC_MUTE, + KC_GRV, 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_DEL, + 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_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_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [1] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/wuque/nemui65/keymaps/via/rules.mk b/keyboards/wuque/nemui65/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/wuque/nemui65/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/wuque/nemui65/readme.md b/keyboards/wuque/nemui65/readme.md new file mode 100644 index 000000000000..4225139ab028 --- /dev/null +++ b/keyboards/wuque/nemui65/readme.md @@ -0,0 +1,27 @@ +# Nmui65 + +More Info at [Nemui65](https://mechsandco.com/products/nemui65) +​ + +* Keyboard Maintainer: [spbgzh](https://github.com/spbgzh) +* Hardware Supported: Nemui65 +* Hardware Availability: [Nemui65](https://mechsandco.com/products/nemui65) +​ + +Make example for this keyboard (after setting up your build environment): + + make wuque/nemui65:default + +Flashing example for this keyboard: + + make wuque/nemui65:default:flash + +## Bootloader + +Enter the bootloader using one of the following methods: + +* Tap the Reset switch mounted on the PCB +* In the case of the default keymap, use the key combination Fn + Delete +* Hold the Esc key while connecting the USB cable (also erases persistent settings) + +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/wuque/nemui65/rules.mk b/keyboards/wuque/nemui65/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/wuque/nemui65/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From a94654280142fc5a897282b0a5ee65a6bb50192e Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Wed, 21 Jun 2023 14:32:03 +0800 Subject: [PATCH 02/16] Update keymap.c --- keyboards/wuque/nemui65/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wuque/nemui65/keymaps/default/keymap.c b/keyboards/wuque/nemui65/keymaps/default/keymap.c index 36ed1ea50640..e14534e1295e 100644 --- a/keyboards/wuque/nemui65/keymaps/default/keymap.c +++ b/keyboards/wuque/nemui65/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 meletrix +/* Copyright 2023 wuque * * 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 From a2c1d4d31012d3a0fae8789b3ee2485007a22d55 Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Wed, 21 Jun 2023 14:32:19 +0800 Subject: [PATCH 03/16] Update keymap.c --- keyboards/wuque/nemui65/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wuque/nemui65/keymaps/via/keymap.c b/keyboards/wuque/nemui65/keymaps/via/keymap.c index 569d66ac75ca..f7feb9a1d6a6 100644 --- a/keyboards/wuque/nemui65/keymaps/via/keymap.c +++ b/keyboards/wuque/nemui65/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 meletrix +/* Copyright 2023 wuque * * 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 From 969b99b0eb657ce3e0546810e2c7ee37d54774ce Mon Sep 17 00:00:00 2001 From: spbgzh Date: Wed, 21 Jun 2023 09:52:17 +0300 Subject: [PATCH 04/16] update --- keyboards/wuque/nemui65/config.h | 40 ++++ keyboards/wuque/nemui65/info.json | 220 ++++++++---------- .../wuque/nemui65/keymaps/default/keymap.c | 24 +- keyboards/wuque/nemui65/keymaps/via/keymap.c | 36 ++- keyboards/wuque/nemui65/keymaps/via/rules.mk | 2 +- keyboards/wuque/nemui65/rules.mk | 14 +- keyboards/wuque/nemui65/zoom65.c | 17 ++ 7 files changed, 202 insertions(+), 151 deletions(-) create mode 100644 keyboards/wuque/nemui65/config.h create mode 100644 keyboards/wuque/nemui65/zoom65.c diff --git a/keyboards/wuque/nemui65/config.h b/keyboards/wuque/nemui65/config.h new file mode 100644 index 000000000000..b6c5455ad561 --- /dev/null +++ b/keyboards/wuque/nemui65/config.h @@ -0,0 +1,40 @@ +/* Copyright 2023 wuque + * + * 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 . + */ + +#pragma once + +/* 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 + + #define RGBLED_NUM 1 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*======= RGB function=======*/ +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json index 8ce2905e3316..fa3b3f369b23 100644 --- a/keyboards/wuque/nemui65/info.json +++ b/keyboards/wuque/nemui65/info.json @@ -1,131 +1,103 @@ { - "keyboard_name": "nemui65", - "manufacturer": "wuque", - "maintainer": "spbgzh", - "usb": { - "vid": "0x806E", - "pid": "0x0007", - "device_version": "0.0.1" - }, - "encoder": { - "rotary": [ - {"pin_a": "B0", "pin_b": "B1", "resolution": 2} - ] -}, - "indicators": { - "caps_lock": "F6", - "on_state": 0 - }, - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "encoder": true - }, - "matrix_pins": { - "rows": ["F4", "F1", "F0", "C6", "B6", "F5"], - "cols": ["C7", "D5", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "F7"] - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0}, - {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0}, - {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0}, - {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0}, - {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0}, - {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0}, - {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0}, - {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0}, - {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0}, - {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0}, - {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0}, - {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0}, - {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0}, - {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0}, - {"matrix": [0, 14], "label": "Encoder", "x": 15, "y": 0}, + "keyboard_name": "nemui65", + "manufacturer": "wuque", + "maintainer": "spbgzh", + "usb": { + "vid": "0x807C", + "pid": "0x0005", + "device_version": "0.0.1" + }, + "matrix_pins": { + "cols": ["C7", "D5", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "F7"], + "rows": ["F1", "F0", "C6", "B6", "F5"] + }, + "diode_direction": "COL2ROW", + "indicators": { + "caps_lock": "F6", + "on_state": 0 + }, + "ws2812": { + "pin": "F4" + }, + "rgblight": { + "max_brightness": 200 + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25}, - {"matrix": [1, 1], "label": "1", "x": 1, "y": 1.25}, - {"matrix": [1, 2], "label": "2", "x": 2, "y": 1.25}, - {"matrix": [1, 3], "label": "3", "x": 3, "y": 1.25}, - {"matrix": [1, 4], "label": "4", "x": 4, "y": 1.25}, - {"matrix": [1, 5], "label": "5", "x": 5, "y": 1.25}, - {"matrix": [1, 6], "label": "6", "x": 6, "y": 1.25}, - {"matrix": [1, 7], "label": "7", "x": 7, "y": 1.25}, - {"matrix": [1, 8], "label": "8", "x": 8, "y": 1.25}, - {"matrix": [1, 9], "label": "9", "x": 9, "y": 1.25}, - {"matrix": [1, 10], "label": "0", "x": 10, "y": 1.25}, - {"matrix": [1, 11], "label": "-", "x": 11, "y": 1.25}, - {"matrix": [1, 12], "label": "=", "x": 12, "y": 1.25}, - {"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25}, - {"matrix": [3, 13], "label": "Backspace1", "x": 14, "y": 1.25}, - {"matrix": [1, 14], "label": "Delect", "x": 15, "y": 1.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, - {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5}, - {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25}, - {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25}, - {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25}, - {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25}, - {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25}, - {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25}, - {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25}, - {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25}, - {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25}, - {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25}, - {"matrix": [2, 11], "label": "[", "x": 11.5, "y": 2.25}, - {"matrix": [2, 12], "label": "]", "x": 12.5, "y": 2.25}, - {"matrix": [2, 13], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5}, - {"matrix": [2, 14], "label": "PageUp", "x": 15, "y": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, - {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75}, - {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25}, - {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25}, - {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25}, - {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25}, - {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25}, - {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25}, - {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25}, - {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25}, - {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25}, - {"matrix": [3, 10], "label": ";", "x": 10.75, "y": 3.25}, - {"matrix": [3, 11], "label": "'", "x": 11.75, "y": 3.25}, - {"matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25}, - {"matrix": [3, 14], "label": "PageDown", "x": 15, "y": 3.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, - {"matrix": [4, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25}, - {"matrix": [4, 1], "label": "Shift2", "x": 1.25, "y": 4.25}, - {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25}, - {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25}, - {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25}, - {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25}, - {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25}, - {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25}, - {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25}, - {"matrix": [4, 9], "label": ",", "x": 9.25, "y": 4.25}, - {"matrix": [4, 10], "label": ".", "x": 10.25, "y": 4.25}, - {"matrix": [4, 11], "label": "/", "x": 11.25, "y": 4.25}, - {"matrix": [4, 12], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75}, - {"matrix": [4, 13], "label": "\u2191", "x": 14, "y": 4.25}, - - {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25}, - {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 5], "label": "Space", "x": 3.75, "y": 5.25, "w": 2.25}, - {"matrix": [5, 6], "label": "Space", "x": 6, "y": 5.25, "w": 1.25}, - {"matrix": [5, 7], "label": "Space", "x": 7.25, "y": 5.25, "w": 2.75}, - {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [5, 10], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 12], "label": "\u2190", "x": 13, "y": 5.25}, - {"matrix": [5, 13], "label": "\u2193", "x": 14, "y": 5.25}, - {"matrix": [5, 14], "label": "\u2192", "x": 15, "y": 5.25} - ] + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } } - } } diff --git a/keyboards/wuque/nemui65/keymaps/default/keymap.c b/keyboards/wuque/nemui65/keymaps/default/keymap.c index e14534e1295e..24801db75ebc 100644 --- a/keyboards/wuque/nemui65/keymaps/default/keymap.c +++ b/keyboards/wuque/nemui65/keymaps/default/keymap.c @@ -16,21 +16,19 @@ #include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_ESC, 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_F13, KC_MUTE, - KC_GRV, 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_DEL, - 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_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_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + 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_DEL, + 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_PGUP, + 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_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + 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, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/wuque/nemui65/keymaps/via/keymap.c b/keyboards/wuque/nemui65/keymaps/via/keymap.c index f7feb9a1d6a6..044a6987aca0 100644 --- a/keyboards/wuque/nemui65/keymaps/via/keymap.c +++ b/keyboards/wuque/nemui65/keymaps/via/keymap.c @@ -16,21 +16,33 @@ #include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] ={ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_ESC, 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_F13, KC_MUTE, - KC_GRV, 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_DEL, - 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_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_LSFT, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT + 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_DEL, + 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_PGUP, + 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_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + 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, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/wuque/nemui65/keymaps/via/rules.mk b/keyboards/wuque/nemui65/keymaps/via/rules.mk index 36b7ba9cbc98..43061db1dd46 100644 --- a/keyboards/wuque/nemui65/keymaps/via/rules.mk +++ b/keyboards/wuque/nemui65/keymaps/via/rules.mk @@ -1,2 +1,2 @@ VIA_ENABLE = yes -LTO_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/wuque/nemui65/rules.mk b/keyboards/wuque/nemui65/rules.mk index 6e7633bfe015..c03a79005532 100644 --- a/keyboards/wuque/nemui65/rules.mk +++ b/keyboards/wuque/nemui65/rules.mk @@ -1 +1,13 @@ -# This file intentionally left blank +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = no # Enable Encoder diff --git a/keyboards/wuque/nemui65/zoom65.c b/keyboards/wuque/nemui65/zoom65.c new file mode 100644 index 000000000000..00486661a52d --- /dev/null +++ b/keyboards/wuque/nemui65/zoom65.c @@ -0,0 +1,17 @@ +/* Copyright 2021 meletrix + * + * 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 . + */ + +#include "quantum.h" From 4ab83e8ede8f993376437bfef517c5e686a140f7 Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:15:16 +0800 Subject: [PATCH 05/16] Update keyboards/wuque/nemui65/info.json Co-authored-by: Duncan Sutherland --- keyboards/wuque/nemui65/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json index fa3b3f369b23..c266fe20ceb8 100644 --- a/keyboards/wuque/nemui65/info.json +++ b/keyboards/wuque/nemui65/info.json @@ -40,7 +40,7 @@ {"matrix": [0, 10], "x": 10, "y": 0}, {"matrix": [0, 11], "x": 11, "y": 0}, {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, From defdb567093e08685a4180d7e1a3a2783d40d0fb Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:15:22 +0800 Subject: [PATCH 06/16] Update keyboards/wuque/nemui65/info.json Co-authored-by: Duncan Sutherland --- keyboards/wuque/nemui65/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json index c266fe20ceb8..76efc45ff4f2 100644 --- a/keyboards/wuque/nemui65/info.json +++ b/keyboards/wuque/nemui65/info.json @@ -73,7 +73,7 @@ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, {"matrix": [2, 14], "x": 15, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, {"matrix": [3, 2], "x": 2.25, "y": 3}, {"matrix": [3, 3], "x": 3.25, "y": 3}, {"matrix": [3, 4], "x": 4.25, "y": 3}, From 479704d863ae600fc3f073b107eadd2d7799ba7e Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:15:28 +0800 Subject: [PATCH 07/16] Update keyboards/wuque/nemui65/info.json Co-authored-by: Duncan Sutherland --- keyboards/wuque/nemui65/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json index 76efc45ff4f2..b6152bb8563a 100644 --- a/keyboards/wuque/nemui65/info.json +++ b/keyboards/wuque/nemui65/info.json @@ -91,7 +91,7 @@ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, {"matrix": [4, 12], "x": 13, "y": 4}, From be911a6cc6a0eb105c36f0b5b6d5eea970bb89fe Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:15:39 +0800 Subject: [PATCH 08/16] Update keyboards/wuque/nemui65/config.h Co-authored-by: Duncan Sutherland --- keyboards/wuque/nemui65/config.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/keyboards/wuque/nemui65/config.h b/keyboards/wuque/nemui65/config.h index b6c5455ad561..489059d8ab31 100644 --- a/keyboards/wuque/nemui65/config.h +++ b/keyboards/wuque/nemui65/config.h @@ -22,19 +22,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - #define RGBLED_NUM 1 - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*======= RGB function=======*/ -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE From 383aeafcd7bd19ee5f7cdc9af4a58d036a0749e7 Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:15:46 +0800 Subject: [PATCH 09/16] Update keyboards/wuque/nemui65/rules.mk Co-authored-by: Duncan Sutherland --- keyboards/wuque/nemui65/rules.mk | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/keyboards/wuque/nemui65/rules.mk b/keyboards/wuque/nemui65/rules.mk index c03a79005532..6e7633bfe015 100644 --- a/keyboards/wuque/nemui65/rules.mk +++ b/keyboards/wuque/nemui65/rules.mk @@ -1,13 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Enable Encoder +# This file intentionally left blank From 2e0b2490e3572f94755ad14fb323c4478bdffa54 Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:15:52 +0800 Subject: [PATCH 10/16] Update keyboards/wuque/nemui65/info.json Co-authored-by: Duncan Sutherland --- keyboards/wuque/nemui65/info.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json index b6152bb8563a..de9b5e3f59a8 100644 --- a/keyboards/wuque/nemui65/info.json +++ b/keyboards/wuque/nemui65/info.json @@ -11,6 +11,18 @@ "cols": ["C7", "D5", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "F7"], "rows": ["F1", "F0", "C6", "B6", "F5"] }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "audio": false, + "backlight": false, + "encoder": false, + "rbglight": true + }, "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6", From 79b197d924eb6aa747dd514a54b3b36cbb4a88bc Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:15:59 +0800 Subject: [PATCH 11/16] Update keyboards/wuque/nemui65/info.json Co-authored-by: Duncan Sutherland --- keyboards/wuque/nemui65/info.json | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json index de9b5e3f59a8..8b29212e7466 100644 --- a/keyboards/wuque/nemui65/info.json +++ b/keyboards/wuque/nemui65/info.json @@ -32,7 +32,24 @@ "pin": "F4" }, "rgblight": { - "max_brightness": 200 + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "max_brightness": 200, + "led_count": 1, + "hue_steps": 8, + "saturation_steps": 8, + "brightness_steps": 8, + "sleep": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", From 0350f6e426a8b25909be94c082b06c9351b3cda0 Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 02:16:32 +0800 Subject: [PATCH 12/16] Update keyboards/wuque/nemui65/keymaps/via/rules.mk Co-authored-by: Duncan Sutherland --- keyboards/wuque/nemui65/keymaps/via/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/wuque/nemui65/keymaps/via/rules.mk b/keyboards/wuque/nemui65/keymaps/via/rules.mk index 43061db1dd46..36b7ba9cbc98 100644 --- a/keyboards/wuque/nemui65/keymaps/via/rules.mk +++ b/keyboards/wuque/nemui65/keymaps/via/rules.mk @@ -1,2 +1,2 @@ VIA_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file +LTO_ENABLE = yes From 019f323e0632cc9582666dce36b6da5fe0ad896d Mon Sep 17 00:00:00 2001 From: spbgzh Date: Wed, 21 Jun 2023 21:17:49 +0300 Subject: [PATCH 13/16] Delete zoom65.c --- keyboards/wuque/nemui65/zoom65.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/wuque/nemui65/zoom65.c diff --git a/keyboards/wuque/nemui65/zoom65.c b/keyboards/wuque/nemui65/zoom65.c deleted file mode 100644 index 00486661a52d..000000000000 --- a/keyboards/wuque/nemui65/zoom65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 meletrix - * - * 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 . - */ - -#include "quantum.h" From d1440045ebc2bac7f008fd5fe75e349c8902fe8a Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:57:10 +0800 Subject: [PATCH 14/16] Update keyboards/wuque/nemui65/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/wuque/nemui65/keymaps/via/keymap.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/keyboards/wuque/nemui65/keymaps/via/keymap.c b/keyboards/wuque/nemui65/keymaps/via/keymap.c index 044a6987aca0..da09d31c6198 100644 --- a/keyboards/wuque/nemui65/keymaps/via/keymap.c +++ b/keyboards/wuque/nemui65/keymaps/via/keymap.c @@ -30,19 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), + ) }; From ff2feffa87bc1cf264eafb44c7bfb5ad402f2a17 Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:57:18 +0800 Subject: [PATCH 15/16] Update keyboards/wuque/nemui65/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/wuque/nemui65/info.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json index 8b29212e7466..c04b226b31cf 100644 --- a/keyboards/wuque/nemui65/info.json +++ b/keyboards/wuque/nemui65/info.json @@ -14,13 +14,10 @@ "features": { "bootmagic": true, "command": false, - "console": true, + "console": false "extrakey": true, "mousekey": true, - "nkro": true, - "audio": false, - "backlight": false, - "encoder": false, + "nkro": true "rbglight": true }, "diode_direction": "COL2ROW", From d81a950d167993c72ca9d346707ef0ade600b5e7 Mon Sep 17 00:00:00 2001 From: spbgzh <72414103+spbgzh@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:57:25 +0800 Subject: [PATCH 16/16] Update keyboards/wuque/nemui65/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/wuque/nemui65/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json index c04b226b31cf..b56df19efd98 100644 --- a/keyboards/wuque/nemui65/info.json +++ b/keyboards/wuque/nemui65/info.json @@ -43,7 +43,6 @@ }, "max_brightness": 200, "led_count": 1, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "sleep": true