diff options
Diffstat (limited to 'keyboards/salicylic_acid3/naked48')
-rw-r--r-- | keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk | 0 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/naked48.c | 18 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/naked48.h | 24 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/rev1/config.h | 12 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/rev1/info.json | 443 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/rev1/rev1.h | 109 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/rules.mk | 1 |
8 files changed, 205 insertions, 404 deletions
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..9a50c83ad7 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/info.json +++ b/keyboards/salicylic_acid3/naked48/rev1/info.json @@ -8,252 +8,217 @@ "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", "layouts": { "LAYOUT": { "layout": [ - { - "label":"Tab", - "x":0, - "y":0 - }, - { - "label":"Q", - "x":1, - "y":0 - }, - { - "label":"W", - "x":2, - "y":0 - }, - { - "label":"E", - "x":3, - "y":0 - }, - { - "label":"R", - "x":4, - "y":0 - }, - { - "label":"T", - "x":5, - "y":0 - }, - { - "label":"Y", - "x":8, - "y":0 - }, - { - "label":"U", - "x":9, - "y":0 - }, - { - "label":"I", - "x":10, - "y":0 - }, - { - "label":"O", - "x":11, - "y":0 - }, - { - "label":"P", - "x":12, - "y":0 - }, - { - "label":"Back Space", - "x":13, - "y":0 - }, - { - "label":"Esc", - "x":0, - "y":1 - }, - { - "label":"A", - "x":1, - "y":1 - }, - { - "label":"S", - "x":2, - "y":1 - }, - { - "label":"D", - "x":3, - "y":1 - }, - { - "label":"F", - "x":4, - "y":1 - }, - { - "label":"G", - "x":5, - "y":1 - }, - { - "label":"H", - "x":8, - "y":1 - }, - { - "label":"J", - "x":9, - "y":1 - }, - { - "label":"K", - "x":10, - "y":1 - }, - { - "label":"L", - "x":11, - "y":1 - }, - { - "label":";", - "x":12, - "y":1 - }, - { - "label":"'", - "x":13, - "y":1 - }, - { - "label":"Shift", - "x":0, - "y":2 - }, - { - "label":"Z", - "x":1, - "y":2 - }, - { - "label":"X", - "x":2, - "y":2 - }, - { - "label":"C", - "x":3, - "y":2 - }, - { - "label":"V", - "x":4, - "y":2 - }, - { - "label":"B", - "x":5, - "y":2 - }, - { - "label":"N", - "x":8, - "y":2 - }, - { - "label":"M", - "x":9, - "y":2 - }, - { - "label":",", - "x":10, - "y":2 - }, - { - "label":".", - "x":11, - "y":2 - }, - { - "label":"/", - "x":12, - "y":2 - }, - { - "label":"Enter", - "x":13, - "y":2 - }, - { - "label":"Adjust", - "x":1, - "y":3 - }, - { - "label":"Ctrl", - "x":2, - "y":3 - }, - { - "label":"Alt", - "x":3, - "y":3 - }, - { - "label":"GUI", - "x":4, - "y":3 - }, - { - "label":"⇓", - "x":5, - "y":3 - }, - { - "x":6, - "y":3 - }, - { - "x":7, - "y":3 - }, - { - "label":"⇑", - "x":8, - "y":3 - }, - { - "label":"←", - "x":9, - "y":3 - }, - { - "label":"↓", - "x":10, - "y":3 - }, - { - "label":"↑", - "x":11, - "y":3 - }, - { - "label":"→", - "x":12, - "y":3 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3} + ] + }, + "LAYOUT_with_nafuda": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0}, + {"matrix": [1, 0], "x": 13, "y": 0}, + {"matrix": [1, 1], "x": 14, "y": 0}, + {"matrix": [1, 2], "x": 15, "y": 0}, + {"matrix": [1, 3], "x": 16, "y": 0}, + {"matrix": [1, 4], "x": 17, "y": 0}, + {"matrix": [1, 5], "x": 18, "y": 0}, + {"matrix": [1, 6], "x": 19, "y": 0}, + {"matrix": [1, 7], "x": 20, "y": 0}, + {"matrix": [1, 8], "x": 21, "y": 0}, + {"matrix": [1, 9], "x": 22, "y": 0}, + {"matrix": [1, 10], "x": 23, "y": 0}, + {"matrix": [1, 11], "x": 24, "y": 0}, + {"matrix": [5, 0], "x": 25, "y": 0}, + {"matrix": [5, 1], "x": 26, "y": 0}, + {"matrix": [5, 2], "x": 27, "y": 0}, + {"matrix": [2, 0], "x": 28, "y": 0}, + {"matrix": [2, 1], "x": 29, "y": 0}, + {"matrix": [2, 2], "x": 30, "y": 0}, + {"matrix": [2, 3], "x": 31, "y": 0}, + {"matrix": [2, 4], "x": 32, "y": 0}, + {"matrix": [2, 5], "x": 33, "y": 0}, + {"matrix": [2, 6], "x": 34, "y": 0}, + {"matrix": [2, 7], "x": 35, "y": 0}, + {"matrix": [2, 8], "x": 36, "y": 0}, + {"matrix": [2, 9], "x": 37, "y": 0}, + {"matrix": [2, 10], "x": 38, "y": 0}, + {"matrix": [2, 11], "x": 39, "y": 0}, + {"matrix": [6, 0], "x": 40, "y": 0}, + {"matrix": [6, 1], "x": 41, "y": 0}, + {"matrix": [6, 2], "x": 42, "y": 0}, + {"matrix": [3, 0], "x": 43, "y": 0}, + {"matrix": [3, 1], "x": 44, "y": 0}, + {"matrix": [3, 2], "x": 45, "y": 0}, + {"matrix": [3, 3], "x": 46, "y": 0}, + {"matrix": [3, 4], "x": 47, "y": 0}, + {"matrix": [3, 5], "x": 48, "y": 0}, + {"matrix": [3, 6], "x": 49, "y": 0}, + {"matrix": [3, 7], "x": 50, "y": 0}, + {"matrix": [3, 8], "x": 51, "y": 0}, + {"matrix": [3, 9], "x": 52, "y": 0}, + {"matrix": [3, 10], "x": 53, "y": 0}, + {"matrix": [3, 11], "x": 54, "y": 0} + ] + }, + "LAYOUT_with_setta21": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [4, 0], "x": 12, "y": 0}, + {"matrix": [4, 1], "x": 13, "y": 0}, + {"matrix": [4, 2], "x": 14, "y": 0}, + {"matrix": [4, 3], "x": 15, "y": 0}, + {"matrix": [4, 4], "x": 16, "y": 0}, + {"matrix": [4, 5], "x": 17, "y": 0}, + {"matrix": [1, 0], "x": 18, "y": 0}, + {"matrix": [1, 1], "x": 19, "y": 0}, + {"matrix": [1, 2], "x": 20, "y": 0}, + {"matrix": [1, 3], "x": 21, "y": 0}, + {"matrix": [1, 4], "x": 22, "y": 0}, + {"matrix": [1, 5], "x": 23, "y": 0}, + {"matrix": [1, 6], "x": 24, "y": 0}, + {"matrix": [1, 7], "x": 25, "y": 0}, + {"matrix": [1, 8], "x": 26, "y": 0}, + {"matrix": [1, 9], "x": 27, "y": 0}, + {"matrix": [1, 10], "x": 28, "y": 0}, + {"matrix": [1, 11], "x": 29, "y": 0}, + {"matrix": [5, 1], "x": 30, "y": 0}, + {"matrix": [5, 2], "x": 31, "y": 0}, + {"matrix": [5, 3], "x": 32, "y": 0}, + {"matrix": [5, 4], "x": 33, "y": 0}, + {"matrix": [5, 5], "x": 34, "y": 0}, + {"matrix": [2, 0], "x": 35, "y": 0}, + {"matrix": [2, 1], "x": 36, "y": 0}, + {"matrix": [2, 2], "x": 37, "y": 0}, + {"matrix": [2, 3], "x": 38, "y": 0}, + {"matrix": [2, 4], "x": 39, "y": 0}, + {"matrix": [2, 5], "x": 40, "y": 0}, + {"matrix": [2, 6], "x": 41, "y": 0}, + {"matrix": [2, 7], "x": 42, "y": 0}, + {"matrix": [2, 8], "x": 43, "y": 0}, + {"matrix": [2, 9], "x": 44, "y": 0}, + {"matrix": [2, 10], "x": 45, "y": 0}, + {"matrix": [2, 11], "x": 46, "y": 0}, + {"matrix": [6, 0], "x": 47, "y": 0}, + {"matrix": [6, 1], "x": 48, "y": 0}, + {"matrix": [6, 2], "x": 49, "y": 0}, + {"matrix": [6, 3], "x": 50, "y": 0}, + {"matrix": [6, 4], "x": 51, "y": 0}, + {"matrix": [6, 5], "x": 52, "y": 0}, + {"matrix": [3, 0], "x": 53, "y": 0}, + {"matrix": [3, 1], "x": 54, "y": 0}, + {"matrix": [3, 2], "x": 55, "y": 0}, + {"matrix": [3, 3], "x": 56, "y": 0}, + {"matrix": [3, 4], "x": 57, "y": 0}, + {"matrix": [3, 5], "x": 58, "y": 0}, + {"matrix": [3, 6], "x": 59, "y": 0}, + {"matrix": [3, 7], "x": 60, "y": 0}, + {"matrix": [3, 8], "x": 61, "y": 0}, + {"matrix": [3, 9], "x": 62, "y": 0}, + {"matrix": [3, 10], "x": 63, "y": 0}, + {"matrix": [3, 11], "x": 64, "y": 0}, + {"matrix": [7, 0], "x": 65, "y": 0}, + {"matrix": [7, 2], "x": 66, "y": 0}, + {"matrix": [7, 4], "x": 67, "y": 0}, + {"matrix": [7, 5], "x": 68, "y": 0} ] } } diff --git a/keyboards/salicylic_acid3/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c index 0129b6c1a3..d4da157a56 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 "quantum.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 deleted file mode 100644 index eee5c4185f..0000000000 --- a/keyboards/salicylic_acid3/naked48/rev1/rev1.h +++ /dev/null @@ -1,109 +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 "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. -////////////////////////////////////////////////////////////////////////////// -/* - * ,------------------------------------ ------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | L06 | L07 | L08 | L09 | L0A | L0B | - * |------------------------------------ ------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | L16 | L17 | L18 | L19 | L1A | L1B | - * |------------------------------------ ------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | L26 | L17 | L28 | L29 | L2A | L2B | - * |-----------------------------------------------------------------------------------+ - * | L30 | L32 | L33 | L34 | L35 | L36 | L37 | L38 | L39 | L3A | L3B | L3D | - * |-----------------------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, \ - L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, \ - L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \ - } - -////////////////////////////////////////////////////////////////////////////// -// When connecting Setta21 to Naked48. -////////////////////////////////////////////////////////////////////////////// - -#define LAYOUT_with_setta21( \ - L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B, R30, R32, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \ - { R00, R01, R02, R03, R04, R05,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - { R20, R21, R22, R23, R24, R25,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - { R30,KC_NO, R32,KC_NO, R34, R35,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \ - } - -////////////////////////////////////////////////////////////////////////////// -// When connecting Nafuda to Naked48. -////////////////////////////////////////////////////////////////////////////// - -#define LAYOUT_with_nafuda( \ - L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B, R01, \ - L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B, R10, R11, R12, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B, R20, R21, R22, \ - L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A, L0B }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L1A, L1B }, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, L2A, L2B }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, L3A, L3B }, \ - {KC_NO, R01,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - { R10, R11, R12,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - { R20, R21, R22,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \ - {KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \ - } - 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 |