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 | 19 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/rev1/rev1.h | 10 | ||||
-rw-r--r-- | keyboards/salicylic_acid3/naked48/rules.mk | 1 |
8 files changed, 19 insertions, 67 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..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 |