diff options
Diffstat (limited to 'keyboards/salicylic_acid3/nknl7en')
| -rw-r--r-- | keyboards/salicylic_acid3/nknl7en/config.h | 10 | ||||
| -rw-r--r-- | keyboards/salicylic_acid3/nknl7en/info.json | 170 | ||||
| -rw-r--r-- | keyboards/salicylic_acid3/nknl7en/nknl7en.c | 18 | ||||
| -rw-r--r-- | keyboards/salicylic_acid3/nknl7en/nknl7en.h | 54 |
4 files changed, 97 insertions, 155 deletions
diff --git a/keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h index 43e7cfb222..9f39d06f61 100644 --- a/keyboards/salicylic_acid3/nknl7en/config.h +++ b/keyboards/salicylic_acid3/nknl7en/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5, D2 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ @@ -31,9 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 21 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json index 06d915c2f4..f0f45f077a 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -1,91 +1,115 @@ { - "keyboard_name": "nknl7en", + "keyboard_name": "nknl7en", "manufacturer": "Salicylic_Acid", - "url": "https://salicylic-acid3.hatenablog.com/", - "maintainer": "Salicylic_acid3", + "url": "https://salicylic-acid3.hatenablog.com/", + "maintainer": "Salicylic_acid3", "usb": { "vid": "0x04D8", "pid": "0xEA56", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"0,1", "x":1, "y":0}, - {"label":"0,2", "x":2, "y":0}, - {"label":"0,3", "x":3, "y":0}, - {"label":"0,4", "x":4, "y":0}, - {"label":"0,5", "x":5, "y":0}, - {"label":"5,0", "x":6.75, "y":0}, - {"label":"5,1", "x":7.75, "y":0}, - {"label":"5,2", "x":8.75, "y":0}, - {"label":"5,3", "x":9.75, "y":0}, - {"label":"5,4", "x":10.75, "y":0}, - {"label":"5,5", "x":11.75, "y":0}, - {"label":"5,6", "x":12.75, "y":0}, - {"label":"5,7", "x":13.75, "y":0, "w":2}, - {"label":"5,8", "x":16.25, "y":0}, - {"label":"1,0", "x":0, "y":1, "w":1.5}, - {"label":"1,1", "x":1.5, "y":1}, - {"label":"1,2", "x":2.5, "y":1}, - {"label":"1,3", "x":3.5, "y":1}, - {"label":"1,4", "x":4.5, "y":1}, - {"label":"1,5", "x":5.5, "y":1}, - {"label":"6,0", "x":7.25, "y":1}, - {"label":"6,1", "x":8.25, "y":1}, - {"label":"6,2", "x":9.25, "y":1}, - {"label":"6,3", "x":10.25, "y":1}, - {"label":"6,4", "x":11.25, "y":1}, - {"label":"6,5", "x":12.25, "y":1}, - {"label":"6,6", "x":13.25, "y":1}, - {"label":"6,7", "x":14.25, "y":1, "w":1.5}, - {"label":"6,8", "x":16.25, "y":1}, - {"label":"2,0", "x":0, "y":2, "w":1.75}, - {"label":"2,1", "x":1.75, "y":2}, - {"label":"2,2", "x":2.75, "y":2}, - {"label":"2,3", "x":3.75, "y":2}, - {"label":"2,4", "x":4.75, "y":2}, - {"label":"2,5", "x":5.75, "y":2}, - {"label":"7,0", "x":7.5, "y":2}, - {"label":"7,1", "x":8.5, "y":2}, - {"label":"7,2", "x":9.5, "y":2}, - {"label":"7,3", "x":10.5, "y":2}, - {"label":"7,4", "x":11.5, "y":2}, - {"label":"7,5", "x":12.5, "y":2}, - {"label":"7,6", "x":13.5, "y":2, "w":2.25}, - {"label":"7,8", "x":16.25, "y":2}, - {"label":"3,0", "x":0, "y":3, "w":2.25}, - {"label":"3,1", "x":2.25, "y":3}, - {"label":"3,2", "x":3.25, "y":3}, - {"label":"3,3", "x":4.25, "y":3}, - {"label":"3,4", "x":5.25, "y":3}, - {"label":"3,5", "x":6.25, "y":3}, - {"label":"8,0", "x":8, "y":3}, - {"label":"8,1", "x":9, "y":3}, - {"label":"8,2", "x":10, "y":3}, - {"label":"8,3", "x":11, "y":3}, - {"label":"8,4", "x":12, "y":3}, - {"label":"8,5", "x":13, "y":3, "w":1.75}, - {"label":"8,6", "x":15, "y":3.25}, - {"label":"8,8", "x":16.25, "y":3}, - {"label":"4,0", "x":0, "y":4, "w":1.25}, - {"label":"4,1", "x":1.25, "y":4, "w":1.25}, - {"label":"4,2", "x":2.5, "y":4, "w":1.25}, - {"label":"4,3", "x":3.75, "y":4, "w":2}, - {"label":"4,4", "x":5.75, "y":4}, - {"label":"9,0", "x":7.5, "y":4, "w":2.75}, - {"label":"9,2", "x":10.25, "y":4, "w":1.25}, - {"label":"9,3", "x":11.5, "y":4, "w":1.25}, - {"label":"9,4", "x":12.75, "y":4}, - {"label":"9,6", "x":14, "y":4.25}, - {"label":"8,7", "x":15, "y":4.25}, - {"label":"9,7", "x":16, "y":4.25}] + {"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": [5, 0], "x": 6.75, "y": 0}, + {"matrix": [5, 1], "x": 7.75, "y": 0}, + {"matrix": [5, 2], "x": 8.75, "y": 0}, + {"matrix": [5, 3], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 5], "x": 11.75, "y": 0}, + {"matrix": [5, 6], "x": 12.75, "y": 0}, + {"matrix": [5, 7], "x": 13.75, "y": 0, "w": 2}, + + {"matrix": [5, 8], "x": 16.25, "y": 0}, + + {"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": [6, 0], "x": 7.25, "y": 1}, + {"matrix": [6, 1], "x": 8.25, "y": 1}, + {"matrix": [6, 2], "x": 9.25, "y": 1}, + {"matrix": [6, 3], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 5], "x": 12.25, "y": 1}, + {"matrix": [6, 6], "x": 13.25, "y": 1}, + {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5}, + + {"matrix": [6, 8], "x": 16.25, "y": 1}, + + {"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": [7, 0], "x": 7.5, "y": 2}, + {"matrix": [7, 1], "x": 8.5, "y": 2}, + {"matrix": [7, 2], "x": 9.5, "y": 2}, + {"matrix": [7, 3], "x": 10.5, "y": 2}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 5], "x": 12.5, "y": 2}, + {"matrix": [7, 6], "x": 13.5, "y": 2, "w": 2.25}, + + {"matrix": [7, 8], "x": 16.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 8, "y": 3}, + {"matrix": [8, 1], "x": 9, "y": 3}, + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 15, "y": 3.25}, + + {"matrix": [8, 8], "x": 16.25, "y": 3}, + + {"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, 3], "x": 3.75, "y": 4, "w": 2}, + {"matrix": [4, 4], "x": 5.75, "y": 4}, + + {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 2.75}, + {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 12.75, "y": 4}, + + {"matrix": [9, 6], "x": 14, "y": 4.25}, + {"matrix": [8, 7], "x": 15, "y": 4.25}, + {"matrix": [9, 7], "x": 16, "y": 4.25} + ] } } } diff --git a/keyboards/salicylic_acid3/nknl7en/nknl7en.c b/keyboards/salicylic_acid3/nknl7en/nknl7en.c deleted file mode 100644 index 1f06cb7336..0000000000 --- a/keyboards/salicylic_acid3/nknl7en/nknl7en.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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 "nknl7en.h" diff --git a/keyboards/salicylic_acid3/nknl7en/nknl7en.h b/keyboards/salicylic_acid3/nknl7en/nknl7en.h deleted file mode 100644 index 945e42956f..0000000000 --- a/keyboards/salicylic_acid3/nknl7en/nknl7en.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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 "quantum.h" - -/* - * ,------------------------------------ ------------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R08 | - * |---------------------------------------------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R18 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R28 | - * |---------------------------------------------------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R38 | - * |------------------------------------------- -----------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | | R40 | R42 | R43 | R44 | R46 | R37 | R47 | - * |---------------------------------------- --------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R28, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R38, \ - L40, L41, L42, L43, L44, R40, R42, R43, R44, R46, R37, R47 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, KC_NO, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { R40, KC_NO, R42, R43, R44, KC_NO, R46, R47, KC_NO } \ - } |