From 9e64300e67720a5468c2585391250ca5579b311b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:00:24 +1100 Subject: Move matrix config to info.json, part 4 (#20001) --- keyboards/deng/djam/config.h | 5 ----- keyboards/deng/djam/info.json | 5 +++++ keyboards/deng/thirty/config.h | 6 ------ keyboards/deng/thirty/info.json | 5 +++++ 4 files changed, 10 insertions(+), 11 deletions(-) (limited to 'keyboards/deng') diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h index 8193eae02f..5896f3cd70 100644 --- a/keyboards/deng/djam/config.h +++ b/keyboards/deng/djam/config.h @@ -15,11 +15,6 @@ */ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 } -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN D5 #define RGB_MATRIX_LED_COUNT 31 diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index abf18685b2..cdba6219d4 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -8,6 +8,11 @@ "pid": "0x7325", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index e80b0d97a4..e96dee185b 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h @@ -15,12 +15,6 @@ */ #pragma once - -/* Matrix */ -#define MATRIX_ROW_PINS { B15, A5, A3, A15, B7, B8 } -#define MATRIX_COL_PINS { B13, B14, B3, A4, A6 } -#define DIODE_DIRECTION COL2ROW - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN B12 diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 0fda78c76d..454577c1eb 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -8,6 +8,11 @@ "pid": "0x7342", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B13", "B14", "B3", "A4", "A6"], + "rows": ["B15", "A5", "A3", "A15", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "software", "pin": "B11", -- cgit v1.2.3 From 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 29 Mar 2023 15:54:34 +1100 Subject: Move ortho & numpad layouts to data driven (#20183) Co-authored-by: Nick Brassel --- keyboards/deng/thirty/info.json | 62 +++++++++++++++++++++-------------------- keyboards/deng/thirty/thirty.c | 2 +- keyboards/deng/thirty/thirty.h | 31 --------------------- 3 files changed, 33 insertions(+), 62 deletions(-) delete mode 100644 keyboards/deng/thirty/thirty.h (limited to 'keyboards/deng') diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 454577c1eb..21254557d4 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -24,36 +24,38 @@ "layouts": { "LAYOUT_ortho_3x10": { "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": [3, 4], "x": 5, "y": 0 }, - { "matrix": [3, 3], "x": 6, "y": 0 }, - { "matrix": [3, 2], "x": 7, "y": 0 }, - { "matrix": [3, 1], "x": 8, "y": 0 }, - { "matrix": [3, 0], "x": 9, "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": [4, 4], "x": 5, "y": 1 }, - { "matrix": [4, 3], "x": 6, "y": 1 }, - { "matrix": [4, 2], "x": 7, "y": 1 }, - { "matrix": [4, 1], "x": 8, "y": 1 }, - { "matrix": [4, 0], "x": 9, "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": [5, 4], "x": 5, "y": 2 }, - { "matrix": [5, 3], "x": 6, "y": 2 }, - { "matrix": [5, 2], "x": 7, "y": 2 }, - { "matrix": [5, 1], "x": 8, "y": 2 }, - { "matrix": [5, 0], "x": 9, "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": [3, 4], "x": 5, "y": 0}, + {"matrix": [3, 3], "x": 6, "y": 0}, + {"matrix": [3, 2], "x": 7, "y": 0}, + {"matrix": [3, 1], "x": 8, "y": 0}, + {"matrix": [3, 0], "x": 9, "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": [4, 4], "x": 5, "y": 1}, + {"matrix": [4, 3], "x": 6, "y": 1}, + {"matrix": [4, 2], "x": 7, "y": 1}, + {"matrix": [4, 1], "x": 8, "y": 1}, + {"matrix": [4, 0], "x": 9, "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": [5, 4], "x": 5, "y": 2}, + {"matrix": [5, 3], "x": 6, "y": 2}, + {"matrix": [5, 2], "x": 7, "y": 2}, + {"matrix": [5, 1], "x": 8, "y": 2}, + {"matrix": [5, 0], "x": 9, "y": 2} ] } } diff --git a/keyboards/deng/thirty/thirty.c b/keyboards/deng/thirty/thirty.c index 4f4a5c566d..2e582d6833 100644 --- a/keyboards/deng/thirty/thirty.c +++ b/keyboards/deng/thirty/thirty.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "thirty.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/deng/thirty/thirty.h b/keyboards/deng/thirty/thirty.h deleted file mode 100644 index 49af4b3424..0000000000 --- a/keyboards/deng/thirty/thirty.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2022 Leo Deng (@myst729) - * - * 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" - -#define LAYOUT_ortho_3x10( \ - K00, K01, K02, K03, K04, K34, K33, K32, K31, K30, \ - K10, K11, K12, K13, K14, K44, K43, K42, K41, K40, \ - K20, K21, K22, K23, K24, K54, K53, K52, K51, K50 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, K34 }, \ - { K40, K41, K42, K43, K44 }, \ - { K50, K51, K52, K53, K54 } \ -} -- 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/deng/djam/config.h | 1 - keyboards/deng/djam/info.json | 3 +++ keyboards/deng/thirty/config.h | 1 - keyboards/deng/thirty/info.json | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'keyboards/deng') diff --git a/keyboards/deng/djam/config.h b/keyboards/deng/djam/config.h index 5896f3cd70..39ea6d6e90 100644 --- a/keyboards/deng/djam/config.h +++ b/keyboards/deng/djam/config.h @@ -16,7 +16,6 @@ #pragma once #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN D5 #define RGB_MATRIX_LED_COUNT 31 #define RGB_MATRIX_KEYPRESSES #define ENABLE_RGB_MATRIX_BREATHING diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index cdba6219d4..ef1b783d96 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "D5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index e96dee185b..d80983202f 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h @@ -17,7 +17,6 @@ /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN B12 #define RGB_MATRIX_LED_COUNT 30 #define RGB_MATRIX_KEYPRESSES // #define RGB_MATRIX_KEYRELEASES diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 21254557d4..9bfcfad411 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -19,6 +19,9 @@ "levels": 5, "on_state": 0 }, + "ws2812": { + "pin": "B12" + }, "processor": "STM32F103", "bootloader": "stm32duino", "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/deng/djam/info.json | 3 +++ keyboards/deng/djam/rules.mk | 1 - keyboards/deng/thirty/info.json | 3 +++ keyboards/deng/thirty/rules.mk | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'keyboards/deng') diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index ef1b783d96..4a5cd78f19 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -8,6 +8,9 @@ "pid": "0x7325", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4"] diff --git a/keyboards/deng/djam/rules.mk b/keyboards/deng/djam/rules.mk index 42a6d2bd1b..150b7c690d 100644 --- a/keyboards/deng/djam/rules.mk +++ b/keyboards/deng/djam/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 9bfcfad411..1d9b018e6b 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -8,6 +8,9 @@ "pid": "0x7342", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["B13", "B14", "B3", "A4", "A6"], "rows": ["B15", "A5", "A3", "A15", "B7", "B8"] diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk index 91837f3d45..e8ce9e854b 100644 --- a/keyboards/deng/thirty/rules.mk +++ b/keyboards/deng/thirty/rules.mk @@ -15,4 +15,3 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 -- cgit v1.2.3 From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/deng/djam/djam.c | 2 +- keyboards/deng/djam/djam.h | 28 ------------------------- keyboards/deng/djam/info.json | 49 ++++++++++++++++++++++++------------------- 3 files changed, 29 insertions(+), 50 deletions(-) delete mode 100644 keyboards/deng/djam/djam.h (limited to 'keyboards/deng') diff --git a/keyboards/deng/djam/djam.c b/keyboards/deng/djam/djam.c index c7b986cf9e..3514ff050c 100644 --- a/keyboards/deng/djam/djam.c +++ b/keyboards/deng/djam/djam.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "djam.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/deng/djam/djam.h b/keyboards/deng/djam/djam.h deleted file mode 100644 index bf740f736a..0000000000 --- a/keyboards/deng/djam/djam.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2022 Leo Deng (@myst729) - * - * 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" - -#define LAYOUT( \ - K000, K001, K002, K005, K006, K007, \ - K100, K101, K102, K103, K104, K105, K106, K107, \ - K200, K201, K202, K203, K204, K205, K206 \ -) { \ - { K000, K001, K002, KC_NO, KC_NO, K005, K006, K007 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107 }, \ - { K200, K201, K202, K203, K204, K205, K206, KC_NO } \ -} diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index 4a5cd78f19..7257ebabb8 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -28,28 +28,35 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 7, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 0, "y": 0.5, "h": 2 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 0.5, "h": 2 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 3, "y": 3, "w": 2 }, - { "x": 5, "y": 3 }, - { "x": 6, "y": 3, "w": 2 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 } + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + + {"matrix": [0, 5], "x": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 0.5, "h": 2}, + + {"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": 7, "y": 1}, + {"matrix": [1, 5], "x": 8, "y": 1}, + {"matrix": [1, 6], "x": 9, "y": 1}, + + {"matrix": [1, 7], "x": 10, "y": 0.5, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 3, "y": 3, "w": 2}, + {"matrix": [2, 3], "x": 5, "y": 3}, + {"matrix": [2, 4], "x": 6, "y": 3, "w": 2}, + {"matrix": [2, 5], "x": 9, "y": 3}, + {"matrix": [2, 6], "x": 10, "y": 3} ] } } + } -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/deng/djam/info.json | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/deng') diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index 7257ebabb8..c78e814505 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -58,5 +58,4 @@ ] } } - } -- cgit v1.2.3