diff options
Diffstat (limited to 'keyboards/salicylic_acid3')
72 files changed, 801 insertions, 1480 deletions
diff --git a/keyboards/salicylic_acid3/7skb/7skb.c b/keyboards/salicylic_acid3/7skb/7skb.c deleted file mode 100644 index 3044e02233..0000000000 --- a/keyboards/salicylic_acid3/7skb/7skb.c +++ /dev/null @@ -1 +0,0 @@ -#include "7skb.h" diff --git a/keyboards/salicylic_acid3/7skb/7skb.h b/keyboards/salicylic_acid3/7skb/7skb.h deleted file mode 100644 index 5043a46747..0000000000 --- a/keyboards/salicylic_acid3/7skb/7skb.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_salicylic_acid3_7skb_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h index b85eee3da2..573efb81c7 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/config.h +++ b/keyboards/salicylic_acid3/7skb/rev1/config.h @@ -18,12 +18,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 } - -#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 +25,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 12 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json index 242135b16c..da6acd3a3a 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -8,77 +8,94 @@ "pid": "0xEB5F", "device_version": "0.0.7" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":7, "y":0}, - {"label":"7", "x":8, "y":0}, - {"label":"8", "x":9, "y":0}, - {"label":"9", "x":10, "y":0}, - {"label":"0", "x":11, "y":0}, - {"label":"-", "x":12, "y":0}, - {"label":"=", "x":13, "y":0}, - {"label":"\\", "x":14, "y":0}, - {"label":"`", "x":15, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"[", "x":12.5, "y":1}, - {"label":"]", "x":13.5, "y":1}, - {"label":"Delete", "x":14.5, "y":1, "w":1.5}, - {"label":"Control", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":";", "x":11.75, "y":2}, - {"label":"'", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8.25, "y":3}, - {"label":"M", "x":9.25, "y":3}, - {"label":",", "x":10.25, "y":3}, - {"label":".", "x":11.25, "y":3}, - {"label":"/", "x":12.25, "y":3}, - {"label":"Shift", "x":13.25, "y":3, "w":1.75}, - {"label":"Fn", "x":15, "y":3}, - {"label":"Alt", "x":1.5, "y":4}, - {"label":"GUI", "x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":1.5}, - {"x":5.5, "y":4, "w":1.25}, - {"x":7.75, "y":4, "w":1.25}, - {"x":9, "y":4, "w":2}, - {"label":"GUI", "x":11, "y":4, "w":1.5}, - {"label":"Alt", "x":12.5, "y":4} + {"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": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + {"matrix": [5, 7], "x": 14, "y": 0}, + {"matrix": [6, 7], "x": 15, "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.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1}, + {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5}, + + {"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.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 2.25}, + + {"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.25, "y": 3}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3}, + {"matrix": [8, 5], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 6], "x": 15, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 9, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 12.5, "y": 4} ] } } diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.c b/keyboards/salicylic_acid3/7skb/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/salicylic_acid3/7skb/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h deleted file mode 100644 index 8ab845240d..0000000000 --- a/keyboards/salicylic_acid3/7skb/rev1/rev1.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "7skb.h" - -#include "quantum.h" - -////////////////////////////////////////////////////////////////////////////// -// When only use 7skb. -////////////////////////////////////////////////////////////////////////////// -/* - * ,------------------------------------ ------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R17 | - * |---------------------------------------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R27 | - * |---------------------------------------- ---------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | - * |---------------------------------------------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | - * |------------------------------------------- -----------------------------------------------' - * | L41 | L42 | L43 | L44 | | R40 | R41 | R43 | R44 | - * |------------------------------ ---------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R17, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R27, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, \ - L41, L42, L43, L44, R40, R41, R43, R44 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - {KC_NO, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, KC_NO }, \ - { R40, R41, KC_NO, R43, R44, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/7splus/7splus.c b/keyboards/salicylic_acid3/7splus/7splus.c deleted file mode 100644 index ca94ab0efa..0000000000 --- a/keyboards/salicylic_acid3/7splus/7splus.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 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 "7splus.h" diff --git a/keyboards/salicylic_acid3/7splus/7splus.h b/keyboards/salicylic_acid3/7splus/7splus.h deleted file mode 100644 index 55b9c24f9c..0000000000 --- a/keyboards/salicylic_acid3/7splus/7splus.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -Copyright 2020 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 | R60 | - * |-------------------------------------- ------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R62 | - * |---------------------------------------------------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R63 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37 | - * |---------------------------------------------------------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 | R47 | R57 | - * |---------------------------------------------------------------------------------------------------+ - * | L50 | L51 | L52 | L53 | L54 | L55 | | R50 | R51 | R53 | R54 | R55 | R56 | R64 | - * |---------------------------------------- ------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R60, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R62, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R63, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R47, R57, \ - L50, L51, L52, L54, L55, R50, R51, R53, R54, R55, R56, R64 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO }, \ - { L50, L51, L52, KC_NO, L54, L55, KC_NO, KC_NO }, \ - {KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, KC_NO, R47 }, \ - { R50, R51, KC_NO, R53, R54, R55, R56, R57 }, \ - { R60, KC_NO, R62, R63, R64, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h index 23eae6dac4..82eec4a306 100644 --- a/keyboards/salicylic_acid3/7splus/config.h +++ b/keyboards/salicylic_acid3/7splus/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 { D1, D0, D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 } - -#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 31 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index 7762132ec0..40f449c126 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -8,99 +8,121 @@ "pid": "0xEAE7", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":10.75, "y":0}, - {"label":"F10", "x":11.75, "y":0}, - {"label":"F11", "x":12.75, "y":0}, - {"label":"F12", "x":13.75, "y":0}, - {"label":"PrtScr", "x":15, "y":0}, - {"label":"Delete", "x":16, "y":0}, - {"label":"~", "x":0, "y":1.25}, - {"label":"1", "x":1, "y":1.25}, - {"label":"2", "x":2, "y":1.25}, - {"label":"3", "x":3, "y":1.25}, - {"label":"4", "x":4, "y":1.25}, - {"label":"5", "x":5, "y":1.25}, - {"label":"6", "x":7, "y":1.25}, - {"label":"7", "x":8, "y":1.25}, - {"label":"8", "x":9, "y":1.25}, - {"label":"9", "x":10, "y":1.25}, - {"label":"0", "x":11, "y":1.25}, - {"label":"-", "x":12, "y":1.25}, - {"label":"=", "x":13, "y":1.25}, - {"label":"Back Space", "x":14, "y":1.25, "w":2}, - {"label":"Home", "x":16, "y":1.25}, - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":7.5, "y":2.25}, - {"label":"U", "x":8.5, "y":2.25}, - {"label":"I", "x":9.5, "y":2.25}, - {"label":"O", "x":10.5, "y":2.25}, - {"label":"P", "x":11.5, "y":2.25}, - {"label":"[", "x":12.5, "y":2.25}, - {"label":"]", "x":13.5, "y":2.25}, - {"label":"\"", "x":14.5, "y":2.25, "w":1.5}, - {"label":"Page Up", "x":16, "y":2.25}, - {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":7.75, "y":3.25}, - {"label":"J", "x":8.75, "y":3.25}, - {"label":"K", "x":9.75, "y":3.25}, - {"label":"L", "x":10.75, "y":3.25}, - {"label":":", "x":11.75, "y":3.25}, - {"label":"'", "x":12.75, "y":3.25}, - {"label":"Enter", "x":13.75, "y":3.25, "w":2.25}, - {"label":"Page Down", "x":16, "y":3.25}, - {"label":"Shift", "x":0, "y":4.25, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.25}, - {"label":"X", "x":3.25, "y":4.25}, - {"label":"C", "x":4.25, "y":4.25}, - {"label":"V", "x":5.25, "y":4.25}, - {"label":"B", "x":6.25, "y":4.25}, - {"label":"N", "x":8.25, "y":4.25}, - {"label":"M", "x":9.25, "y":4.25}, - {"label":"<", "x":10.25, "y":4.25}, - {"label":">", "x":11.25, "y":4.25}, - {"label":"?", "x":12.25, "y":4.25}, - {"label":"Shift","x":13.25, "y":4.25, "w":1.75}, - {"label":"Up", "x":15, "y":4.25}, - {"label":"End", "x":16, "y":4.25}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":2}, - {"x":5.75, "y":5.25}, - {"x":7.75, "y":5.25}, - {"x":8.75, "y":5.25, "w":2.75}, - {"label":"Alt", "x":11.5, "y":5.25, "w":1.25}, - {"label":"App", "x":12.75, "y":5.25, "w":1.25}, - {"label":"Left", "x":14, "y":5.25}, - {"label":"Down", "x":15, "y":5.25}, - {"label":"Right", "x":16, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [7, 1], "x": 8.5, "y": 0}, + {"matrix": [7, 2], "x": 9.5, "y": 0}, + + {"matrix": [7, 3], "x": 10.75, "y": 0}, + {"matrix": [7, 4], "x": 11.75, "y": 0}, + {"matrix": [7, 5], "x": 12.75, "y": 0}, + {"matrix": [7, 6], "x": 13.75, "y": 0}, + + {"matrix": [7, 7], "x": 15, "y": 0}, + {"matrix": [13, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [8, 0], "x": 7, "y": 1.25}, + {"matrix": [8, 1], "x": 8, "y": 1.25}, + {"matrix": [8, 2], "x": 9, "y": 1.25}, + {"matrix": [8, 3], "x": 10, "y": 1.25}, + {"matrix": [8, 4], "x": 11, "y": 1.25}, + {"matrix": [8, 5], "x": 12, "y": 1.25}, + {"matrix": [8, 6], "x": 13, "y": 1.25}, + {"matrix": [8, 7], "x": 14, "y": 1.25, "w": 2}, + {"matrix": [13, 2], "x": 16, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + + {"matrix": [9, 0], "x": 7.5, "y": 2.25}, + {"matrix": [9, 1], "x": 8.5, "y": 2.25}, + {"matrix": [9, 2], "x": 9.5, "y": 2.25}, + {"matrix": [9, 3], "x": 10.5, "y": 2.25}, + {"matrix": [9, 4], "x": 11.5, "y": 2.25}, + {"matrix": [9, 5], "x": 12.5, "y": 2.25}, + {"matrix": [9, 6], "x": 13.5, "y": 2.25}, + {"matrix": [9, 7], "x": 14.5, "y": 2.25, "w": 1.5}, + {"matrix": [13, 3], "x": 16, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + + {"matrix": [10, 0], "x": 7.75, "y": 3.25}, + {"matrix": [10, 1], "x": 8.75, "y": 3.25}, + {"matrix": [10, 2], "x": 9.75, "y": 3.25}, + {"matrix": [10, 3], "x": 10.75, "y": 3.25}, + {"matrix": [10, 4], "x": 11.75, "y": 3.25}, + {"matrix": [10, 5], "x": 12.75, "y": 3.25}, + {"matrix": [10, 6], "x": 13.75, "y": 3.25, "w": 2.25}, + {"matrix": [10, 7], "x": 16, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + + {"matrix": [11, 0], "x": 8.25, "y": 4.25}, + {"matrix": [11, 1], "x": 9.25, "y": 4.25}, + {"matrix": [11, 2], "x": 10.25, "y": 4.25}, + {"matrix": [11, 3], "x": 11.25, "y": 4.25}, + {"matrix": [11, 4], "x": 12.25, "y": 4.25}, + {"matrix": [11, 5], "x": 13.25, "y": 4.25, "w": 1.75}, + {"matrix": [11, 7], "x": 15, "y": 4.25}, + {"matrix": [12, 7], "x": 16, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2}, + {"matrix": [5, 5], "x": 5.75, "y": 5.25}, + + {"matrix": [12, 0], "x": 7.75, "y": 5.25}, + {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 2.75}, + {"matrix": [12, 3], "x": 11.5, "y": 5.25, "w": 1.25}, + {"matrix": [12, 4], "x": 12.75, "y": 5.25, "w": 1.25}, + {"matrix": [12, 5], "x": 14, "y": 5.25}, + {"matrix": [12, 6], "x": 15, "y": 5.25}, + {"matrix": [13, 4], "x": 16, "y": 5.25} ] } } diff --git a/keyboards/salicylic_acid3/ajisai74/ajisai74.c b/keyboards/salicylic_acid3/ajisai74/ajisai74.c deleted file mode 100644 index 3c9342e6f7..0000000000 --- a/keyboards/salicylic_acid3/ajisai74/ajisai74.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 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 "ajisai74.h" diff --git a/keyboards/salicylic_acid3/ajisai74/ajisai74.h b/keyboards/salicylic_acid3/ajisai74/ajisai74.h deleted file mode 100644 index 40c7d8b31b..0000000000 --- a/keyboards/salicylic_acid3/ajisai74/ajisai74.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2020 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 | R18 | - * |---------------------------------------------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R28 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R38 | - * |---------------------------------------------------------------------------------------------------+ - * | L30 | L45 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37 | - * |------------------------------------------- -----------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | | R40 | R41 | R42 | R43 | R44 | | R46 | R47 | R48 | - * |---------------------------------------- --------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, R18, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R28, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R38, \ - L30, L45, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, R40, R41, R42, R43, R44, R46, R47, R48 \ - ) \ - { \ - { 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, L45, 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, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { R40, R41, R42, R43, R44, KC_NO, R46, R47, R48 } \ - } diff --git a/keyboards/salicylic_acid3/ajisai74/config.h b/keyboards/salicylic_acid3/ajisai74/config.h index aa568db0a6..8f24db085d 100644 --- a/keyboards/salicylic_acid3/ajisai74/config.h +++ b/keyboards/salicylic_acid3/ajisai74/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, D3 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json index e9b4d6e60e..681737a069 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/info.json @@ -8,6 +8,11 @@ "pid": "0xEB54", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -16,80 +21,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6.75, "y":0}, - {"label":"7", "x":7.75, "y":0}, - {"label":"8", "x":8.75, "y":0}, - {"label":"9", "x":9.75, "y":0}, - {"label":"0", "x":10.75, "y":0}, - {"label":"-", "x":11.75, "y":0}, - {"label":"=", "x":12.75, "y":0}, - {"label":"Back", "x":13.75, "y":0}, - {"label":"Back", "x":14.75, "y":0}, - {"label":"Insert", "x":15.75, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.25, "y":1}, - {"label":"U", "x":8.25, "y":1}, - {"label":"I", "x":9.25, "y":1}, - {"label":"O", "x":10.25, "y":1}, - {"label":"P", "x":11.25, "y":1}, - {"label":"[", "x":12.25, "y":1}, - {"label":"]", "x":13.25, "y":1}, - {"label":"\"", "x":14.25, "y":1, "w":1.5}, - {"label":"Del", "x":15.75, "y":1}, - {"label":"CapsLock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.5, "y":2}, - {"label":"J", "x":8.5, "y":2}, - {"label":"K", "x":9.5, "y":2}, - {"label":"L", "x":10.5, "y":2}, - {"label":":", "x":11.5, "y":2}, - {"label":"'", "x":12.5, "y":2}, - {"label":"Return", "x":13.5, "y":2}, - {"label":"Return", "x":14.5, "y":2, "w":1.25}, - {"label":"PgUp", "x":15.75, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"Shift", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8, "y":3}, - {"label":"M", "x":9, "y":3}, - {"label":"<", "x":10, "y":3}, - {"label":">", "x":11, "y":3}, - {"label":"?", "x":12, "y":3}, - {"label":"Shift", "x":13, "y":3, "w":1.75}, - {"label":"Up", "x":14.75, "y":3}, - {"label":"PgDwn", "x":15.75, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"Win", "x":1.5, "y":4}, - {"label":"Alt", "x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":1.5}, - {"x":5.5, "y":4, "w":1.25}, - {"x":7.5, "y":4, "w":1.25}, - {"x":8.75, "y":4, "w":1.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Win", "x":11.25, "y":4}, - {"label":"Fn", "x":12.25, "y":4}, - {"label":"Left", "x":13.75, "y":4}, - {"label":"Down", "x":14.75, "y":4}, - {"label":"Right", "x":15.75, "y":4}] + {"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}, + {"matrix": [5, 8], "x": 14.75, "y": 0}, + {"matrix": [6, 8], "x": 15.75, "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": [7, 8], "x": 15.75, "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}, + {"matrix": [7, 7], "x": 14.5, "y": 2, "w": 1.25}, + {"matrix": [8, 8], "x": 15.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 5], "x": 1.25, "y": 3}, + {"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": 14.75, "y": 3}, + {"matrix": [8, 7], "x": 15.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 11.25, "y": 4}, + {"matrix": [9, 4], "x": 12.25, "y": 4}, + + {"matrix": [9, 6], "x": 13.75, "y": 4}, + {"matrix": [9, 7], "x": 14.75, "y": 4}, + {"matrix": [9, 8], "x": 15.75, "y": 4} + ] } } } diff --git a/keyboards/salicylic_acid3/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h index c64ee24098..dcbdb0f537 100644 --- a/keyboards/salicylic_acid3/ergoarrows/config.h +++ b/keyboards/salicylic_acid3/ergoarrows/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, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -#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 86 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c deleted file mode 100644 index 7d2c11e6ec..0000000000 --- a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.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 "ergoarrows.h" diff --git a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h deleted file mode 100644 index 7944337b4e..0000000000 --- a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h +++ /dev/null @@ -1,59 +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 | L06 | | R06 | R05 | R04 | R03 | R02 | R01 | R00 | - * |------------------------------------------ ------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R16 | R15 | R14 | R13 | R12 | R11 | R10 | - * |------------------------------------------ ------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R26 | R25 | R24 | R23 | R22 | R21 | R20 | - * |------------------------------------------ ------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R36 | R35 | R34 | R33 | R32 | R31 | R30 | - * |------------------------------------------ ------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | L46 | | R46 | R45 | R44 | R43 | R42 | R41 | R40 | - * |------------------------------------------ ------------------------------------------+ - * | L51 | L52 | L53 | | R53 | R52 | R51 | - * ------------------- ------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40, \ - L51, L52, L53, R53, R52, R51 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - {KC_NO, L51, L52, L53, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, R46 }, \ - {KC_NO, R51, R52, R53, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json index 9396eca367..0957f6628d 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/info.json @@ -8,102 +8,111 @@ "pid": "0xEA54", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0.375}, - {"label":"1", "x":1, "y":0.375}, - {"label":"2", "x":2, "y":0.125}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0.125}, - {"label":"5", "x":5, "y":0.25}, - {"label":"6", "x":6, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, - {"label":"5", "x":8.8, "y":0.5}, - {"label":"6", "x":9.8, "y":0.25}, - {"label":"7", "x":10.8, "y":0.125}, - {"label":"8", "x":11.8, "y":0}, - {"label":"9", "x":12.8, "y":0.125}, - {"label":"0", "x":13.8, "y":0.375}, - {"label":"PrtScr", "x":14.8, "y":0.375}, + {"matrix": [6, 6], "x": 8.8, "y": 0.5}, + {"matrix": [6, 5], "x": 9.8, "y": 0.25}, + {"matrix": [6, 4], "x": 10.8, "y": 0.125}, + {"matrix": [6, 3], "x": 11.8, "y": 0}, + {"matrix": [6, 2], "x": 12.8, "y": 0.125}, + {"matrix": [6, 1], "x": 13.8, "y": 0.375}, + {"matrix": [6, 0], "x": 14.8, "y": 0.375}, - {"label":"Tab", "x":0, "y":1.375}, - {"label":"Q", "x":1, "y":1.375}, - {"label":"W", "x":2, "y":1.125}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1.125}, - {"label":"T", "x":5, "y":1.25}, - {"label":"Y", "x":6, "y":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, - {"label":"T", "x":8.8, "y":1.5}, - {"label":"Y", "x":9.8, "y":1.25}, - {"label":"U", "x":10.8, "y":1.125}, - {"label":"I", "x":11.8, "y":1}, - {"label":"O", "x":12.8, "y":1.125}, - {"label":"P", "x":13.8, "y":1.375}, - {"label":"[", "x":14.8, "y":1.375}, + {"matrix": [7, 6], "x": 8.8, "y": 1.5}, + {"matrix": [7, 5], "x": 9.8, "y": 1.25}, + {"matrix": [7, 4], "x": 10.8, "y": 1.125}, + {"matrix": [7, 3], "x": 11.8, "y": 1}, + {"matrix": [7, 2], "x": 12.8, "y": 1.125}, + {"matrix": [7, 1], "x": 13.8, "y": 1.375}, + {"matrix": [7, 0], "x": 14.8, "y": 1.375}, - {"label":"Caps", "x":0, "y":2.375}, - {"label":"A", "x":1, "y":2.375}, - {"label":"S", "x":2, "y":2.125}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2.125}, - {"label":"G", "x":5, "y":2.25}, - {"label":"H", "x":6, "y":2.5}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, - {"label":"G", "x":8.8, "y":2.5}, - {"label":"H", "x":9.8, "y":2.25}, - {"label":"J", "x":10.8, "y":2.125}, - {"label":"K", "x":11.8, "y":2}, - {"label":"L", "x":12.8, "y":2.125}, - {"label":":", "x":13.8, "y":2.375}, - {"label":"Ent", "x":14.8, "y":2.375}, + {"matrix": [8, 6], "x": 8.8, "y": 2.5}, + {"matrix": [8, 5], "x": 9.8, "y": 2.25}, + {"matrix": [8, 4], "x": 10.8, "y": 2.125}, + {"matrix": [8, 3], "x": 11.8, "y": 2}, + {"matrix": [8, 2], "x": 12.8, "y": 2.125}, + {"matrix": [8, 1], "x": 13.8, "y": 2.375}, + {"matrix": [8, 0], "x": 14.8, "y": 2.375}, - {"label":"Shift", "x":0, "y":3.375}, - {"label":"Z", "x":1, "y":3.375}, - {"label":"X", "x":2, "y":3.125}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3.125}, - {"label":"B", "x":5, "y":3.25}, - {"label":"N", "x":6, "y":3.5}, + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.5}, - {"label":"B", "x":8.8, "y":3.5}, - {"label":"N", "x":9.8, "y":3.25}, - {"label":"M", "x":10.8, "y":3.125}, - {"label":"<", "x":11.8, "y":3}, - {"label":">", "x":12.8, "y":3.125}, - {"label":"?", "x":13.8, "y":3.375}, - {"label":"_", "x":14.8, "y":3.375}, + {"matrix": [9, 6], "x": 8.8, "y": 3.5}, + {"matrix": [9, 5], "x": 9.8, "y": 3.25}, + {"matrix": [9, 4], "x": 10.8, "y": 3.125}, + {"matrix": [9, 3], "x": 11.8, "y": 3}, + {"matrix": [9, 2], "x": 12.8, "y": 3.125}, + {"matrix": [9, 1], "x": 13.8, "y": 3.375}, + {"matrix": [9, 0], "x": 14.8, "y": 3.375}, - {"label":"Ctrl", "x":0, "y":4.375}, - {"label":"Win", "x":1, "y":4.375}, - {"label":"↑", "x":2.125, "y":4.5}, - {"label":"Alt", "x":3.25, "y":4.375}, - {"label":"Ent", "x":4.25, "y":4.375}, - {"label":"BS", "x":5.35, "y":4.625}, - {"label":"Del", "x":6.4, "y":5.125}, + {"matrix": [4, 0], "x": 0, "y": 4.375}, + {"matrix": [4, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 2], "x": 2.125, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.375}, + {"matrix": [4, 4], "x": 4.25, "y": 4.375}, + {"matrix": [4, 5], "x": 5.35, "y": 4.625}, + {"matrix": [4, 6], "x": 6.4, "y": 5.125}, - {"label":"BS", "x":8.4, "y":5.125}, - {"label":"Del", "x":9.45, "y":4.625}, - {"label":"Spc", "x":10.55, "y":4.375}, - {"label":"Alt", "x":11.55, "y":4.375}, - {"label":"↑", "x":12.675, "y":4.5}, - {"label":"Alt", "x":13.8, "y":4.375}, - {"label":"App", "x":14.8, "y":4.375}, + {"matrix": [10, 6], "x": 8.4, "y": 5.125}, + {"matrix": [10, 5], "x": 9.45, "y": 4.625}, + {"matrix": [10, 4], "x": 10.55, "y": 4.375}, + {"matrix": [10, 3], "x": 11.55, "y": 4.375}, + {"matrix": [10, 2], "x": 12.675, "y": 4.5}, + {"matrix": [10, 1], "x": 13.8, "y": 4.375}, + {"matrix": [10, 0], "x": 14.8, "y": 4.375}, - {"label":"←", "x":1.125, "y":5.5}, - {"label":"⇓", "x":2.125, "y":5.5}, - {"label":"→", "x":3.125, "y":5.5}, + {"matrix": [5, 1], "x": 1.125, "y": 5.5}, + {"matrix": [5, 2], "x": 2.125, "y": 5.5}, + {"matrix": [5, 3], "x": 3.125, "y": 5.5}, - {"label":"←", "x":11.675, "y":5.5}, - {"label":"⇓", "x":12.675, "y":5.5}, - {"label":"→", "x":13.675, "y":5.5} + {"matrix": [11, 3], "x": 11.675, "y": 5.5}, + {"matrix": [11, 2], "x": 12.675, "y": 5.5}, + {"matrix": [11, 1], "x": 13.675, "y": 5.5} ] } } + } diff --git a/keyboards/salicylic_acid3/getta25/getta25.c b/keyboards/salicylic_acid3/getta25/getta25.c deleted file mode 100644 index 4f8cc63b42..0000000000 --- a/keyboards/salicylic_acid3/getta25/getta25.c +++ /dev/null @@ -1 +0,0 @@ -#include "getta25.h" diff --git a/keyboards/salicylic_acid3/getta25/getta25.h b/keyboards/salicylic_acid3/getta25/getta25.h deleted file mode 100644 index 67632bba4d..0000000000 --- a/keyboards/salicylic_acid3/getta25/getta25.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_salicylic_acid3_getta25_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h index 479aa6c3f7..cdc803a98c 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/config.h +++ b/keyboards/salicylic_acid3/getta25/rev1/config.h @@ -18,21 +18,11 @@ 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, B2 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 9 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json index 7443540704..c128df0f79 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/info.json +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -8,36 +8,49 @@ "pid": "0x3060", "device_version": "0.1.3" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"=", "x":2, "y":0}, - {"label":"DEL", "x":3, "y":0}, - {"label":"Num Lock", "x":0, "y":1.25}, - {"label":"/", "x":1, "y":1.25}, - {"label":"*", "x":2, "y":1.25}, - {"label":"-", "x":3, "y":1.25}, - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "x":2, "y":2.25}, - {"label":"ESC", "x":4.25, "y":2.25}, - {"label":"4", "x":0, "y":3.25}, - {"label":"5", "x":1, "y":3.25}, - {"label":"6", "x":2, "y":3.25}, - {"label":"+", "x":3, "y":2.25, "h":2}, - {"label":"F2", "x":4.25, "y":3.25}, - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.25}, - {"label":"DEL", "x":4.25, "y":4.25}, - {"label":"0", "x":0, "y":5.25, "w":2}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":4.25, "h":2}, - {"label":"BSPC", "x":4.25, "y":5.25} + {"matrix": [0, 5], "x": 0, "y": 0}, + {"matrix": [1, 5], "x": 1, "y": 0}, + {"matrix": [2, 5], "x": 2, "y": 0}, + {"matrix": [3, 5], "x": 3, "y": 0}, + + {"matrix": [0, 4], "x": 0, "y": 1.25}, + {"matrix": [1, 4], "x": 1, "y": 1.25}, + {"matrix": [2, 4], "x": 2, "y": 1.25}, + {"matrix": [3, 4], "x": 3, "y": 1.25}, + + {"matrix": [0, 3], "x": 0, "y": 2.25}, + {"matrix": [1, 3], "x": 1, "y": 2.25}, + {"matrix": [2, 3], "x": 2, "y": 2.25}, + {"matrix": [4, 3], "x": 4.25, "y": 2.25}, + + {"matrix": [0, 2], "x": 0, "y": 3.25}, + {"matrix": [1, 2], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2}, + {"matrix": [4, 2], "x": 4.25, "y": 3.25}, + + {"matrix": [0, 1], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [2, 1], "x": 2, "y": 4.25}, + {"matrix": [4, 1], "x": 4.25, "y": 4.25}, + + {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [2, 0], "x": 2, "y": 5.25}, + {"matrix": [3, 0], "x": 3, "y": 4.25, "h": 2}, + {"matrix": [4, 0], "x": 4.25, "y": 5.25} ] } } diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.c b/keyboards/salicylic_acid3/getta25/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/salicylic_acid3/getta25/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h deleted file mode 100644 index 98f4318a6a..0000000000 --- a/keyboards/salicylic_acid3/getta25/rev1/rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include "getta25.h" - -/* - * ,-----------------------. - * | L05 | L15 | L25 | L35 | - * |-----------------------+ - * | L04 | L14 | L24 | L34 | - * |-----------------------------+ - * | L03 | L13 | L23 | | L43 | - * |-----------------------------+ - * | L02 | L12 | L22 | L32 | L42 | - * |-----------------------------+ - * | L01 | L11 | L21 | | L41 | - * |-----------------------------+ - * | L00 | | L20 | L30 | L40 | - * ,-----------------------------' - */ - -#define LAYOUT( \ - L05, L15, L25, L35, \ - L04, L14, L24, L34, \ - L03, L13, L23, L43, \ - L02, L12, L22, L32, L42, \ - L01, L11, L21, L41, \ - L00, L20, L30, L40 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - {KC_NO, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30,KC_NO, L32,KC_NO, L34, L35 }, \ - { L40, L41, L42, L43,KC_NO,KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/guide68/info.json b/keyboards/salicylic_acid3/guide68/info.json index 3bd04677b7..8cf8504aba 100644 --- a/keyboards/salicylic_acid3/guide68/info.json +++ b/keyboards/salicylic_acid3/guide68/info.json @@ -26,7 +26,6 @@ }, "rgblight": { "led_count": 12, - "pin": "D3", "animations": { "alternating": true, "breathing": true, @@ -44,6 +43,9 @@ "split": true, "split_count": [ 6, 6 ] }, + "ws2812": { + "pin": "D3" + }, "split": { "enabled": true, "transport": { diff --git a/keyboards/salicylic_acid3/jisplit89/jisplit89.c b/keyboards/salicylic_acid3/jisplit89/jisplit89.c deleted file mode 100644 index 0f03aa4ce2..0000000000 --- a/keyboards/salicylic_acid3/jisplit89/jisplit89.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 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 "jisplit89.h" diff --git a/keyboards/salicylic_acid3/jisplit89/jisplit89.h b/keyboards/salicylic_acid3/jisplit89/jisplit89.h deleted file mode 100644 index 8de2326de6..0000000000 --- a/keyboards/salicylic_acid3/jisplit89/jisplit89.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 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 - -#ifdef KEYBOARD_salicylic_acid3_jisplit89_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h index 65b373f168..51b6d454e5 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/config.h +++ b/keyboards/salicylic_acid3/jisplit89/rev1/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 } - -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN B6 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ @@ -30,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 32 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json index 53f61f87f2..d0d3f1df63 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -8,103 +8,127 @@ "pid": "0xEB4F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":10.75, "y":0}, - {"label":"F10", "x":11.75, "y":0}, - {"label":"F11", "x":12.75, "y":0}, - {"label":"F12", "x":13.75, "y":0}, - {"label":"Insert", "x":15, "y":0}, - {"label":"Print Screen", "x":16, "y":0}, - {"label":"Hankaku/Zenkaku", "x":0, "y":1.25}, - {"label":"!", "x":1, "y":1.25}, - {"label":"\"", "x":2, "y":1.25}, - {"label":"#", "x":3, "y":1.25}, - {"label":"$", "x":4, "y":1.25}, - {"label":"%", "x":5, "y":1.25}, - {"label":"&", "x":7, "y":1.25}, - {"label":"'", "x":8, "y":1.25}, - {"label":"(", "x":9, "y":1.25}, - {"label":")", "x":10, "y":1.25}, - {"label":"", "x":11, "y":1.25}, - {"label":"=", "x":12, "y":1.25}, - {"label":"~", "x":13, "y":1.25}, - {"label":"|", "x":14, "y":1.25}, - {"label":"Back", "x":15, "y":1.25}, - {"label":"Del", "x":16, "y":1.25}, - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":7.5, "y":2.25}, - {"label":"U", "x":8.5, "y":2.25}, - {"label":"I", "x":9.5, "y":2.25}, - {"label":"O", "x":10.5, "y":2.25}, - {"label":"P", "x":11.5, "y":2.25}, - {"label":"`", "x":12.5, "y":2.25}, - {"label":"{", "x":13.5, "y":2.25}, - {"label":"Return", "x":14.75, "y":2.25, "w":1.25, "h":2}, - {"label":"Home", "x":16, "y":2.25}, - {"label":"Caps", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":7.75, "y":3.25}, - {"label":"J", "x":8.75, "y":3.25}, - {"label":"K", "x":9.75, "y":3.25}, - {"label":"L", "x":10.75, "y":3.25}, - {"label":"+", "x":11.75, "y":3.25}, - {"label":"*", "x":12.75, "y":3.25}, - {"label":"}", "x":13.75, "y":3.25}, - {"label":"End", "x":16, "y":3.25}, - {"label":"Shift", "x":0, "y":4.25, "w":2}, - {"label":"Z", "x":2, "y":4.25}, - {"label":"X", "x":3, "y":4.25}, - {"label":"C", "x":4, "y":4.25}, - {"label":"V", "x":5, "y":4.25}, - {"label":"B", "x":6, "y":4.25}, - {"label":"N", "x":8, "y":4.25}, - {"label":"M", "x":9, "y":4.25}, - {"label":"<", "x":10, "y":4.25}, - {"label":">", "x":11, "y":4.25}, - {"label":"?", "x":12, "y":4.25}, - {"label":"_", "x":13, "y":4.25}, - {"label":"PgDwn", "x":14, "y":4.25}, - {"label":"Up", "x":15, "y":4.25}, - {"label":"PgUp", "x":16, "y":4.25}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.25}, - {"label":"Alt", "x":2.25, "y":5.25, "w":1.25}, - {"label":"Muhenkan", "x":3.5, "y":5.25}, - {"label":"Alt", "x":4.5, "y":5.25, "w":1.25}, - {"label":"1", "x":5.75, "y":5.25}, - {"label":"2", "x":7.75, "y":5.25}, - {"label":"Ctrl", "x":8.75, "y":5.25, "w":1.25}, - {"label":"Henkan", "x":10, "y":5.25, "w":1.25}, - {"label":"Kana", "x":11.25, "y":5.25, "w":1.25}, - {"label":"App", "x":12.5, "y":5.25}, - {"label":"Left", "x":14, "y":5.25}, - {"label":"Down", "x":15, "y":5.25}, - {"label":"Right", "x":16, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [7, 1], "x": 8.5, "y": 0}, + {"matrix": [7, 2], "x": 9.5, "y": 0}, + + {"matrix": [7, 3], "x": 10.75, "y": 0}, + {"matrix": [7, 4], "x": 11.75, "y": 0}, + {"matrix": [7, 5], "x": 12.75, "y": 0}, + {"matrix": [7, 6], "x": 13.75, "y": 0}, + + {"matrix": [7, 7], "x": 15, "y": 0}, + {"matrix": [13, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [8, 0], "x": 7, "y": 1.25}, + {"matrix": [8, 1], "x": 8, "y": 1.25}, + {"matrix": [8, 2], "x": 9, "y": 1.25}, + {"matrix": [8, 3], "x": 10, "y": 1.25}, + {"matrix": [8, 4], "x": 11, "y": 1.25}, + {"matrix": [8, 5], "x": 12, "y": 1.25}, + {"matrix": [8, 6], "x": 13, "y": 1.25}, + {"matrix": [8, 7], "x": 14, "y": 1.25}, + {"matrix": [13, 1], "x": 15, "y": 1.25}, + {"matrix": [13, 2], "x": 16, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + + {"matrix": [9, 0], "x": 7.5, "y": 2.25}, + {"matrix": [9, 1], "x": 8.5, "y": 2.25}, + {"matrix": [9, 2], "x": 9.5, "y": 2.25}, + {"matrix": [9, 3], "x": 10.5, "y": 2.25}, + {"matrix": [9, 4], "x": 11.5, "y": 2.25}, + {"matrix": [9, 5], "x": 12.5, "y": 2.25}, + {"matrix": [9, 6], "x": 13.5, "y": 2.25}, + {"matrix": [9, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [13, 3], "x": 16, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + + {"matrix": [10, 0], "x": 7.75, "y": 3.25}, + {"matrix": [10, 1], "x": 8.75, "y": 3.25}, + {"matrix": [10, 2], "x": 9.75, "y": 3.25}, + {"matrix": [10, 3], "x": 10.75, "y": 3.25}, + {"matrix": [10, 4], "x": 11.75, "y": 3.25}, + {"matrix": [10, 5], "x": 12.75, "y": 3.25}, + {"matrix": [10, 6], "x": 13.75, "y": 3.25}, + {"matrix": [10, 7], "x": 16, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4.25}, + {"matrix": [4, 2], "x": 3, "y": 4.25}, + {"matrix": [4, 3], "x": 4, "y": 4.25}, + {"matrix": [4, 4], "x": 5, "y": 4.25}, + {"matrix": [4, 5], "x": 6, "y": 4.25}, + + {"matrix": [11, 0], "x": 8, "y": 4.25}, + {"matrix": [11, 1], "x": 9, "y": 4.25}, + {"matrix": [11, 2], "x": 10, "y": 4.25}, + {"matrix": [11, 3], "x": 11, "y": 4.25}, + {"matrix": [11, 4], "x": 12, "y": 4.25}, + {"matrix": [11, 5], "x": 13, "y": 4.25}, + {"matrix": [11, 6], "x": 14, "y": 4.25}, + {"matrix": [11, 7], "x": 15, "y": 4.25}, + {"matrix": [12, 7], "x": 16, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25}, + {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 3.5, "y": 5.25}, + {"matrix": [5, 4], "x": 4.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 5.75, "y": 5.25}, + + {"matrix": [12, 0], "x": 7.75, "y": 5.25}, + {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 1.25}, + {"matrix": [12, 2], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [12, 3], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [12, 4], "x": 12.5, "y": 5.25}, + + {"matrix": [12, 5], "x": 14, "y": 5.25}, + {"matrix": [12, 6], "x": 15, "y": 5.25}, + {"matrix": [13, 4], "x": 16, "y": 5.25} ] } } diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c deleted file mode 100644 index 13e201e63a..0000000000 --- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 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 "rev1.h" diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h deleted file mode 100644 index 71515f5ef6..0000000000 --- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2020 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 "jisplit89.h" - -#include "quantum.h" - -/* - * ,-------------------------------------- ----------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R60 | - * |-------------------------------------- ------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R61 | R62 | - * |---------------------------------------------------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R63 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | | R37 | - * |---------------------------------------------------------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 | R47 | R57 | - * |------------------------------------------- -----------------------------------------------------+ - * | L50 | L51 | L52 | L53 | L54 | L55 | | R50 | R51 | R52 | R53 | R54 | | R55 | R56 | R64 | - * |---------------------------------------- ------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R60, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R61, R62, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R63, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R46, R47, R57, \ - L50, L51, L52, L53, L54, L55, R50, R51, R52, R53, R54, R55, R56, R64 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO }, \ - { L50, L51, L52, L53, L54, L55, KC_NO, KC_NO }, \ - {KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 }, \ - { R50, R51, R52, R53, R54, R55, R56, R57 }, \ - { R60, R61, R62, R63, R64, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h index f9312912ce..94d44bfce8 100644 --- a/keyboards/salicylic_acid3/nafuda/config.h +++ b/keyboards/salicylic_acid3/nafuda/config.h @@ -18,21 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4 } -#define MATRIX_COL_PINS { F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - /* 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 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 7 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json index 05cf322ccf..cbcc9f54fa 100644 --- a/keyboards/salicylic_acid3/nafuda/info.json +++ b/keyboards/salicylic_acid3/nafuda/info.json @@ -8,18 +8,26 @@ "pid": "0x3060", "device_version": "0.1.2" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6"], + "rows": ["D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Mouse", "x":1, "y":0}, - {"label":"Backspace", "x":0, "y":0.5}, - {"label":"\u2191", "x":1, "y":1}, - {"label":"Browser", "x":2, "y":0.5}, - {"label":"\u2190", "x":0, "y":1.5}, - {"label":"\u2193", "x":1, "y":2}, - {"label":"\u2192", "x":2, "y":1.5} + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 0.5}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 0.5}, + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 1.5} ] } } diff --git a/keyboards/salicylic_acid3/nafuda/nafuda.c b/keyboards/salicylic_acid3/nafuda/nafuda.c deleted file mode 100644 index 334b3dab27..0000000000 --- a/keyboards/salicylic_acid3/nafuda/nafuda.c +++ /dev/null @@ -1 +0,0 @@ -#include "nafuda.h" diff --git a/keyboards/salicylic_acid3/nafuda/nafuda.h b/keyboards/salicylic_acid3/nafuda/nafuda.h deleted file mode 100644 index 008a9c16f4..0000000000 --- a/keyboards/salicylic_acid3/nafuda/nafuda.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* - * ,-----------------. - * | | L01 | | - * |-----------------+ - * | L10 | L11 | L12 | - * |-----------------+ - * | L20 | L21 | L22 | - * |-----------------' - */ - -#define LAYOUT( \ - L01, \ - L10, L11, L12, \ - L20, L21, L22 \ - ) \ - { \ - {KC_NO, L01,KC_NO }, \ - { L10, L11, L12 }, \ - { L20, L21, L22 } \ - } diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk +++ /dev/null diff --git a/keyboards/salicylic_acid3/naked48/naked48.c b/keyboards/salicylic_acid3/naked48/naked48.c deleted file mode 100644 index c2a10ed3e6..0000000000 --- a/keyboards/salicylic_acid3/naked48/naked48.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 "naked48.h" diff --git a/keyboards/salicylic_acid3/naked48/naked48.h b/keyboards/salicylic_acid3/naked48/naked48.h deleted file mode 100644 index bbfa6d2e84..0000000000 --- a/keyboards/salicylic_acid3/naked48/naked48.h +++ /dev/null @@ -1,24 +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" - -#ifdef KEYBOARD_salicylic_acid3_naked48_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h index 8adf11f4df..c7246fad76 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/config.h +++ b/keyboards/salicylic_acid3/naked48/rev1/config.h @@ -17,23 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D7, E6, B4, B5 } -// When using Nafuda, comment out MATRIX_ROW_PINS_RIGHT and MATRIX_COL_PINS_RIGHT. -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5, B2, B2 } - -#define DIODE_DIRECTION COL2ROW - /* 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 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifndef RGBLED_NUM #define RGBLED_NUM 48 #endif diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json index 5dc05a02d0..968965e51c 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -8,8 +8,25 @@ "pid": "0xE8BA", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "B4", "B5"], + "rows": ["D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"], + "rows": ["D4", "C6", "D7", "E6"] + } + } + }, + "ws2812": { + "pin": "D3" }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c index 0129b6c1a3..5c9d8035c0 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/rev1.c +++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.c @@ -15,7 +15,7 @@ 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 "naked48.h" +#include "rev1.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.h b/keyboards/salicylic_acid3/naked48/rev1/rev1.h index eee5c4185f..d43e9f4fb3 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/rev1.h +++ b/keyboards/salicylic_acid3/naked48/rev1/rev1.h @@ -17,22 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "naked48.h" - #include "quantum.h" #ifdef RGBLIGHT_ENABLE //rgb led driver #include "ws2812.h" #endif -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - ////////////////////////////////////////////////////////////////////////////// // When only use Naked48. ////////////////////////////////////////////////////////////////////////////// diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk index 956ae2cefc..033ade5a49 100644 --- a/keyboards/salicylic_acid3/naked48/rules.mk +++ b/keyboards/salicylic_acid3/naked48/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = no -RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes diff --git a/keyboards/salicylic_acid3/naked60/naked60.c b/keyboards/salicylic_acid3/naked60/naked60.c deleted file mode 100644 index d1d46394f6..0000000000 --- a/keyboards/salicylic_acid3/naked60/naked60.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 "naked60.h" diff --git a/keyboards/salicylic_acid3/naked60/naked60.h b/keyboards/salicylic_acid3/naked60/naked60.h deleted file mode 100644 index 9ad73df67f..0000000000 --- a/keyboards/salicylic_acid3/naked60/naked60.h +++ /dev/null @@ -1,24 +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" - -#ifdef KEYBOARD_salicylic_acid3_naked60_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h index d7e3f223ea..2f62289261 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/config.h +++ b/keyboards/salicylic_acid3/naked60/rev1/config.h @@ -17,18 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// Rows are doubled-up -#define MATRIX_ROW_PINS { B6, D1, D0, D4, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D7, E6, B4, B5, D3 } -// When using Setta21 -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B2 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5, B2, B2 } -// When using Nafuda -//#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, B6 } -//#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, D7, E6, B4, B5, D3 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json index 2f46e127ea..92da4070a5 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/info.json +++ b/keyboards/salicylic_acid3/naked60/rev1/info.json @@ -8,8 +8,19 @@ "pid": "0xEB5C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D7", "E6", "B4", "B5", "D3"], + "rows": ["B6", "D1", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B4", "B5", "B2", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B2"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.c b/keyboards/salicylic_acid3/naked60/rev1/rev1.c deleted file mode 100644 index d1d46394f6..0000000000 --- a/keyboards/salicylic_acid3/naked60/rev1/rev1.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 "naked60.h" diff --git a/keyboards/salicylic_acid3/naked60/rev1/rev1.h b/keyboards/salicylic_acid3/naked60/rev1/rev1.h index 12798022e9..fcb26d5fc2 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/rev1.h +++ b/keyboards/salicylic_acid3/naked60/rev1/rev1.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "naked60.h" - #include "quantum.h" diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk +++ /dev/null diff --git a/keyboards/salicylic_acid3/naked64/naked64.c b/keyboards/salicylic_acid3/naked64/naked64.c deleted file mode 100644 index a2863f0477..0000000000 --- a/keyboards/salicylic_acid3/naked64/naked64.c +++ /dev/null @@ -1 +0,0 @@ -#include "naked64.h" diff --git a/keyboards/salicylic_acid3/naked64/naked64.h b/keyboards/salicylic_acid3/naked64/naked64.h deleted file mode 100644 index cb73e2142d..0000000000 --- a/keyboards/salicylic_acid3/naked64/naked64.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_salicylic_acid3_naked64_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/salicylic_acid3/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h index 11031a4f25..33ee2b5030 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/config.h +++ b/keyboards/salicylic_acid3/naked64/rev1/config.h @@ -18,22 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, D3 } -#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4, B5, B2, B2 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* 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 -/* ws2812 RGB LED */ -#define RGB_DI_PIN B6 - #define RGBLED_NUM 12 // Number of LEDs #define RGBLIGHT_LED_MAP { 0, 1, 3, 2, 2, 3, 2, 3, 4, 5, 6, 7 } diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json index 52a7c2906e..7eed51635b 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/info.json +++ b/keyboards/salicylic_acid3/naked64/rev1/info.json @@ -8,8 +8,22 @@ "pid": "0x3060", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5", "B2", "B2"] + } + } + }, + "ws2812": { + "pin": "B6" }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.c b/keyboards/salicylic_acid3/naked64/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/salicylic_acid3/naked64/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/salicylic_acid3/naked64/rev1/rev1.h b/keyboards/salicylic_acid3/naked64/rev1/rev1.h index 0ac804ee0f..d8965556c7 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/rev1.h +++ b/keyboards/salicylic_acid3/naked64/rev1/rev1.h @@ -1,6 +1,6 @@ #pragma once -#include "naked64.h" +#include "quantum.h" ////////////////////////////////////////////////////////////////////////////// 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..9dfb147f42 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -8,84 +8,108 @@ "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 } \ - } diff --git a/keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h index 69ef56fe6e..65091cadc0 100644 --- a/keyboards/salicylic_acid3/nknl7jp/config.h +++ b/keyboards/salicylic_acid3/nknl7jp/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 20 #define RGBLIGHT_SPLIT diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json index 7338cb15fe..3eb51b4965 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/info.json @@ -8,85 +8,110 @@ "pid": "0xEA55", "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":"ESC", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"\"", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"&", "x":6.75, "y":0}, - {"label":"'", "x":7.75, "y":0}, - {"label":"(", "x":8.75, "y":0}, - {"label":")", "x":9.75, "y":0}, - {"label":"", "x":10.75, "y":0}, - {"label":"=", "x":11.75, "y":0}, - {"label":"~", "x":12.75, "y":0}, - {"label":"|", "x":13.75, "y":0}, - {"label":"Back", "x":14.75, "y":0}, - {"label":"Del", "x":16.25, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.25, "y":1}, - {"label":"U", "x":8.25, "y":1}, - {"label":"I", "x":9.25, "y":1}, - {"label":"O", "x":10.25, "y":1}, - {"label":"P", "x":11.25, "y":1}, - {"label":"`", "x":12.25, "y":1}, - {"label":"{", "x":13.25, "y":1}, - {"label":"Return", "x":14.5, "y":1, "w":1.25, "h":2}, - {"label":"Page", "x":16.25, "y":1}, - {"label":"CapsLock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.5, "y":2}, - {"label":"J", "x":8.5, "y":2}, - {"label":"K", "x":9.5, "y":2}, - {"label":"L", "x":10.5, "y":2}, - {"label":":", "x":11.5, "y":2}, - {"label":"\"", "x":12.5, "y":2}, - {"label":"}", "x":13.5, "y":2}, - {"label":"Page", "x":16.25, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8, "y":3}, - {"label":"M", "x":9, "y":3}, - {"label":"<", "x":10, "y":3}, - {"label":">", "x":11, "y":3}, - {"label":"?", "x":12, "y":3}, - {"label":"_", "x":13, "y":3}, - {"label":"App", "x":14, "y":3}, - {"label":"\u2191", "x":15.25, "y":3.25}, - {"label":"Control", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4, "w":1.25}, - {"label":"\u7121\u5909", "x":3.5, "y":4}, - {"x":4.5, "y":4, "w":1.25}, {"x":5.75, "y":4}, - {"x":7.5, "y":4}, {"x":8.5, "y":4, "w":1.75}, - {"label":"\u5909\u63db", "x":10.25, "y":4, "w":1.25}, - {"label":"\u304b\u306a", "x":11.5, "y":4, "w":1.25}, - {"label":"Alt", "x":12.75, "y":4, "w":1.25}, - {"label":"\u2190", "x":14.25, "y":4.25}, - {"label":"\u2193", "x":15.25, "y":4.25}, - {"label":"\u2192", "x":16.25, "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}, + {"matrix": [5, 8], "x": 14.75, "y": 0}, + + {"matrix": [6, 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.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [7, 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}, + + {"matrix": [7, 7], "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}, + {"matrix": [8, 6], "x": 14, "y": 3}, + + {"matrix": [8, 7], "x": 15.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4}, + + {"matrix": [9, 0], "x": 7.5, "y": 4}, + {"matrix": [9, 1], "x": 8.5, "y": 4, "w": 1.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, "w": 1.25}, + + {"matrix": [9, 7], "x": 14.25, "y": 4.25}, + {"matrix": [8, 8], "x": 15.25, "y": 4.25}, + {"matrix": [9, 8], "x": 16.25, "y": 4.25} + ] } } } diff --git a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c deleted file mode 100644 index 0395a3b678..0000000000 --- a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.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 "nknl7jp.h" diff --git a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h deleted file mode 100644 index 3984ac7788..0000000000 --- a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.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 | R18 | - * |---------------------------------------------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R28 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | - * |---------------------------------------------------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37| - * |------------------------------------------- -----------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R47 | R38 | R48 | - * |---------------------------------------- --------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, R18, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R28, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R47, R38, R48 \ - ) \ - { \ - { 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, L45, 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, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { R40, R41, R42, R43, R44, KC_NO, KC_NO, R47, R48 } \ - } diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h index 6672b0014c..eb9e0b5b1d 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/config.h +++ b/keyboards/salicylic_acid3/setta21/rev1/config.h @@ -18,20 +18,11 @@ 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 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -#define DIODE_DIRECTION COL2ROW - /* 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 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 21 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json index a798c25e63..642bde6298 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/info.json +++ b/keyboards/salicylic_acid3/setta21/rev1/info.json @@ -8,38 +8,49 @@ "pid": "0x3060", "device_version": "0.1.1" }, + "ws2812": { + "pin": "D3" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_6x4"], "layouts": { "LAYOUT_numpad_6x4": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"\uff1d", "x":2, "y":0}, - {"label":"Del", "x":3, "y":0}, + {"matrix": [0, 5], "x": 0, "y": 0}, + {"matrix": [1, 5], "x": 1, "y": 0}, + {"matrix": [2, 5], "x": 2, "y": 0}, + {"matrix": [3, 5], "x": 3, "y": 0}, - {"label":"Num Lock", "x":0, "y":1.25}, - {"label":"/", "x":1, "y":1.25}, - {"label":"*", "x":2, "y":1.25}, - {"label":"-", "x":3, "y":1.25}, + {"matrix": [0, 4], "x": 0, "y": 1.25}, + {"matrix": [1, 4], "x": 1, "y": 1.25}, + {"matrix": [2, 4], "x": 2, "y": 1.25}, + {"matrix": [3, 4], "x": 3, "y": 1.25}, - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "x":2, "y":2.25}, + {"matrix": [0, 3], "x": 0, "y": 2.25}, + {"matrix": [1, 3], "x": 1, "y": 2.25}, + {"matrix": [2, 3], "x": 2, "y": 2.25}, - {"label":"4", "x":0, "y":3.25}, - {"label":"5", "x":1, "y":3.25}, - {"label":"6", "x":2, "y":3.25}, - {"label":"+", "x":3, "y":2.25, "h":2}, + {"matrix": [0, 2], "x": 0, "y": 3.25}, + {"matrix": [1, 2], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2}, - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.25}, + {"matrix": [0, 1], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [2, 1], "x": 2, "y": 4.25}, - {"label":"0", "x":0, "y":5.25, "w":2}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":4.25, "h":2} + {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [2, 0], "x": 2, "y": 5.25}, + {"matrix": [3, 0], "x": 3, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.c b/keyboards/salicylic_acid3/setta21/rev1/rev1.c index b377452770..c31fe5c8f3 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/rev1.c +++ b/keyboards/salicylic_acid3/setta21/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h deleted file mode 100644 index 772c843c57..0000000000 --- a/keyboards/salicylic_acid3/setta21/rev1/rev1.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "setta21.h" - -#define LAYOUT_numpad_6x4( \ - L05, L15, L25, L35, \ - L04, L14, L24, L34, \ - L03, L13, L23, \ - L02, L12, L22, L32, \ - L01, L11, L21, \ - L00, L20, L30 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - {KC_NO, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30,KC_NO, L32,KC_NO, L34, L35 } \ - } diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk index ee8bd4cc40..d4aab3ee3f 100644 --- a/keyboards/salicylic_acid3/setta21/rules.mk +++ b/keyboards/salicylic_acid3/setta21/rules.mk @@ -13,6 +13,5 @@ RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. OLED_ENABLE = no USE_I2C = no RGB_MATRIX_ENABLE = no -RGB_MATRIX_DRIVER = WS2812 DEFAULT_FOLDER = salicylic_acid3/setta21/rev1 diff --git a/keyboards/salicylic_acid3/setta21/setta21.c b/keyboards/salicylic_acid3/setta21/setta21.c deleted file mode 100644 index 73c07682f7..0000000000 --- a/keyboards/salicylic_acid3/setta21/setta21.c +++ /dev/null @@ -1 +0,0 @@ -#include "setta21.h" diff --git a/keyboards/salicylic_acid3/setta21/setta21.h b/keyboards/salicylic_acid3/setta21/setta21.h deleted file mode 100644 index 9e5b17e2c3..0000000000 --- a/keyboards/salicylic_acid3/setta21/setta21.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_salicylic_acid3_setta21_rev1 - #include "rev1.h" -#endif |