diff options
Diffstat (limited to 'keyboards/ymdk')
57 files changed, 253 insertions, 576 deletions
diff --git a/keyboards/ymdk/bface/bface.c b/keyboards/ymdk/bface/bface.c deleted file mode 100644 index fabc10498a..0000000000 --- a/keyboards/ymdk/bface/bface.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2019 Ethan Durrant (emdarcher) - * - * 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 "quantum.h" diff --git a/keyboards/ymdk/bface/config.h b/keyboards/ymdk/bface/config.h index 9314f26bea..08303c4b13 100644 --- a/keyboards/ymdk/bface/config.h +++ b/keyboards/ymdk/bface/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B7, B6, B5, B4, B3} -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7} - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/ymdk/bface/info.json b/keyboards/ymdk/bface/info.json index 641fe31543..41e056a96a 100644 --- a/keyboards/ymdk/bface/info.json +++ b/keyboards/ymdk/bface/info.json @@ -8,10 +8,18 @@ "pid": "0x4266", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B7", "B6", "B5", "B4", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 6 }, + "ws2812": { + "driver": "i2c" + }, "indicators": { "caps_lock": "D1" }, diff --git a/keyboards/ymdk/bface/rules.mk b/keyboards/ymdk/bface/rules.mk index 03a618b76d..166b3d3ec8 100644 --- a/keyboards/ymdk/bface/rules.mk +++ b/keyboards/ymdk/bface/rules.mk @@ -8,4 +8,3 @@ CONSOLE_ENABLE = no COMMAND_ENABLE = yes BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes -WS2812_DRIVER = i2c diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h index 1420387adb..56495cac2c 100644 --- a/keyboards/ymdk/melody96/config.h +++ b/keyboards/ymdk/melody96/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -15,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -30,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json index 074e6c0485..4688aee3a2 100644 --- a/keyboards/ymdk/melody96/info.json +++ b/keyboards/ymdk/melody96/info.json @@ -8,6 +8,11 @@ "pid": "0x4D96", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/ymdk/melody96/melody96.c b/keyboards/ymdk/melody96/melody96.c deleted file mode 100644 index 44e813586b..0000000000 --- a/keyboards/ymdk/melody96/melody96.c +++ /dev/null @@ -1 +0,0 @@ -#include "melody96.h" diff --git a/keyboards/ymdk/melody96/melody96.h b/keyboards/ymdk/melody96/melody96.h index 3d3bc6070c..8edbca1135 100644 --- a/keyboards/ymdk/melody96/melody96.h +++ b/keyboards/ymdk/melody96/melody96.h @@ -118,7 +118,7 @@ { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \ { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \ { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \ - { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \ + { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8 }, \ { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \ } diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h index ce2e688bd7..81bfa2e81a 100644 --- a/keyboards/ymdk/np21/config.h +++ b/keyboards/ymdk/np21/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 5 //#define RGBLIGHT_HUE_STEP 8 //#define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/ymdk/np21/info.json b/keyboards/ymdk/np21/info.json index 9d1e375cd9..7f2ddf4680 100644 --- a/keyboards/ymdk/np21/info.json +++ b/keyboards/ymdk/np21/info.json @@ -7,11 +7,19 @@ "pid": "0x5021", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "levels": 12, "breathing": true }, + "ws2812": { + "driver": "i2c" + }, "indicators": { "num_lock": "D0" }, diff --git a/keyboards/ymdk/np21/np21.c b/keyboards/ymdk/np21/np21.c deleted file mode 100644 index 824cfb0d1a..0000000000 --- a/keyboards/ymdk/np21/np21.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> -Modified 2018 Kenneth A. <github.com/krusli> - -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 "np21.h" diff --git a/keyboards/ymdk/np21/rules.mk b/keyboards/ymdk/np21/rules.mk index 674983a7ab..e9c8472d0b 100644 --- a/keyboards/ymdk/np21/rules.mk +++ b/keyboards/ymdk/np21/rules.mk @@ -8,4 +8,3 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -WS2812_DRIVER = i2c diff --git a/keyboards/ymdk/np24/u4rgb6/config.h b/keyboards/ymdk/np24/u4rgb6/config.h index 0524cfd563..3ab1f3b604 100644 --- a/keyboards/ymdk/np24/u4rgb6/config.h +++ b/keyboards/ymdk/np24/u4rgb6/config.h @@ -15,16 +15,7 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B6, B2, B1, D7, B4 } -#define MATRIX_COL_PINS { F5, F4, D3, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -36,4 +27,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json index dd4b532538..98d881cd4d 100644 --- a/keyboards/ymdk/np24/u4rgb6/info.json +++ b/keyboards/ymdk/np24/u4rgb6/info.json @@ -7,6 +7,11 @@ "pid": "0x5024", "device_version": "4.0.6" }, + "matrix_pins": { + "cols": ["F5", "F4", "D3", "D2"], + "rows": ["B3", "B6", "B2", "B1", "D7", "B4"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7", "levels": 31 diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.c b/keyboards/ymdk/np24/u4rgb6/u4rgb6.c deleted file mode 100644 index edd0c0552d..0000000000 --- a/keyboards/ymdk/np24/u4rgb6/u4rgb6.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Simon Arlott - * - * 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 "u4rgb6.h" diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json index 66cbbe56e5..46f533b14d 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/info.json @@ -13,6 +13,9 @@ "num_lock": "D0", "scroll_lock": "D6" }, + "ws2812": { + "driver": "i2c" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { diff --git a/keyboards/ymdk/sp64/rules.mk b/keyboards/ymdk/sp64/rules.mk index 6cef95fd45..df9380f361 100644 --- a/keyboards/ymdk/sp64/rules.mk +++ b/keyboards/ymdk/sp64/rules.mk @@ -13,8 +13,5 @@ AUDIO_SUPPORTED = no RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow CUSTOM_MATRIX = yes -# Needed for underglow -WS2812_DRIVER = i2c - SRC += matrix.c QUANTUM_LIB_SRC += i2c_master.c diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h index 3b21cea4a6..d1812a65ed 100644 --- a/keyboards/ymdk/wings/config.h +++ b/keyboards/ymdk/wings/config.h @@ -15,25 +15,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -50,5 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - -#endif diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json index 92f019bacb..25a04a5158 100644 --- a/keyboards/ymdk/wings/info.json +++ b/keyboards/ymdk/wings/info.json @@ -8,6 +8,11 @@ "pid": "0x2975", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 @@ -21,79 +26,87 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":0.75, "y":0.25}, - {"label":"1", "x":1.75, "y":0.25}, - {"label":"2", "x":2.75, "y":0}, - {"label":"3", "x":3.75, "y":0.25}, - {"label":"4", "x":4.75, "y":0.25}, - {"label":"5", "x":5.75, "y":0.25}, - {"label":"6", "x":6.75, "y":0.25}, - {"label":"7", "x":10, "y":0.25}, - {"label":"8", "x":11, "y":0.25}, - {"label":"9", "x":12, "y":0.25}, - {"label":"0", "x":13, "y":0.25}, - {"label":"-", "x":14, "y":0}, - {"label":"=", "x":15, "y":0.25}, - {"label":"|", "x":16, "y":0.25}, - {"label":"Grave", "x":17, "y":0.25}, - {"label":"PgUp", "x":18.75, "y":0}, + {"x":0.25, "y":0.25}, + {"x":1.25, "y":0.25}, + {"x":2.25, "y":0}, + {"x":3.25, "y":0.25}, + {"x":4.25, "y":0.25}, + {"x":5.25, "y":0.25}, + {"x":6.25, "y":0.25}, + + {"x":9.5, "y":0.25}, + {"x":10.5, "y":0.25}, + {"x":11.5, "y":0.25}, + {"x":12.5, "y":0.25}, + {"x":13.5, "y":0}, + {"x":14.5, "y":0.25}, + {"x":15.5, "y":0.25}, + {"x":16.5, "y":0.25}, + + {"x":18.25, "y":0}, + + {"x":0, "y":1.25, "w":1.5}, + {"x":1.5, "y":1.25}, + {"x":2.75, "y":1.25}, + {"x":3.75, "y":1.25}, + {"x":4.75, "y":1.25}, + {"x":5.75, "y":1.25}, + + {"x":9, "y":1.25}, + {"x":10, "y":1.25}, + {"x":11, "y":1.25}, + {"x":12, "y":1.25}, + {"x":13.25, "y":1.25}, + {"x":14.25, "y":1.25}, + {"x":15.25, "y":1.25}, + {"x":16.25, "y":1.25, "w":1.5}, + + {"x":18.5, "y":1}, + + {"x":0, "y":2.25, "w":1.75}, + {"x":1.75, "y":2.25}, + {"x":3, "y":2.25}, + {"x":4, "y":2.25}, + {"x":5, "y":2.25}, + {"x":6, "y":2.25}, + + {"x":9.25, "y":2.25}, + {"x":10.25, "y":2.25}, + {"x":11.25, "y":2.25}, + {"x":12.25, "y":2.25}, + {"x":13.75, "y":2.25}, + {"x":14.75, "y":2.25}, + {"x":15.75, "y":2.25, "w":2.25}, + + {"x":18.75, "y":2}, + + {"x":0, "y":3.25, "w":2.25}, + {"x":2.25, "y":3.25}, + {"x":3.5, "y":3.25}, + {"x":4.5, "y":3.25}, + {"x":5.5, "y":3.25}, + {"x":6.5, "y":3.25}, - - {"label":"Tab", "x":0.5, "y":1.25, "w":1.5}, - {"label":"Q", "x":2, "y":1.25}, - {"label":"W", "x":3.25, "y":1.25}, - {"label":"E", "x":4.25, "y":1.25}, - {"label":"R", "x":5.25, "y":1.25}, - {"label":"T", "x":6.25, "y":1.25}, - {"label":"Y", "x":9.5, "y":1.25}, - {"label":"U", "x":10.5, "y":1.25}, - {"label":"I", "x":11.5, "y":1.25}, - {"label":"O", "x":12.5, "y":1.25}, - {"label":"P", "x":13.75, "y":1.25}, - {"label":"{", "x":14.75, "y":1.25}, - {"label":"}", "x":15.75, "y":1.25}, - {"label":"Backspace", "x":16.75, "y":1.25, "w":1.5}, - {"label":"PgDn", "x":19, "y":1}, + {"x":9.75, "y":3.25}, + {"x":10.75, "y":3.25}, + {"x":11.75, "y":3.25}, + {"x":13.5, "y":3.25}, + {"x":14.5, "y":3.25}, + {"x":15.5, "y":3.25, "w":1.75}, + {"x":17.5, "y":3.25}, - {"label":"Caps Lock", "x":0.5, "y":2.25, "w":1.75}, - {"label":"A", "x":2.25, "y":2.25}, - {"label":"S", "x":3.5, "y":2.25}, - {"label":"D", "x":4.5, "y":2.25}, - {"label":"F", "x":5.5, "y":2.25}, - {"label":"G", "x":6.5, "y":2.25}, - {"label":"H", "x":9.75, "y":2.25}, - {"label":"J", "x":10.75, "y":2.25}, - {"label":"K", "x":11.75, "y":2.25}, - {"label":"L", "x":12.75, "y":2.25}, - {"label":":", "x":14.25, "y":2.25}, - {"label":"\"", "x":15.25, "y":2.25}, - {"label":"Enter", "x":16.25, "y":2.25, "w":2.25}, - {"label":"Fn", "x":19.25, "y":2}, + {"x":0, "y":4.25, "w":1.5}, + {"x":3.5, "y":4.25, "w":1.5}, + {"x":5, "y":4.25, "w":2}, + {"x":7, "y":4.25}, - {"label":"Shift", "x":0.5, "y":3.25, "w":2.25}, - {"label":"Z", "x":2.75, "y":3.25}, - {"label":"X", "x":4, "y":3.25}, - {"label":"C", "x":5, "y":3.25}, - {"label":"V", "x":6, "y":3.25}, - {"label":"B", "x":7, "y":3.25}, - {"label":"N", "x":10.25, "y":3.25}, - {"label":"M", "x":11.25, "y":3.25}, - {"label":"<", "x":12.25, "y":3.25}, - {"label":">", "x":14, "y":3.25}, - {"label":"?", "x":15, "y":3.25}, - {"label":"Shift", "x":16, "y":3.25, "w":1.75}, - {"label":"Up", "x":18, "y":3.25}, + {"x":9.75, "y":4.25, "w":2.75}, + {"x":12.5, "y":4.25, "w":1.5}, - {"label":"Ctrl", "x":0.5, "y":4.25, "w":1.5}, - {"label":"Alt", "x":4, "y":4.25, "w":1.5}, - {"label":"Space", "x":5.5, "y":4.25, "w":2}, - {"label":"Menu", "x":7.5, "y":4.25}, - {"label":"Space", "x":10.25, "y":4.25, "w":2.75}, - {"label":"Alt", "x":13, "y":4.25, "w":1.5}, - {"label":"Left", "x":17, "y":4.25}, - {"label":"Down", "x":18, "y":4.25}, - {"label":"Right", "x":19, "y":4.25} + {"x":16.5, "y":4.25}, + {"x":17.5, "y":4.25}, + {"x":18.5, "y":4.25} ] } } diff --git a/keyboards/ymdk/wings/wings.c b/keyboards/ymdk/wings/wings.c deleted file mode 100644 index 4e696d97b8..0000000000 --- a/keyboards/ymdk/wings/wings.c |