From ace372d90de13dafc815df5d8049497cb351b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:34:34 +1100 Subject: Move matrix config to info.json, part 3 (#19991) Co-authored-by: Nick Brassel --- keyboards/emi20/config.h | 8 -------- keyboards/emi20/info.json | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'keyboards/emi20') diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h index 237b073721..06a88a7240 100644 --- a/keyboards/emi20/config.h +++ b/keyboards/emi20/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B6 } -#define MATRIX_COL_PINS { C7, C6, B5, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json index 093b3e5b45..dff7a57bc1 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B5", "B4"], + "rows": ["F4", "F5", "F6", "F7", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/emi20/emi20.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/emi20/emi20.c (limited to 'keyboards/emi20') diff --git a/keyboards/emi20/emi20.c b/keyboards/emi20/emi20.c deleted file mode 100644 index a5bcc89d49..0000000000 --- a/keyboards/emi20/emi20.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Aquacylinder - * - * 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 . - */ - -#include "emi20.h" -- cgit v1.2.3 From ad625e7c06929092231e8f426cbe972681d91a03 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Mar 2023 21:38:01 +1100 Subject: Remove `RGB_DI_PIN` ifdefs (#20218) --- keyboards/emi20/config.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 keyboards/emi20/config.h (limited to 'keyboards/emi20') diff --git a/keyboards/emi20/config.h b/keyboards/emi20/config.h deleted file mode 100644 index 06a88a7240..0000000000 --- a/keyboards/emi20/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 Aquacylinder - * - * 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 - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif -- 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/emi20/emi20.h | 33 --------------------------------- keyboards/emi20/info.json | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 53 deletions(-) delete mode 100644 keyboards/emi20/emi20.h (limited to 'keyboards/emi20') diff --git a/keyboards/emi20/emi20.h b/keyboards/emi20/emi20.h deleted file mode 100644 index 30d5750e49..0000000000 --- a/keyboards/emi20/emi20.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Aquacylinder - * - * 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_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json index dff7a57bc1..5e0f694135 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/info.json @@ -18,30 +18,30 @@ "layouts": { "LAYOUT_ortho_5x4": { "layout": [ - {"label":"K11 (F7,C7)", "x":0, "y":0}, - {"label":"K21 (F1,C7)", "x":1, "y":0}, - {"label":"K31 (B2,C7)", "x":2, "y":0}, - {"label":"K41 (B2,F0)", "x":3, "y":0}, + {"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}, - {"label":"K12 (F1,F0)", "x":0, "y":1}, - {"label":"K22 (B2,B6)", "x":1, "y":1}, - {"label":"K32 (F1,B6)", "x":2, "y":1}, - {"label":"K42 (B2,B3)", "x":3, "y":1}, + {"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}, - {"label":"K13 (F1,B3)", "x":0, "y":2}, - {"label":"K23 (B2,C6)", "x":1, "y":2}, - {"label":"K33 (F1,C6)", "x":2, "y":2}, - {"label":"K43 (B2,E6)", "x":3, "y":2}, + {"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}, - {"label":"K14 (F1,E6)", "x":0, "y":3}, - {"label":"K24 (B2,D5)", "x":1, "y":3}, - {"label":"K34 (F1,D5)", "x":2, "y":3}, - {"label":"K44 (D0,B1)", "x":3, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - {"label":"K15 (D0,F4)", "x":0, "y":4}, - {"label":"K25 (F7,D1)", "x":1, "y":4}, - {"label":"K35 (F7,B3)", "x":2, "y":4}, - {"label":"K45 (B5,C7)", "x":3, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4} ] } } -- 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/emi20/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/emi20') diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json index 5e0f694135..c4406cec31 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Emi20", + "keyboard_name": "Emi20", "manufacturer": "Aquacylinder", - "url": "", - "maintainer": "Aquacylinder", + "url": "", + "maintainer": "Aquacylinder", "usb": { "vid": "0xFEED", "pid": "0x6060", -- cgit v1.2.3