From 23c365b023e409885e6f201f12df56e5145dde47 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Mar 2023 09:53:52 +1100 Subject: Move matrix config to info.json, part 1 (#19985) --- keyboards/yushakobo/quick17/config.h | 17 ----------------- keyboards/yushakobo/quick17/info.json | 5 +++++ 2 files changed, 5 insertions(+), 17 deletions(-) (limited to 'keyboards/yushakobo/quick17') diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 3df5c25081..1e45541119 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #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 { F4, B3, B6 } -#define MATRIX_COL_PINS { F5, D4, E6, F7, C6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #define RGBLED_NUM 18 diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 7d062aef16..e5eb64db84 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "D4", "E6", "F7", "C6", "D7"], + "rows": ["F4", "B3", "B6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} -- cgit v1.2.3 From 3c144fac5e2b634166f6b9cc0fc45029d63d3398 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 20 Mar 2023 08:12:05 +1100 Subject: Clean up usage of `QMK_KEYBOARD_H` (#20167) --- keyboards/yushakobo/quick17/quick17_prefs.c | 2 +- keyboards/yushakobo/quick17/quick17_prefs.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/yushakobo/quick17') diff --git a/keyboards/yushakobo/quick17/quick17_prefs.c b/keyboards/yushakobo/quick17/quick17_prefs.c index 1a546f4e35..bf58f67411 100644 --- a/keyboards/yushakobo/quick17/quick17_prefs.c +++ b/keyboards/yushakobo/quick17/quick17_prefs.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include QMK_KEYBOARD_H +#include "quick17_prefs.h" bool _INPUT_JP; diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h index 4d81d163b9..a6096f0f26 100644 --- a/keyboards/yushakobo/quick17/quick17_prefs.h +++ b/keyboards/yushakobo/quick17/quick17_prefs.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#include "quantum.h" + enum layer_names { _CONTROL, _EDIT1, -- cgit v1.2.3 From 1e07ff1fb108a305feca659b17ec03ba3e750455 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 24 Mar 2023 04:21:37 +1100 Subject: Fix some more missing `#pragma once`s (#20241) --- keyboards/yushakobo/quick17/quick17_prefs.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'keyboards/yushakobo/quick17') diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h index a6096f0f26..25f2e1e0ae 100644 --- a/keyboards/yushakobo/quick17/quick17_prefs.h +++ b/keyboards/yushakobo/quick17/quick17_prefs.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#pragma once + #include "quantum.h" enum layer_names { -- cgit v1.2.3 From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:46:59 +1000 Subject: Move small macropad-ish layouts to data driven (#20341) --- keyboards/yushakobo/quick17/info.json | 23 ++++++++++++++++++--- keyboards/yushakobo/quick17/quick17.c | 2 +- keyboards/yushakobo/quick17/quick17.h | 38 ----------------------------------- 3 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 keyboards/yushakobo/quick17/quick17.h (limited to 'keyboards/yushakobo/quick17') diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index e5eb64db84..0a6c30f9ea 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -23,9 +23,26 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2} + {"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": [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": [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} ] } } diff --git a/keyboards/yushakobo/quick17/quick17.c b/keyboards/yushakobo/quick17/quick17.c index ed9fe97097..d6fe84199b 100644 --- a/keyboards/yushakobo/quick17/quick17.c +++ b/keyboards/yushakobo/quick17/quick17.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quick17.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/yushakobo/quick17/quick17.h b/keyboards/yushakobo/quick17/quick17.h deleted file mode 100644 index 566df71069..0000000000 --- a/keyboards/yushakobo/quick17/quick17.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 yushakobo - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, \ - k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 } \ -} -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/yushakobo/quick17/config.h | 1 - keyboards/yushakobo/quick17/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/yushakobo/quick17') diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index 1e45541119..f5e39f3b00 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 18 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 0a6c30f9ea..8c59e1a549 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -18,6 +18,9 @@ {"pin_a": "B4", "pin_b": "B5"} ] }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 18:08:08 +1000 Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350) --- keyboards/yushakobo/quick17/info.json | 3 +++ keyboards/yushakobo/quick17/rules.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/yushakobo/quick17') diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 8c59e1a549..15ced83d39 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -8,6 +8,9 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F5", "D4", "E6", "F7", "C6", "D7"], "rows": ["F4", "B3", "B6"] diff --git a/keyboards/yushakobo/quick17/rules.mk b/keyboards/yushakobo/quick17/rules.mk index a73ebf1d09..70ab5e2744 100644 --- a/keyboards/yushakobo/quick17/rules.mk +++ b/keyboards/yushakobo/quick17/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 RGB_MATRIX_CUSTOM_KB = yes SRC += quick17_prefs.c -- cgit v1.2.3 From 363bfdbfda5ea9fa996390920a9e8982535b76c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 May 2023 12:27:44 +1000 Subject: Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974) Co-authored-by: Nick Brassel --- keyboards/yushakobo/quick17/config.h | 1 - keyboards/yushakobo/quick17/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/yushakobo/quick17') diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h index f5e39f3b00..00018d319c 100644 --- a/keyboards/yushakobo/quick17/config.h +++ b/keyboards/yushakobo/quick17/config.h @@ -50,7 +50,6 @@ along with this program. If not, see . # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 -# define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */ //# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ //# define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/yushakobo/quick17/info.json b/keyboards/yushakobo/quick17/info.json index 15ced83d39..1889a00643 100644 --- a/keyboards/yushakobo/quick17/info.json +++ b/keyboards/yushakobo/quick17/info.json @@ -11,6 +11,9 @@ "rgb_matrix": { "driver": "WS2812" }, + "rgblight": { + "max_brightness": 150 + }, "matrix_pins": { "cols": ["F5", "D4", "E6", "F7", "C6", "D7"], "rows": ["F4", "B3", "B6"] -- cgit v1.2.3