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/takashicompany/center_enter/config.h | 17 ----------------- keyboards/takashicompany/center_enter/info.json | 5 +++++ keyboards/takashicompany/compacx/config.h | 17 ----------------- keyboards/takashicompany/compacx/info.json | 5 +++++ keyboards/takashicompany/dogtag/config.h | 20 -------------------- keyboards/takashicompany/dogtag/info.json | 13 ++++++++++++- keyboards/takashicompany/endzone34/config.h | 17 ----------------- keyboards/takashicompany/endzone34/info.json | 5 +++++ keyboards/takashicompany/heavy_left/config.h | 17 ----------------- keyboards/takashicompany/heavy_left/info.json | 5 +++++ keyboards/takashicompany/minizone/config.h | 17 ----------------- keyboards/takashicompany/minizone/info.json | 5 +++++ keyboards/takashicompany/qoolee/config.h | 17 ----------------- keyboards/takashicompany/qoolee/info.json | 5 +++++ keyboards/takashicompany/radialex/config.h | 17 ----------------- keyboards/takashicompany/radialex/info.json | 5 +++++ 16 files changed, 47 insertions(+), 140 deletions(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h index f77a42f59f..b2ec9d3895 100644 --- a/keyboards/takashicompany/center_enter/config.h +++ b/keyboards/takashicompany/center_enter/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 { E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D7, B2, B6, D0, D4, C6} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index 7c268e3f63..d0e819f097 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -8,6 +8,11 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D7", "B2", "B6", "D0", "D4", "C6"], + "rows": ["E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D1", "resolution": 1} diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h index 3f6f011524..7ecb336fa1 100644 --- a/keyboards/takashicompany/compacx/config.h +++ b/keyboards/takashicompany/compacx/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 { D1, D0, D4, C6, D7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 12 diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index bcd4489a98..f8c84acb46 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -8,6 +8,11 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D1", "D0", "D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B4"}, diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h index 4048cb9bf6..2bb3073b6f 100644 --- a/keyboards/takashicompany/dogtag/config.h +++ b/keyboards/takashicompany/dogtag/config.h @@ -17,26 +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 { B2, B6, B3 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 } -#define MATRIX_ROW_PINS_RIGHT { B2, B6, B3 } -#define MATRIX_COL_PINS_RIGHT { B1, F7, F6, F5, F4 } - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 4 * 2 diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index caa007fcc5..7da4dd5257 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -8,13 +8,24 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1"], + "rows": ["B2", "B6", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "C6"} ] }, "split": { - "soft_serial_pin": "D2" + "soft_serial_pin": "D2", + "matrix_pins": { + "right": { + "cols": ["B1", "F7", "F6", "F5", "F4"], + "rows": ["B2", "B6", "B3"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h index 8dd55ecf0d..48f3f2c1e4 100644 --- a/keyboards/takashicompany/endzone34/config.h +++ b/keyboards/takashicompany/endzone34/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 { B3, B2, B6, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D4, C6, D7, E6, B4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN #define RGBLED_NUM 9 diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index 60ca453e13..492e854664 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "D4", "C6", "D7", "E6", "B4"], + "rows": ["B3", "B2", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h index 5bdc664832..1b1e657583 100644 --- a/keyboards/takashicompany/heavy_left/config.h +++ b/keyboards/takashicompany/heavy_left/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 { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1, D0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 * 2 diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 2fa8ac7a05..8280a9e6b1 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -8,6 +8,11 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h index 4cd3ae6b65..70c5c58f02 100644 --- a/keyboards/takashicompany/minizone/config.h +++ b/keyboards/takashicompany/minizone/config.h @@ -3,23 +3,6 @@ #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 { D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 11 diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index 882a8ebdd5..76df78895d 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -8,6 +8,11 @@ "pid": "0x0021", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h index 726f4507c8..b2ec9d3895 100644 --- a/keyboards/takashicompany/qoolee/config.h +++ b/keyboards/takashicompany/qoolee/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 { E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D0, D4, C6, D7} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index 6f92e86c88..f8df8f16c4 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -8,6 +8,11 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D0", "D4", "C6", "D7"], + "rows": ["E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D1", "resolution": 1} diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h index 8843ff81f0..28ef095000 100644 --- a/keyboards/takashicompany/radialex/config.h +++ b/keyboards/takashicompany/radialex/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 { B6, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLED_NUM 12 diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index 1ed37283e7..043325531d 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -8,6 +8,11 @@ "pid": "0x0019", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["B6", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "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/takashicompany/center_enter/center_enter.c | 17 ----------------- keyboards/takashicompany/heavy_left/heavy_left.c | 17 ----------------- keyboards/takashicompany/qoolee/qoolee.c | 17 ----------------- keyboards/takashicompany/radialex/radialex.c | 17 ----------------- 4 files changed, 68 deletions(-) delete mode 100644 keyboards/takashicompany/center_enter/center_enter.c delete mode 100644 keyboards/takashicompany/heavy_left/heavy_left.c delete mode 100644 keyboards/takashicompany/qoolee/qoolee.c delete mode 100644 keyboards/takashicompany/radialex/radialex.c (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/center_enter/center_enter.c b/keyboards/takashicompany/center_enter/center_enter.c deleted file mode 100644 index 4973e6a643..0000000000 --- a/keyboards/takashicompany/center_enter/center_enter.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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 "center_enter.h" diff --git a/keyboards/takashicompany/heavy_left/heavy_left.c b/keyboards/takashicompany/heavy_left/heavy_left.c deleted file mode 100644 index 2af6d3fe61..0000000000 --- a/keyboards/takashicompany/heavy_left/heavy_left.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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 "heavy_left.h" diff --git a/keyboards/takashicompany/qoolee/qoolee.c b/keyboards/takashicompany/qoolee/qoolee.c deleted file mode 100644 index 5a86c3c5bf..0000000000 --- a/keyboards/takashicompany/qoolee/qoolee.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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 "qoolee.h" diff --git a/keyboards/takashicompany/radialex/radialex.c b/keyboards/takashicompany/radialex/radialex.c deleted file mode 100644 index 9146106973..0000000000 --- a/keyboards/takashicompany/radialex/radialex.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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 "radialex.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/takashicompany/center_enter/config.h | 2 -- keyboards/takashicompany/compacx/config.h | 2 -- keyboards/takashicompany/dogtag/config.h | 2 -- keyboards/takashicompany/endzone34/config.h | 2 -- keyboards/takashicompany/heavy_left/config.h | 2 -- keyboards/takashicompany/minizone/config.h | 2 -- keyboards/takashicompany/qoolee/config.h | 2 -- keyboards/takashicompany/radialex/config.h | 2 -- 8 files changed, 16 deletions(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h index b2ec9d3895..49c2326a25 100644 --- a/keyboards/takashicompany/center_enter/config.h +++ b/keyboards/takashicompany/center_enter/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h index 7ecb336fa1..a095aa04c0 100644 --- a/keyboards/takashicompany/compacx/config.h +++ b/keyboards/takashicompany/compacx/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLED_SPLIT {6, 6} # define RGBLIGHT_HUE_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h index 2bb3073b6f..6cc2fc87e5 100644 --- a/keyboards/takashicompany/dogtag/config.h +++ b/keyboards/takashicompany/dogtag/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 4 * 2 # define RGBLED_SPLIT { 4, 4 } # define RGBLIGHT_HUE_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h index 48f3f2c1e4..4a26be606e 100644 --- a/keyboards/takashicompany/endzone34/config.h +++ b/keyboards/takashicompany/endzone34/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h index 1b1e657583..bacecb13db 100644 --- a/keyboards/takashicompany/heavy_left/config.h +++ b/keyboards/takashicompany/heavy_left/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 * 2 # define RGBLED_SPLIT {6, 6} # define RGBLIGHT_HUE_STEP 8 @@ -36,7 +35,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h index 70c5c58f02..f4d136f808 100644 --- a/keyboards/takashicompany/minizone/config.h +++ b/keyboards/takashicompany/minizone/config.h @@ -4,7 +4,6 @@ #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 11 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -20,7 +19,6 @@ # define RGBLIGHT_EFFECT_STATIC_GRADIENT //# define RGBLIGHT_EFFECT_RGB_TEST //# define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h index b2ec9d3895..49c2326a25 100644 --- a/keyboards/takashicompany/qoolee/config.h +++ b/keyboards/takashicompany/qoolee/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,7 +33,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h index 28ef095000..f6ab4c4b3a 100644 --- a/keyboards/takashicompany/radialex/config.h +++ b/keyboards/takashicompany/radialex/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -35,7 +34,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE -- cgit v1.2.3 From fcf8b804ed95a98561bd4c1d6c85604be0f7cc7b Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Mon, 3 Apr 2023 10:33:45 +0200 Subject: [Core] Refactor `keyevent_t` for 1ms timing resolution (#15847) --- keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c b/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c index e04c1fea0d..c0d4a0003d 100644 --- a/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c +++ b/keyboards/takashicompany/spreadwriter/keymaps/via/keymap.c @@ -98,7 +98,8 @@ void encoder_action_unregister(void) { keyevent_t encoder_event = (keyevent_t) { .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = 0; action_exec(encoder_event); @@ -110,7 +111,8 @@ void encoder_action_register(uint8_t index, bool clockwise) { keyevent_t encoder_event = (keyevent_t) { .key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); action_exec(encoder_event); @@ -124,4 +126,4 @@ void matrix_scan_kb(void) { bool encoder_update_user(uint8_t index, bool clockwise) { encoder_action_register(index, clockwise); return true; -}; \ No newline at end of file +}; -- 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/takashicompany/center_enter/config.h | 1 - keyboards/takashicompany/center_enter/info.json | 3 +++ keyboards/takashicompany/compacx/config.h | 1 - keyboards/takashicompany/compacx/info.json | 3 +++ keyboards/takashicompany/dogtag/config.h | 1 - keyboards/takashicompany/dogtag/info.json | 3 +++ keyboards/takashicompany/endzone34/config.h | 1 - keyboards/takashicompany/endzone34/info.json | 3 +++ keyboards/takashicompany/goat51/info.json | 4 +++- keyboards/takashicompany/heavy_left/config.h | 1 - keyboards/takashicompany/heavy_left/info.json | 3 +++ keyboards/takashicompany/minizone/config.h | 1 - keyboards/takashicompany/minizone/info.json | 3 +++ keyboards/takashicompany/qoolee/config.h | 1 - keyboards/takashicompany/qoolee/info.json | 3 +++ keyboards/takashicompany/radialex/config.h | 1 - keyboards/takashicompany/radialex/info.json | 3 +++ keyboards/takashicompany/spreadwriter/info.json | 4 +++- keyboards/takashicompany/tightwriter/info.json | 4 +++- 19 files changed, 33 insertions(+), 11 deletions(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h index 49c2326a25..6610fca8bf 100644 --- a/keyboards/takashicompany/center_enter/config.h +++ b/keyboards/takashicompany/center_enter/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index d0e819f097..e7930bdb01 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -8,6 +8,9 @@ "pid": "0x0012", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D7", "B2", "B6", "D0", "D4", "C6"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h index a095aa04c0..90d19444ad 100644 --- a/keyboards/takashicompany/compacx/config.h +++ b/keyboards/takashicompany/compacx/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 12 # define RGBLED_SPLIT {6, 6} # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index f8c84acb46..f67abdbd3f 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -8,6 +8,9 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D1", "D0", "D4", "C6", "D7"] diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h index 6cc2fc87e5..f71ff71726 100644 --- a/keyboards/takashicompany/dogtag/config.h +++ b/keyboards/takashicompany/dogtag/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 4 * 2 # define RGBLED_SPLIT { 4, 4 } # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 7da4dd5257..2a91bd48f0 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -8,6 +8,9 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["B2", "B6", "B3"] diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h index 4a26be606e..59c63c91fd 100644 --- a/keyboards/takashicompany/endzone34/config.h +++ b/keyboards/takashicompany/endzone34/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 9 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index 492e854664..e9c9437902 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -8,6 +8,9 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "D4", "C6", "D7", "E6", "B4"], "rows": ["B3", "B2", "B6", "B5"] diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json index b87b08161e..04a29143bf 100644 --- a/keyboards/takashicompany/goat51/info.json +++ b/keyboards/takashicompany/goat51/info.json @@ -48,7 +48,6 @@ }, "rgblight": { "led_count": 11, - "pin": "D3", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, @@ -65,6 +64,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h index bacecb13db..a4685b9d06 100644 --- a/keyboards/takashicompany/heavy_left/config.h +++ b/keyboards/takashicompany/heavy_left/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 6 * 2 # define RGBLED_SPLIT {6, 6} # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 8280a9e6b1..95ecb65e1b 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -8,6 +8,9 @@ "pid": "0x0015", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1", "D0"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h index f4d136f808..6f631456ea 100644 --- a/keyboards/takashicompany/minizone/config.h +++ b/keyboards/takashicompany/minizone/config.h @@ -3,7 +3,6 @@ #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 11 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index 76df78895d..c591487e7b 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -8,6 +8,9 @@ "pid": "0x0021", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h index 49c2326a25..6610fca8bf 100644 --- a/keyboards/takashicompany/qoolee/config.h +++ b/keyboards/takashicompany/qoolee/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 6 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index f8df8f16c4..d7e9e2271e 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -8,6 +8,9 @@ "pid": "0x0013", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D0", "D4", "C6", "D7"], "rows": ["E6", "B4", "B5"] diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h index f6ab4c4b3a..39e1d8df5b 100644 --- a/keyboards/takashicompany/radialex/config.h +++ b/keyboards/takashicompany/radialex/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 # define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index 043325531d..d9b0e1aaa0 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -8,6 +8,9 @@ "pid": "0x0019", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["B6", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json index 16450db96e..161ed5ed60 100644 --- a/keyboards/takashicompany/spreadwriter/info.json +++ b/keyboards/takashicompany/spreadwriter/info.json @@ -47,7 +47,6 @@ }, "rgblight": { "led_count": 53, - "pin": "D3", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, @@ -64,6 +63,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/info.json index 7918682c20..891968963c 100644 --- a/keyboards/takashicompany/tightwriter/info.json +++ b/keyboards/takashicompany/tightwriter/info.json @@ -39,7 +39,6 @@ }, "rgblight": { "led_count": 10, - "pin": "D3", "animations": { "alternating": true, "breathing": true, @@ -53,6 +52,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D3" + }, "layouts": { "LAYOUT": { "layout": [ -- 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) --- .../takashicompany/center_enter/center_enter.h | 37 -- keyboards/takashicompany/center_enter/info.json | 70 +-- keyboards/takashicompany/compacx/compacx.c | 2 +- keyboards/takashicompany/compacx/compacx.h | 46 -- keyboards/takashicompany/compacx/info.json | 377 +++---------- keyboards/takashicompany/dogtag/dogtag.c | 2 +- keyboards/takashicompany/dogtag/dogtag.h | 40 -- keyboards/takashicompany/dogtag/info.json | 115 +--- keyboards/takashicompany/endzone34/endzone34.c | 2 +- keyboards/takashicompany/endzone34/endzone34.h | 39 -- keyboards/takashicompany/endzone34/info.json | 73 +-- keyboards/takashicompany/heavy_left/heavy_left.h | 46 -- keyboards/takashicompany/heavy_left/info.json | 599 ++++----------------- keyboards/takashicompany/minizone/info.json | 80 +-- keyboards/takashicompany/minizone/minizone.c | 2 +- keyboards/takashicompany/minizone/minizone.h | 30 -- keyboards/takashicompany/qoolee/info.json | 72 +-- keyboards/takashicompany/qoolee/qoolee.h | 37 -- keyboards/takashicompany/radialex/info.json | 233 ++------ keyboards/takashicompany/radialex/radialex.h | 42 -- 20 files changed, 428 insertions(+), 1516 deletions(-) delete mode 100644 keyboards/takashicompany/center_enter/center_enter.h delete mode 100644 keyboards/takashicompany/compacx/compacx.h delete mode 100644 keyboards/takashicompany/dogtag/dogtag.h delete mode 100644 keyboards/takashicompany/endzone34/endzone34.h delete mode 100644 keyboards/takashicompany/heavy_left/heavy_left.h delete mode 100644 keyboards/takashicompany/minizone/minizone.h delete mode 100644 keyboards/takashicompany/qoolee/qoolee.h delete mode 100644 keyboards/takashicompany/radialex/radialex.h (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/center_enter/center_enter.h b/keyboards/takashicompany/center_enter/center_enter.h deleted file mode 100644 index 0bd576f432..0000000000 --- a/keyboards/takashicompany/center_enter/center_enter.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b \ -) { \ - { k00, k01, k02, k03, k04, k05, KC_NO, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b } \ -} diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index e7930bdb01..3521b24218 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -26,43 +26,43 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0, "w":1.5}, - {"label":"Q", "x":1.5, "y":0}, - {"label":"W", "x":2.5, "y":0}, - {"label":"E", "x":3.5, "y":0}, - {"label":"R", "x":4.5, "y":0}, - {"label":"T", "x":5.5, "y":0}, - {"label":"Y", "x":8, "y":0}, - {"label":"U", "x":9, "y":0}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0}, - {"label":"P", "x":12, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, - {"label":"Ctrl", "x":0, "y":1, "w":1.75}, - {"label":"A", "x":1.75, "y":1}, - {"label":"S", "x":2.75, "y":1}, - {"label":"D", "x":3.75, "y":1}, - {"label":"F", "x":4.75, "y":1}, - {"label":"G", "x":5.75, "y":1}, - {"label":"Switch Language", "x":6.75, "y":0, "w":1.25, "h":2}, - {"label":"H", "x":8, "y":1}, - {"label":"J", "x":9, "y":1}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1}, - {"label":"Enter", "x":12, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 0, "w": 1.25, "h": 2}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, - {"label":"Shift", "x":0, "y":2, "w":2}, - {"label":"Z", "x":2, "y":2}, - {"label":"X", "x":3, "y":2}, - {"label":"C", "x":4, "y":2}, - {"label":"V", "x":5, "y":2}, - {"label":"B", "x":6, "y":2}, - {"label":"Space", "x":7, "y":2}, - {"label":"N", "x":8, "y":2}, - {"label":"M", "x":9, "y":2}, - {"label":",<", "x":10, "y":2}, - {"label":".>", "x":11, "y":2}, - {"label":"Backspace", "x":12, "y":2} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2} ] } } diff --git a/keyboards/takashicompany/compacx/compacx.c b/keyboards/takashicompany/compacx/compacx.c index cf23638920..5a63210c5b 100644 --- a/keyboards/takashicompany/compacx/compacx.c +++ b/keyboards/takashicompany/compacx/compacx.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "compacx.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } diff --git a/keyboards/takashicompany/compacx/compacx.h b/keyboards/takashicompany/compacx/compacx.h deleted file mode 100644 index 61447abeb8..0000000000 --- a/keyboards/takashicompany/compacx/compacx.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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( \ - l001, l002, l003, l004, l005, l006, l007, l008, r001, r002, r003, r004, r005, r006, r007, r008, \ - l201, l009, l010, l011, l012, l013, l901, r201, r009, r010, r011, r012, r013, r901, \ - l301, l014, l015, l016, l017, l018, r301, r014, r015, r016, r017, r018, \ - l401, l019, l020, l021, l022, l023, l024, r401, r019, r020, r021, r022, r023, r024, \ - l025, l101, l102, l026, l103, l104, l027, r025, r101, r102, r026, r103, r104, r027 \ -) { \ - { l001, l002, l003, l004, l005, l006, l007 }, \ - { l201, l009, l010, l011, l012, l013, l008 }, \ - { l301, l014, l015, l016, l017, l018, l901 }, \ - { l401, l019, l020, l021, l022, l023, l024 }, \ - { l025, l101, l102, l026, l103, l104, l027 }, \ - { r001, r002, r003, r004, r005, r006, r007 }, \ - { r201, r009, r010, r011, r012, r013, r008 }, \ - { r301, r014, r015, r016, r017, r018, r901 }, \ - { r401, r019, r020, r021, r022, r023, r024 }, \ - { r025, r101, r102, r026, r103, r104, r027 } \ -} diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index f67abdbd3f..edc71222a0 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -30,304 +30,85 @@ "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": 6, - "y": 0 - }, - { - "x": 7, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 12, - "y": 0 - }, - { - "x": 13, - "y": 0 - }, - { - "x": 14, - "y": 0 - }, - { - "x": 15, - "y": 0 - }, - { - "x": 16, - "y": 0 - }, - { - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "x": 1.5, - "y": 1 - }, - { - "x": 2.5, - "y": 1 - }, - { - "x": 3.5, - "y": 1 - }, - { - "x": 4.5, - "y": 1 - }, - { - "x": 5.5, - "y": 1 - }, - { - "x": 6.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "x": 9, - "y": 1, - "w": 1.5 - }, - { - "x": 10.5, - "y": 1 - }, - { - "x": 11.5, - "y": 1 - }, - { - "x": 12.5, - "y": 1 - }, - { - "x": 13.5, - "y": 1 - }, - { - "x": 14.5, - "y": 1 - }, - { - "x": 15.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "x": 1.75, - "y": 2 - }, - { - "x": 2.75, - "y": 2 - }, - { - "x": 3.75, - "y": 2 - }, - { - "x": 4.75, - "y": 2 - }, - { - "x": 5.75, - "y": 2 - }, - { - "x": 9, - "y": 2, - "w": 1.75 - }, - { - "x": 10.75, - "y": 2 - }, - { - "x": 11.75, - "y": 2 - }, - { - "x": 12.75, - "y": 2 - }, - { - "x": 13.75, - "y": 2 - }, - { - "x": 14.75, - "y": 2 - }, - { - "x": 0, - "y": 3, - "w": 2 - }, - { - "x": 2, - "y": 3 - }, - { - "x": 3, - "y": 3 - }, - { - "x": 4, - "y": 3 - }, - { - "x": 5, - "y": 3 - }, - { - "x": 6, - "y": 3 - }, - { - "x": 7, - "y": 3 - }, - { - "x": 9, - "y": 3, - "w": 2 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "y": 3 - }, - { - "x": 13, - "y": 3 - }, - { - "x": 14, - "y": 3 - }, - { - "x": 15, - "y": 3 - }, - { - "x": 16, - "y": 3 - }, - { - "x": 0, - "y": 4 - }, - { - "x": 1, - "y": 4, - "w": 1.25 - }, - { - "x": 2.25, - "y": 4, - "w": 1.25 - }, - { - "x": 3.5, - "y": 4 - }, - { - "x": 4.5, - "y": 4, - "w": 1.25 - }, - { - "x": 5.75, - "y": 4, - "w": 1.25 - }, - { - "x": 7, - "y": 4 - }, - { - "x": 9, - "y": 4 - }, - { - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "x": 12.5, - "y": 4 - }, - { - "x": 13.5, - "y": 4, - "w": 1.25 - }, - { - "x": 14.75, - "y": 4, - "w": 1.25 - }, - { - "x": 16, - "y": 4 - } + {"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": [0, 6], "x": 6, "y": 0}, + {"matrix": [1, 6], "x": 7, "y": 0}, + + {"matrix": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 6], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5}, + {"matrix": [6, 1], "x": 10.5, "y": 1}, + {"matrix": [6, 2], "x": 11.5, "y": 1}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 4], "x": 13.5, "y": 1}, + {"matrix": [6, 5], "x": 14.5, "y": 1}, + {"matrix": [7, 6], "x": 15.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2, "w": 1.75}, + {"matrix": [7, 1], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 4], "x": 13.75, "y": 2}, + {"matrix": [7, 5], "x": 14.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + + {"matrix": [8, 0], "x": 9, "y": 3, "w": 2}, + {"matrix": [8, 1], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 4], "x": 14, "y": 3}, + {"matrix": [8, 5], "x": 15, "y": 3}, + {"matrix": [8, 6], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 7, "y": 4}, + + {"matrix": [9, 0], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 12.5, "y": 4}, + {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 16, "y": 4} ] } } diff --git a/keyboards/takashicompany/dogtag/dogtag.c b/keyboards/takashicompany/dogtag/dogtag.c index e5d0779c08..0ca5f7c3e8 100644 --- a/keyboards/takashicompany/dogtag/dogtag.c +++ b/keyboards/takashicompany/dogtag/dogtag.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "dogtag.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { keypos_t key; diff --git a/keyboards/takashicompany/dogtag/dogtag.h b/keyboards/takashicompany/dogtag/dogtag.h deleted file mode 100644 index fb5ae151ea..0000000000 --- a/keyboards/takashicompany/dogtag/dogtag.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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( \ - l01, l02, l03, l04, r01, r02, r03, r04, \ - l05, l06, l07, l08, l09, r05, r06, r07, r08, r09, \ - l10, l11, r10, r11 \ -) { \ - { l01, l02, l03, l04, KC_NO }, \ - { l05, l06, l07, l08, l09 }, \ - { l10, l11, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, r01, r02, r03, r04}, \ - { r05, r06, r07, r08, r09 }, \ - { r10, r11, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 2a91bd48f0..8c572ad32f 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -35,94 +35,33 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "x": 8, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 3, - "y": 1 - }, - { - "x": 4, - "y": 2 - }, - { - "x": 7, - "y": 2 - }, - { - "x": 8, - "y": 1 - }, - { - "x": 9, - "y": 1 - }, - { - "x": 10, - "y": 1 - }, - { - "x": 11, - "y": 1 - }, - { - "x": 3.5, - "y": 3.25 - }, - { - "x": 4.5, - "y": 3.25 - }, - { - "x": 6.5, - "y": 3.25 - }, - { - "x": 7.5, - "y": 3.25 - } + {"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": [3, 1], "x": 8, "y": 0}, + {"matrix": [3, 2], "x": 9, "y": 0}, + {"matrix": [3, 3], "x": 10, "y": 0}, + {"matrix": [3, 4], "x": 11, "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": 2}, + + {"matrix": [4, 0], "x": 7, "y": 2}, + {"matrix": [4, 1], "x": 8, "y": 1}, + {"matrix": [4, 2], "x": 9, "y": 1}, + {"matrix": [4, 3], "x": 10, "y": 1}, + {"matrix": [4, 4], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 3.5, "y": 3.25}, + {"matrix": [2, 1], "x": 4.5, "y": 3.25}, + + {"matrix": [5, 0], "x": 6.5, "y": 3.25}, + {"matrix": [5, 1], "x": 7.5, "y": 3.25} ] } } diff --git a/keyboards/takashicompany/endzone34/endzone34.c b/keyboards/takashicompany/endzone34/endzone34.c index f96c6b3f35..403c4b7bb9 100644 --- a/keyboards/takashicompany/endzone34/endzone34.c +++ b/keyboards/takashicompany/endzone34/endzone34.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "endzone34.h" +#include "quantum.h" oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_270; diff --git a/keyboards/takashicompany/endzone34/endzone34.h b/keyboards/takashicompany/endzone34/endzone34.h deleted file mode 100644 index f3e5c88b63..0000000000 --- a/keyboards/takashicompany/endzone34/endzone34.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \ - k31, k32, k33, k34 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \ - { k11, k12, k13, k14, k15, k16, k17, k18, k19, k20 }, \ - { k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \ - { KC_NO, KC_NO, KC_NO, k31, k32, k33, k34, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index e9c9437902..8eb5b4dd57 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -18,46 +18,49 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0, "y":0.5}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Y", "x":7, "y":0}, - {"label":"U", "x":8, "y":0}, - {"label":"I", "x":9, "y":0}, - {"label":"O", "x":10, "y":0}, - {"label":"P", "x":11, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"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}, - {"label":"A", "x":0, "y":1.5}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"H", "x":7, "y":1}, - {"label":"J", "x":8, "y":1}, - {"label":"K", "x":9, "y":1}, - {"label":"L", "x":10, "y":1}, - {"label":"Enter", "x":11, "y":1.5}, + {"matrix": [0, 5], "x": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.5}, - {"label":"Z", "x":0, "y":2.5}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"N", "x":7, "y":2}, - {"label":"M", "x":8, "y":2}, - {"label":", ", "x":9, "y":2}, - {"label":".", "x":10, "y":2}, - {"label":"Back Space", "x":11, "y":2.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"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}, - {"label":"⇓", "x":4, "y":3}, - {"label":"Tab", "x":5, "y":3}, - {"label":"Space", "x":6, "y":3}, - {"label":"⇑", "x":7, "y":3} + {"matrix": [1, 5], "x": 7, "y": 1}, + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"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": 7, "y": 2}, + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.5}, + + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3} ] } } diff --git a/keyboards/takashicompany/heavy_left/heavy_left.h b/keyboards/takashicompany/heavy_left/heavy_left.h deleted file mode 100644 index a54f88b303..0000000000 --- a/keyboards/takashicompany/heavy_left/heavy_left.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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( \ - l06, l07, l08, l09, l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \ - l16, l17, l18, l19, l10, l11, l12, l13, l14, l15, r10, r11, r12, r13, r14, r15, r16, r17, r18, \ - l26, l27, l28, l29, l20, l21, l22, l23, l24, l25, r20, r21, r22, r23, r24, r25, r26, r27, \ - l36, l37, l38, l39, l30, l31, l32, l33, l34, l35, r30, r31, r32, r33, r34, r35, r36, r37, r38, \ - l46, l47, l48, l49, l40, l41, l42, l43, l44, l45, r40, r41, r42, r43, r44, r45, r46, r47, r48 \ -) { \ - { l00, l01, l02, l03, l04, l05, l06, l07, l08, l09 }, \ - { l10, l11, l12, l13, l14, l15, l16, l17, l18, l19 }, \ - { l20, l21, l22, l23, l24, l25, l26, l27, l28, l29 }, \ - { l30, l31, l32, l33, l34, l35, l36, l37, l38, l39 }, \ - { l40, l41, l42, l43, l44, l45, l46, l47, l48, l49 }, \ - { r00, r01, r02, r03, r04, r05, r06, r07, r09, KC_NO }, \ - { r10, r11, r12, r13, r14, r15, r16, r08, r18, KC_NO }, \ - { r20, r21, r22, r23, r24, r25, r26, r17, r27, KC_NO }, \ - { r30, r31, r32, r33, r34, r35, r36, r37, r38, KC_NO }, \ - { r40, r41, r42, r43, r44, r45, r46, r47, r48, KC_NO } \ -} diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 95ecb65e1b..a48fceb8d1 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -24,491 +24,120 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "24", - "x": 0, - "y": 0 - }, - { - "label": "25", - "x": 1, - "y": 0 - }, - { - "label": "26", - "x": 2, - "y": 0 - }, - { - "label": "27", - "x": 3, - "y": 0 - }, - { - "label": "1", - "x": 4.25, - "y": 0 - }, - { - "label": "2", - "x": 5.25, - "y": 0 - }, - { - "label": "3", - "x": 6.25, - "y": 0 - }, - { - "label": "4", - "x": 7.25, - "y": 0 - }, - { - "label": "5", - "x": 8.25, - "y": 0 - }, - { - "label": "6", - "x": 9.25, - "y": 0 - }, - { - "label": "44", - "x": 10.75, - "y": 0 - }, - { - "label": "45", - "x": 11.75, - "y": 0 - }, - { - "label": "46", - "x": 12.75, - "y": 0 - }, - { - "label": "47", - "x": 13.75, - "y": 0 - }, - { - "label": "48", - "x": 14.75, - "y": 0 - }, - { - "label": "49", - "x": 15.75, - "y": 0 - }, - { - "label": "50", - "x": 16.75, - "y": 0 - }, - { - "label": "51", - "x": 17.75, - "y": 0 - }, - { - "label": "52", - "x": 18.75, - "y": 0 - }, - { - "label": "82", - "x": 20, - "y": 0 - }, - { - "label": "28", - "x": 0, - "y": 1 - }, - { - "label": "29", - "x": 1, - "y": 1 - }, - { - "label": "30", - "x": 2, - "y": 1 - }, - { - "label": "31", - "x": 3, - "y": 1 - }, - { - "label": "201", - "x": 4.25, - "y": 1, - "w": 1.5 - }, - { - "label": "7", - "x": 5.75, - "y": 1 - }, - { - "label": "8", - "x": 6.75, - "y": 1 - }, - { - "label": "9", - "x": 7.75, - "y": 1 - }, - { - "label": "10", - "x": 8.75, - "y": 1 - }, - { - "label": "11", - "x": 9.75, - "y": 1 - }, - { - "label": "53", - "x": 11.25, - "y": 1 - }, - { - "label": "54", - "x": 12.25, - "y": 1 - }, - { - "label": "55", - "x": 13.25, - "y": 1 - }, - { - "label": "56", - "x": 14.25, - "y": 1 - }, - { - "label": "57", - "x": 15.25, - "y": 1 - }, - { - "label": "58", - "x": 16.25, - "y": 1 - }, - { - "label": "59", - "x": 17.25, - "y": 1 - }, - { - "label": "901", - "x": 18.5, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "label": "83", - "x": 20, - "y": 1 - }, - { - "label": "32", - "x": 0, - "y": 2 - }, - { - "label": "33", - "x": 1, - "y": 2 - }, - { - "label": "34", - "x": 2, - "y": 2 - }, - { - "label": "35", - "x": 3, - "y": 2 - }, - { - "label": "301", - "x": 4.25, - "y": 2, - "w": 1.75 - }, - { - "label": "12", - "x": 6, - "y": 2 - }, - { - "label": "13", - "x": 7, - "y": 2 - }, - { - "label": "14", - "x": 8, - "y": 2 - }, - { - "label": "15", - "x": 9, - "y": 2 - }, - { - "label": "16", - "x": 10, - "y": 2 - }, - { - "label": "60", - "x": 11.5, - "y": 2 - }, - { - "label": "61", - "x": 12.5, - "y": 2 - }, - { - "label": "62", - "x": 13.5, - "y": 2 - }, - { - "label": "63", - "x": 14.5, - "y": 2 - }, - { - "label": "64", - "x": 15.5, - "y": 2 - }, - { - "label": "65", - "x": 16.5, - "y": 2 - }, - { - "label": "66", - "x": 17.5, - "y": 2 - }, - { - "label": "84", - "x": 20, - "y": 2 - }, - { - "label": "36", - "x": 0, - "y": 3 - }, - { - "label": "37", - "x": 1, - "y": 3 - }, - { - "label": "38", - "x": 2, - "y": 3 - }, - { - "label": "39", - "x": 3, - "y": 3 - }, - { - "label": "601", - "x": 4.25, - "y": 3, - "w": 2.25 - }, - { - "label": "17", - "x": 6.5, - "y": 3 - }, - { - "label": "18", - "x": 7.5, - "y": 3 - }, - { - "label": "19", - "x": 8.5, - "y": 3 - }, - { - "label": "20", - "x": 9.5, - "y": 3 - }, - { - "label": "21", - "x": 10.5, - "y": 3 - }, - { - "label": "67", - "x": 11.75, - "y": 3 - }, - { - "label": "68", - "x": 12.75, - "y": 3 - }, - { - "label": "69", - "x": 13.75, - "y": 3 - }, - { - "label": "70", - "x": 14.75, - "y": 3 - }, - { - "label": "71", - "x": 15.75, - "y": 3 - }, - { - "label": "72", - "x": 16.75, - "y": 3 - }, - { - "label": "73", - "x": 17.75, - "y": 3 - }, - { - "label": "74", - "x": 18.75, - "y": 3 - }, - { - "label": "85", - "x": 20, - "y": 3 - }, - { - "label": "40", - "x": 0, - "y": 4 - }, - { - "label": "41", - "x": 1, - "y": 4 - }, - { - "label": "42", - "x": 2, - "y": 4 - }, - { - "label": "43", - "x": 3, - "y": 4 - }, - { - "label": "101", - "x": 4.25, - "y": 4, - "w": 1.25 - }, - { - "label": "22", - "x": 5.5, - "y": 4 - }, - { - "label": "102", - "x": 6.5, - "y": 4, - "w": 1.25 - }, - { - "label": "23", - "x": 7.75, - "y": 4 - }, - { - "label": "103", - "x": 8.75, - "y": 4, - "w": 1.25 - }, - { - "label": "104", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "75", - "x": 11.5, - "y": 4 - }, - { - "label": "105", - "x": 12.5, - "y": 4, - "w": 1.25 - }, - { - "label": "76", - "x": 13.75, - "y": 4 - }, - { - "label": "77", - "x": 14.75, - "y": 4 - }, - { - "label": "78", - "x": 15.75, - "y": 4 - }, - { - "label": "79", - "x": 16.75, - "y": 4 - }, - { - "label": "80", - "x": 17.75, - "y": 4 - }, - { - "label": "81", - "x": 18.75, - "y": 4 - }, - { - "label": "86", - "x": 20, - "y": 4 - } + {"matrix": [0, 6], "x": 0, "y": 0}, + {"matrix": [0, 7], "x": 1, "y": 0}, + {"matrix": [0, 8], "x": 2, "y": 0}, + {"matrix": [0, 9], "x": 3, "y": 0}, + + {"matrix": [0, 0], "x": 4.25, "y": 0}, + {"matrix": [0, 1], "x": 5.25, "y": 0}, + {"matrix": [0, 2], "x": 6.25, "y": 0}, + {"matrix": [0, 3], "x": 7.25, "y": 0}, + {"matrix": [0, 4], "x": 8.25, "y": 0}, + {"matrix": [0, 5], "x": 9.25, "y": 0}, + + {"matrix": [5, 0], "x": 10.75, "y": 0}, + {"matrix": [5, 1], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 3], "x": 13.75, "y": 0}, + {"matrix": [5, 4], "x": 14.75, "y": 0}, + {"matrix": [5, 5], "x": 15.75, "y": 0}, + {"matrix": [5, 6], "x": 16.75, "y": 0}, + {"matrix": [5, 7], "x": 17.75, "y": 0}, + {"matrix": [6, 7], "x": 18.75, "y": 0}, + + {"matrix": [5, 8], "x": 20, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1}, + {"matrix": [1, 7], "x": 1, "y": 1}, + {"matrix": [1, 8], "x": 2, "y": 1}, + {"matrix": [1, 9], "x": 3, "y": 1}, + + {"matrix": [1, 0], "x": 4.25, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 5.75, "y": 1}, + {"matrix": [1, 2], "x": 6.75, "y": 1}, + {"matrix": [1, 3], "x": 7.75, "y": 1}, + {"matrix": [1, 4], "x": 8.75, "y": 1}, + {"matrix": [1, 5], "x": 9.75, "y": 1}, + + {"matrix": [6, 0], "x": 11.25, "y": 1}, + {"matrix": [6, 1], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 4], "x": 15.25, "y": 1}, + {"matrix": [6, 5], "x": 16.25, "y": 1}, + {"matrix": [6, 6], "x": 17.25, "y": 1}, + {"matrix": [7, 7], "x": 18.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [6, 8], "x": 20, "y": 1}, + + {"matrix": [2, 6], "x": 0, "y": 2}, + {"matrix": [2, 7], "x": 1, "y": 2}, + {"matrix": [2, 8], "x": 2, "y": 2}, + {"matrix": [2, 9], "x": 3, "y": 2}, + + {"matrix": [2, 0], "x": 4.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 6, "y": 2}, + {"matrix": [2, 2], "x": 7, "y": 2}, + {"matrix": [2, 3], "x": 8, "y": 2}, + {"matrix": [2, 4], "x": 9, "y": 2}, + {"matrix": [2, 5], "x": 10, "y": 2}, + + {"matrix": [7, 0], "x": 11.5, "y": 2}, + {"matrix": [7, 1], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2}, + {"matrix": [7, 3], "x": 14.5, "y": 2}, + {"matrix": [7, 4], "x": 15.5, "y": 2}, + {"matrix": [7, 5], "x": 16.5, "y": 2}, + {"matrix": [7, 6], "x": 17.5, "y": 2}, + + {"matrix": [7, 8], "x": 20, "y": 2}, + + {"matrix": [3, 6], "x": 0, "y": 3}, + {"matrix": [3, 7], "x": 1, "y": 3}, + {"matrix": [3, 8], "x": 2, "y": 3}, + {"matrix": [3, 9], "x": 3, "y": 3}, + + {"matrix": [3, 0], "x": 4.25, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 6.5, "y": 3}, + {"matrix": [3, 2], "x": 7.5, "y": 3}, + {"matrix": [3, 3], "x": 8.5, "y": 3}, + {"matrix": [3, 4], "x": 9.5, "y": 3}, + {"matrix": [3, 5], "x": 10.5, "y": 3}, + + {"matrix": [8, 0], "x": 11.75, "y": 3}, + {"matrix": [8, 1], "x": 12.75, "y": 3}, + {"matrix": [8, 2], "x": 13.75, "y": 3}, + {"matrix": [8, 3], "x": 14.75, "y": 3}, + {"matrix": [8, 4], "x": 15.75, "y": 3}, + {"matrix": [8, 5], "x": 16.75, "y": 3}, + {"matrix": [8, 6], "x": 17.75, "y": 3}, + {"matrix": [8, 7], "x": 18.75, "y": 3}, + + {"matrix": [8, 8], "x": 20, "y": 3}, + + {"matrix": [4, 6], "x": 0, "y": 4}, + {"matrix": [4, 7], "x": 1, "y": 4}, + {"matrix": [4, 8], "x": 2, "y": 4}, + {"matrix": [4, 9], "x": 3, "y": 4}, + + {"matrix": [4, 0], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 5.5, "y": 4}, + {"matrix": [4, 2], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 7.75, "y": 4}, + {"matrix": [4, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 11.5, "y": 4}, + {"matrix": [9, 1], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13.75, "y": 4}, + {"matrix": [9, 3], "x": 14.75, "y": 4}, + {"matrix": [9, 4], "x": 15.75, "y": 4}, + {"matrix": [9, 5], "x": 16.75, "y": 4}, + {"matrix": [9, 6], "x": 17.75, "y": 4}, + {"matrix": [9, 7], "x": 18.75, "y": 4}, + + {"matrix": [9, 8], "x": 20, "y": 4} ] } } diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index c591487e7b..806a255bcb 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -21,47 +21,51 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 0, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 0, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84 }, + {"matrix": [0, 0], "x": 0, "y": 0.42, "w": 0.84, "h": 0.84}, + {"matrix": [0, 1], "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [0, 2], "x": 1.68, "y": 0, "w": 0.84, "h": 0.84}, + {"matrix": [0, 3], "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [0, 4], "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84}, - { "x": 0, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84 }, + {"matrix": [0, 5], "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84}, + {"matrix": [0, 6], "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [1, 0], "x": 7.56, "y": 0, "w": 0.84, "h": 0.84}, + {"matrix": [1, 1], "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [1, 2], "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84}, - { "x": 0, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84 }, + {"matrix": [1, 3], "x": 0, "y": 1.26, "w": 0.84, "h": 0.84}, + {"matrix": [1, 4], "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [1, 5], "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84}, + {"matrix": [1, 6], "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 0], "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84}, - { "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84 } + {"matrix": [2, 1], "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84}, + {"matrix": [2, 2], "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 3], "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84}, + {"matrix": [2, 4], "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 5], "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84}, + + {"matrix": [2, 6], "x": 0, "y": 2.1, "w": 0.84, "h": 0.84}, + {"matrix": [3, 0], "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 1], "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84}, + {"matrix": [3, 2], "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 3], "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84}, + + {"matrix": [3, 4], "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84}, + {"matrix": [3, 5], "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 6], "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84}, + {"matrix": [4, 0], "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [4, 1], "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84}, + + {"matrix": [4, 2], "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84}, + {"matrix": [4, 3], "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84}, + {"matrix": [4, 4], "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [4, 5], "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84}, + + {"matrix": [4, 6], "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [5, 0], "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [5, 1], "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84}, + {"matrix": [5, 2], "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84} ] } } diff --git a/keyboards/takashicompany/minizone/minizone.c b/keyboards/takashicompany/minizone/minizone.c index 5231c8c497..1574b0aef7 100644 --- a/keyboards/takashicompany/minizone/minizone.c +++ b/keyboards/takashicompany/minizone/minizone.c @@ -1,7 +1,7 @@ // Copyright 2022 takashicompany (@takashicompany) // SPDX-License-Identifier: GPL-2.0-or-later -#include "minizone.h" +#include "quantum.h" #ifdef OLED_ENABLE diff --git a/keyboards/takashicompany/minizone/minizone.h b/keyboards/takashicompany/minizone/minizone.h deleted file mode 100644 index 0e8d62c30d..0000000000 --- a/keyboards/takashicompany/minizone/minizone.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2022 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* 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, k06, k10, k11, k12, \ - k13, k14, k15, k16, k20, k21, k22, k23, k24, k25, \ - k26, k30, k31, k32, k33, k34, k35, k36, k40, k41, \ - k42, k43, k44, k45, k46, k50, k51, k52 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, k33, k34, k35, k36 }, \ - { k40, k41, k42, k43, k44, k45, k46 }, \ - { k50, k51, k52, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index d7e9e2271e..c9aacaabc2 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -23,46 +23,46 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "w":1.5}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":10.5, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, - {"x":0, "y":1, "w":1.75}, - {"x":1.75, "y":1}, - {"x":2.75, "y":1}, - {"x":3.75, "y":1}, - {"x":4.75, "y":1}, - {"x":5.75, "y":1}, - {"x":6.75, "y":1}, - {"x":7.75, "y":1}, - {"x":8.75, "y":1}, - {"x":9.75, "y":1}, - {"x":10.75, "y":1}, - {"x":11.75, "y":0, "w":1.25, "h":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 0, "w": 1.25, "h": 2}, - {"x":0, "y":2, "w":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2} ] } } diff --git a/keyboards/takashicompany/qoolee/qoolee.h b/keyboards/takashicompany/qoolee/qoolee.h deleted file mode 100644 index 986e7e3ec3..0000000000 --- a/keyboards/takashicompany/qoolee/qoolee.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b \ -) { \ - { k00, k01, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b } \ -} diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index d9b0e1aaa0..e3af5b8371 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -21,186 +21,59 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "x": 4, - "y": 0 - }, - { - "x": 5, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 12, - "y": 0 - }, - { - "x": 13, - "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": 7, - "y": 1 - }, - { - "x": 9, - "y": 1 - }, - { - "x": 10, - "y": 1 - }, - { - "x": 11, - "y": 1 - }, - { - "x": 12, - "y": 1 - }, - { - "x": 13, - "y": 1 - }, - { - "x": 14, - "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 - }, - { - "x": 9, - "y": 2 - }, - { - "x": 10, - "y": 2 - }, - { - "x": 11, - "y": 2 - }, - { - "x": 12, - "y": 2 - }, - { - "x": 13, - "y": 2 - }, - { - "x": 14, - "y": 2 - }, - { - "x": 2, - "y": 3 - }, - { - "x": 3, - "y": 3 - }, - { - "x": 4, - "y": 3 - }, - { - "x": 5, - "y": 3 - }, - { - "x": 6, - "y": 3 - }, - { - "x": 8, - "y": 3 - }, - { - "x": 9, - "y": 3 - }, - { - "x": 10, - "y": 3 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "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, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [1, 1], "x": 12, "y": 0}, + {"matrix": [1, 2], "x": 13, "y": 0}, + + {"matrix": [5, 5], "x": 0, "y": 1}, + {"matrix": [1, 3], "x": 1, "y": 1}, + {"matrix": [1, 4], "x": 2, "y": 1}, + {"matrix": [1, 5], "x": 3, "y": 1}, + {"matrix": [1, 6], "x": 4, "y": 1}, + {"matrix": [2, 0], "x": 5, "y": 1}, + + {"matrix": [6, 2], "x": 7, "y": 1}, + + {"matrix": [2, 1], "x": 9, "y": 1}, + {"matrix": [2, 2], "x": 10, "y": 1}, + {"matrix": [2, 3], "x": 11, "y": 1}, + {"matrix": [2, 4], "x": 12, "y": 1}, + {"matrix": [2, 5], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, + + {"matrix": [5, 6], "x": 0, "y": 2}, + {"matrix": [2, 6], "x": 1, "y": 2}, + {"matrix": [3, 0], "x": 2, "y": 2}, + {"matrix": [3, 1], "x": 3, "y": 2}, + {"matrix": [3, 2], "x": 4, "y": 2}, + {"matrix": [3, 3], "x": 5, "y": 2}, + + {"matrix": [3, 4], "x": 9, "y": 2}, + {"matrix": [3, 5], "x": 10, "y": 2}, + {"matrix": [3, 6], "x": 11, "y": 2}, + {"matrix": [4, 0], "x": 12, "y": 2}, + {"matrix": [4, 1], "x": 13, "y": 2}, + {"matrix": [6, 1], "x": 14, "y": 2}, + + {"matrix": [4, 2], "x": 2, "y": 3}, + {"matrix": [4, 3], "x": 3, "y": 3}, + {"matrix": [4, 4], "x": 4, "y": 3}, + {"matrix": [4, 5], "x": 5, "y": 3}, + {"matrix": [4, 6], "x": 6, "y": 3}, + + {"matrix": [5, 0], "x": 8, "y": 3}, + {"matrix": [5, 1], "x": 9, "y": 3}, + {"matrix": [5, 2], "x": 10, "y": 3}, + {"matrix": [5, 3], "x": 11, "y": 3}, + {"matrix": [5, 4], "x": 12, "y": 3} ] } } diff --git a/keyboards/takashicompany/radialex/radialex.h b/keyboards/takashicompany/radialex/radialex.h deleted file mode 100644 index 8ad5712201..0000000000 --- a/keyboards/takashicompany/radialex/radialex.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \ - k41, k11, k12, k13, k14, k15, k45, k16, k17, k18, k19, k20, k43, \ - k42, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k44, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07 }, \ - { k08, k09, k10, k11, k12, k13, k14 }, \ - { k15, k16, k17, k18, k19, k20, k21 }, \ - { k22, k23, k24, k25, k26, k27, k28 }, \ - { k29, k30, k31, k32, k33, k34, k35 }, \ - { k36, k37, k38, k39, k40, k41, k42 }, \ - { k43, k44, k45, KC_NO, KC_NO, KC_NO, KC_NO } \ -} -- cgit v1.2.3 From c9f619124d41637ece157570703423c3890cb6c2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 16 Apr 2023 01:18:44 +1000 Subject: Encodermap direction define. (#20454) --- keyboards/takashicompany/goat51/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/goat51/keymaps/via/keymap.c b/keyboards/takashicompany/goat51/keymaps/via/keymap.c index b4858a17b5..3163afd0c7 100644 --- a/keyboards/takashicompany/goat51/keymaps/via/keymap.c +++ b/keyboards/takashicompany/goat51/keymaps/via/keymap.c @@ -94,7 +94,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }, { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, -- cgit v1.2.3 From 798cbfe6a3430be9f73d3bc7c76550394077ccdb Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 16 Apr 2023 15:37:24 +1000 Subject: Fix info.json LTO and format encoder definitions (#20456) --- keyboards/takashicompany/goat51/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json index 04a29143bf..ac4a9102d9 100644 --- a/keyboards/takashicompany/goat51/info.json +++ b/keyboards/takashicompany/goat51/info.json @@ -37,7 +37,7 @@ }, "encoder": { "rotary": [ - { "pin_a": "D1", "pin_b": "D0" } + {"pin_a": "D1", "pin_b": "D0"} ] }, "url": "https://github.com/takashicompany/goat51", -- 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/takashicompany/compacx/info.json | 2 +- keyboards/takashicompany/dogtag/info.json | 2 +- keyboards/takashicompany/goat51/info.json | 2 +- keyboards/takashicompany/heavy_left/info.json | 2 +- keyboards/takashicompany/radialex/info.json | 2 +- keyboards/takashicompany/tightwriter/info.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index edc71222a0..2e7ef2f7a6 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -112,4 +112,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 8c572ad32f..e826e36741 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -65,4 +65,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json index ac4a9102d9..bc162527b5 100644 --- a/keyboards/takashicompany/goat51/info.json +++ b/keyboards/takashicompany/goat51/info.json @@ -497,4 +497,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index a48fceb8d1..1afa2b1280 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -141,4 +141,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index e3af5b8371..d6852033b1 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -77,4 +77,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/info.json index 891968963c..a2e86fe27f 100644 --- a/keyboards/takashicompany/tightwriter/info.json +++ b/keyboards/takashicompany/tightwriter/info.json @@ -96,4 +96,4 @@ ] } } -} \ No newline at end of file +} -- cgit v1.2.3 From a5e46d80822797cd2e0dc2a2b81c4ccce9e167f4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 May 2023 12:19:34 +1000 Subject: More `info.json` whitespace cleanups (#20665) --- keyboards/takashicompany/goat51/info.json | 498 +++------------------- keyboards/takashicompany/spreadwriter/info.json | 525 +++--------------------- keyboards/takashicompany/tightwriter/info.json | 88 ++-- 3 files changed, 150 insertions(+), 961 deletions(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json index bc162527b5..c424685713 100644 --- a/keyboards/takashicompany/goat51/info.json +++ b/keyboards/takashicompany/goat51/info.json @@ -15,25 +15,8 @@ "rgblight": true }, "matrix_pins": { - "cols": [ - "D4", - "C6", - "D7", - "E6", - "B4", - "B5", - "D2" - ], - "rows": [ - "F4", - "F5", - "F6", - "F7", - "B1", - "B3", - "B2", - "B6" - ] + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, "encoder": { "rotary": [ @@ -70,430 +53,59 @@ "layouts": { "LAYOUT": { "layout": [ - { - "matrix": [ - 0, - 0 - ], - "x": 0, - "y": 0.5 - }, - { - "matrix": [ - 0, - 1 - ], - "x": 1, - "y": 0.5 - }, - { - "matrix": [ - 0, - 2 - ], - "x": 2, - "y": 0.25 - }, - { - "matrix": [ - 0, - 3 - ], - "x": 3, - "y": 0 - }, - { - "matrix": [ - 0, - 4 - ], - "x": 4, - "y": 0 - }, - { - "matrix": [ - 0, - 5 - ], - "x": 5, - "y": 0 - }, - { - "matrix": [ - 4, - 1 - ], - "x": 10, - "y": 0 - }, - { - "matrix": [ - 4, - 2 - ], - "x": 11, - "y": 0 - }, - { - "matrix": [ - 4, - 3 - ], - "x": 12, - "y": 0 - }, - { - "matrix": [ - 4, - 4 - ], - "x": 13, - "y": 0.25 - }, - { - "matrix": [ - 4, - 5 - ], - "x": 14, - "y": 0.5 - }, - { - "matrix": [ - 4, - 6 - ], - "x": 15, - "y": 0.5 - }, - { - "matrix": [ - 1, - 0 - ], - "x": 0, - "y": 1.5 - }, - { - "matrix": [ - 1, - 1 - ], - "x": 1, - "y": 1.5 - }, - { - "matrix": [ - 1, - 2 - ], - "x": 2, - "y": 1.25 - }, - { - "matrix": [ - 1, - 3 - ], - "x": 3, - "y": 1 - }, - { - "matrix": [ - 1, - 4 - ], - "x": 4, - "y": 1 - }, - { - "matrix": [ - 1, - 5 - ], - "x": 5, - "y": 1 - }, - { - "matrix": [ - 1, - 6 - ], - "x": 7.5, - "y": 0.5 - }, - { - "matrix": [ - 5, - 1 - ], - "x": 10, - "y": 1 - }, - { - "matrix": [ - 5, - 2 - ], - "x": 11, - "y": 1 - }, - { - "matrix": [ - 5, - 3 - ], - "x": 12, - "y": 1 - }, - { - "matrix": [ - 5, - 4 - ], - "x": 13, - "y": 1.25 - }, - { - "matrix": [ - 5, - 5 - ], - "x": 14, - "y": 1.5 - }, - { - "matrix": [ - 5, - 6 - ], - "x": 15, - "y": 1.5 - }, - { - "matrix": [ - 2, - 0 - ], - "x": 0, - "y": 2.5 - }, - { - "matrix": [ - 2, - 1 - ], - "x": 1, - "y": 2.5 - }, - { - "matrix": [ - 2, - 2 - ], - "x": 2, - "y": 2.25 - }, - { - "matrix": [ - 2, - 3 - ], - "x": 3, - "y": 2 - }, - { - "matrix": [ - 2, - 4 - ], - "x": 4, - "y": 2 - }, - { - "matrix": [ - 2, - 5 - ], - "x": 5, - "y": 2 - }, - { - "matrix": [ - 6, - 1 - ], - "x": 10, - "y": 2 - }, - { - "matrix": [ - 6, - 2 - ], - "x": 11, - "y": 2 - }, - { - "matrix": [ - 6, - 3 - ], - "x": 12, - "y": 2 - }, - { - "matrix": [ - 6, - 4 - ], - "x": 13, - "y": 2.25 - }, - { - "matrix": [ - 6, - 5 - ], - "x": 14, - "y": 2.5 - }, - { - "matrix": [ - 6, - 6 - ], - "x": 15, - "y": 2.5 - }, - { - "matrix": [ - 3, - 0 - ], - "x": 0, - "y": 3.5 - }, - { - "matrix": [ - 3, - 1 - ], - "x": 1, - "y": 3.5 - }, - { - "matrix": [ - 3, - 2 - ], - "x": 2, - "y": 3.25 - }, - { - "matrix": [ - 3, - 3 - ], - "x": 3, - "y": 3 - }, - { - "matrix": [ - 3, - 4 - ], - "x": 4, - "y": 3 - }, - { - "matrix": [ - 3, - 5 - ], - "x": 5, - "y": 3 - }, - { - "matrix": [ - 3, - 6 - ], - "x": 6, - "y": 3 - }, - { - "matrix": [ - 7, - 0 - ], - "x": 9, - "y": 3 - }, - { - "matrix": [ - 7, - 1 - ], - "x": 10, - "y": 3 - }, - { - "matrix": [ - 7, - 2 - ], - "x": 11, - "y": 3 - }, - { - "matrix": [ - 7, - 3 - ], - "x": 12, - "y": 3 - }, - { - "matrix": [ - 7, - 4 - ], - "x": 13, - "y": 3.25 - }, - { - "matrix": [ - 7, - 5 - ], - "x": 14, - "y": 3.5 - }, - { - "matrix": [ - 7, - 6 - ], - "x": 15, - "y": 3.5 - }, - { - "matrix": [ - 0, - 6 - ], - "x": 7, - "y": 1.5 - }, - { - "matrix": [ - 4, - 0 - ], - "x": 8, - "y": 1.5 - } + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0.25}, + {"matrix": [4, 5], "x": 14, "y": 0.5}, + {"matrix": [4, 6], "x": 15, "y": 0.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 7.5, "y": 0.5}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 4], "x": 13, "y": 1.25}, + {"matrix": [5, 5], "x": 14, "y": 1.5}, + {"matrix": [5, 6], "x": 15, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 4], "x": 13, "y": 2.25}, + {"matrix": [6, 5], "x": 14, "y": 2.5}, + {"matrix": [6, 6], "x": 15, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [7, 0], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 11, "y": 3}, + {"matrix": [7, 3], "x": 12, "y": 3}, + {"matrix": [7, 4], "x": 13, "y": 3.25}, + {"matrix": [7, 5], "x": 14, "y": 3.5}, + {"matrix": [7, 6], "x": 15, "y": 3.5}, + {"matrix": [0, 6], "x": 7, "y": 1.5}, + {"matrix": [4, 0], "x": 8, "y": 1.5} ] } } diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json index 161ed5ed60..1ab624ebcd 100644 --- a/keyboards/takashicompany/spreadwriter/info.json +++ b/keyboards/takashicompany/spreadwriter/info.json @@ -13,25 +13,8 @@ "nkro": true }, "matrix_pins": { - "cols": [ - "D4", - "C6", - "D7", - "E6", - "B4", - "B5", - "D2" - ], - "rows": [ - "F4", - "F5", - "F6", - "F7", - "B1", - "B3", - "B2", - "B6" - ] + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, "processor": "atmega32u4", "url": "https://github.com/takashicompany/spreadwriter", @@ -69,454 +52,62 @@ "layouts": { "LAYOUT": { "layout": [ - { - "matrix": [ - 0, - 0 - ], - "x": 0, - "y": 0.5 - }, - { - "matrix": [ - 0, - 1 - ], - "x": 1, - "y": 0.5 - }, - { - "matrix": [ - 0, - 2 - ], - "x": 2, - "y": 0.25 - }, - { - "matrix": [ - 0, - 3 - ], - "x": 3, - "y": 0 - }, - { - "matrix": [ - 0, - 4 - ], - "x": 4, - "y": 0 - }, - { - "matrix": [ - 0, - 5 - ], - "x": 5, - "y": 0 - }, - { - "matrix": [ - 4, - 1 - ], - "x": 10, - "y": 0 - }, - { - "matrix": [ - 4, - 2 - ], - "x": 11, - "y": 0 - }, - { - "matrix": [ - 4, - 3 - ], - "x": 12, - "y": 0 - }, - { - "matrix": [ - 4, - 4 - ], - "x": 13, - "y": 0.25 - }, - { - "matrix": [ - 4, - 5 - ], - "x": 14, - "y": 0.5 - }, - { - "matrix": [ - 4, - 6 - ], - "x": 15, - "y": 0.5 - }, - { - "matrix": [ - 1, - 0 - ], - "x": 0, - "y": 1.5 - }, - { - "matrix": [ - 1, - 1 - ], - "x": 1, - "y": 1.5 - }, - { - "matrix": [ - 1, - 2 - ], - "x": 2, - "y": 1.25 - }, - { - "matrix": [ - 1, - 3 - ], - "x": 3, - "y": 1 - }, - { - "matrix": [ - 1, - 4 - ], - "x": 4, - "y": 1 - }, - { - "matrix": [ - 1, - 5 - ], - "x": 5, - "y": 1 - }, - { - "matrix": [ - 1, - 6 - ], - "x": 7.5, - "y": 1 - }, - { - "matrix": [ - 5, - 1 - ], - "x": 10, - "y": 1 - }, - { - "matrix": [ - 5, - 2 - ], - "x": 11, - "y": 1 - }, - { - "matrix": [ - 5, - 3 - ], - "x": 12, - "y": 1 - }, - { - "matrix": [ - 5, - 4 - ], - "x": 13, - "y": 1.25 - }, - { - "matrix": [ - 5, - 5 - ], - "x": 14, - "y": 1.5 - }, - { - "matrix": [ - 5, - 6 - ], - "x": 15, - "y": 1.5 - }, - { - "matrix": [ - 2, - 0 - ], - "x": 0, - "y": 2.5 - }, - { - "matrix": [ - 2, - 1 - ], - "x": 1, - "y": 2.5 - }, - { - "matrix": [ - 2, - 2 - ], - "x": 2, - "y": 2.25 - }, - { - "matrix": [ - 2, - 3 - ], - "x": 3, - "y": 2 - }, - { - "matrix": [ - 2, - 4 - ], - "x": 4, - "y": 2 - }, - { - "matrix": [ - 2, - 5 - ], - "x": 5, - "y": 2 - }, - { - "matrix": [ - 2, - 6 - ], - "x": 6, - "y": 2 - }, - { - "matrix": [ - 6, - 0 - ], - "x": 9, - "y": 2 - }, - { - "matrix": [ - 6, - 1 - ], - "x": 10, - "y": 2 - }, - { - "matrix": [ - 6, - 2 - ], - "x": 11, - "y": 2 - }, - { - "matrix": [ - 6, - 3 - ], - "x": 12, - "y": 2 - }, - { - "matrix": [ - 6, - 4 - ], - "x": 13, - "y": 2.25 - }, - { - "matrix": [ - 6, - 5 - ], - "x": 14, - "y": 2.5 - }, - { - "matrix": [ - 6, - 6 - ], - "x": 15, - "y": 2.5 - }, - { - "matrix": [ - 3, - 0 - ], - "x": 0, - "y": 3.5 - }, - { - "matrix": [ - 3, - 1 - ], - "x": 1, - "y": 3.5 - }, - { - "matrix": [ - 3, - 2 - ], - "x": 2, - "y": 3.25 - }, - { - "matrix": [ - 3, - 3 - ], - "x": 3, - "y": 3 - }, - { - "matrix": [ - 3, - 4 - ], - "x": 4, - "y": 3 - }, - { - "matrix": [ - 3, - 5 - ], - "x": 5, - "y": 3 - }, - { - "matrix": [ - 3, - 6 - ], - "x": 6, - "y": 3 - }, - { - "matrix": [ - 5, - 0 - ], - "x": 7.5, - "y": 3 - }, - { - "matrix": [ - 7, - 0 - ], - "x": 9, - "y": 3 - }, - { - "matrix": [ - 7, - 1 - ], - "x": 10, - "y": 3 - }, - { - "matrix": [ - 7, - 2 - ], - "x": 11, - "y": 3 - }, - { - "matrix": [ - 7, - 3 - ], - "x": 12, - "y": 3 - }, - { - "matrix": [ - 7, - 4 - ], - "x": 13, - "y": 3.25 - }, - { - "matrix": [ - 7, - 5 - ], - "x": 14, - "y": 3.5 - }, - { - "matrix": [ - 7, - 6 - ], - "x": 15, - "y": 3.5 - }, - { - "matrix": [ - 0, - 6 - ], - "x": 7, - "y": 4.25 - }, - { - "matrix": [ - 4, - 0 - ], - "x": 8, - "y": 4.25 - } + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0.25}, + {"matrix": [4, 5], "x": 14, "y": 0.5}, + {"matrix": [4, 6], "x": 15, "y": 0.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 7.5, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 4], "x": 13, "y": 1.25}, + {"matrix": [5, 5], "x": 14, "y": 1.5}, + {"matrix": [5, 6], "x": 15, "y": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [6, 0], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 4], "x": 13, "y": 2.25}, + {"matrix": [6, 5], "x": 14, "y": 2.5}, + {"matrix": [6, 6], "x": 15, "y": 2.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [5, 0], "x": 7.5, "y": 3}, + {"matrix": [7, 0], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 11, "y": 3}, + {"matrix": [7, 3], "x": 12, "y": 3}, + {"matrix": [7, 4], "x": 13, "y": 3.25}, + {"matrix": [7, 5], "x": 14, "y": 3.5}, + {"matrix": [7, 6], "x": 15, "y": 3.5}, + {"matrix": [0, 6], "x": 7, "y": 4.25}, + {"matrix": [4, 0], "x": 8, "y": 4.25} ] } } diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/info.json index a2e86fe27f..201e3f6ed5 100644 --- a/keyboards/takashicompany/tightwriter/info.json +++ b/keyboards/takashicompany/tightwriter/info.json @@ -14,22 +14,8 @@ "rgblight": true }, "matrix_pins": { - "cols": [ - "D4", - "C6", - "D7", - "E6", - "B4", - "B5" - ], - "rows": [ - "F6", - "F7", - "B1", - "B3", - "B2", - "B6" - ] + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] }, "url": "", "usb": { @@ -58,41 +44,41 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25 }, - { "matrix": [0, 1], "x": 1.25, "y": 0 }, - { "matrix": [0, 2], "x": 2.25, "y": 0 }, - { "matrix": [0, 3], "x": 3.25, "y": 0 }, - { "matrix": [0, 4], "x": 4.25, "y": 0 }, - { "matrix": [0, 5], "x": 5.25, "y": 0 }, - { "matrix": [1, 0], "x": 6.25, "y": 0 }, - { "matrix": [1, 1], "x": 7.25, "y": 0 }, - { "matrix": [1, 2], "x": 8.25, "y": 0 }, - { "matrix": [1, 3], "x": 9.25, "y": 0 }, - { "matrix": [1, 4], "x": 10.25, "y": 0 }, - { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75 }, - { "matrix": [2, 1], "x": 1.75, "y": 1 }, - { "matrix": [2, 2], "x": 2.75, "y": 1 }, - { "matrix": [2, 3], "x": 3.75, "y": 1 }, - { "matrix": [2, 4], "x": 4.75, "y": 1 }, - { "matrix": [2, 5], "x": 5.75, "y": 1 }, - { "matrix": [3, 0], "x": 6.75, "y": 1 }, - { "matrix": [3, 1], "x": 7.75, "y": 1 }, - { "matrix": [3, 2], "x": 8.75, "y": 1 }, - { "matrix": [1, 5], "x": 10, "y": 1, "w": 1.25, "h": 2 }, - { "matrix": [4, 0], "x": 0, "y": 2, "w": 2 }, - { "matrix": [4, 1], "x": 2, "y": 2 }, - { "matrix": [4, 2], "x": 3, "y": 2 }, - { "matrix": [4, 3], "x": 4, "y": 2 }, - { "matrix": [4, 4], "x": 5, "y": 2 }, - { "matrix": [4, 5], "x": 6, "y": 2 }, - { "matrix": [3, 3], "x": 7, "y": 2 }, - { "matrix": [3, 4], "x": 8, "y": 2 }, - { "matrix": [3, 5], "x": 9, "y": 2 }, - { "matrix": [5, 0], "x": 0, "y": 3, "w": 1.25 }, - { "matrix": [5, 1], "x": 1.25, "y": 3, "w": 1.25 }, - { "matrix": [5, 2], "x": 2.5, "y": 3, "w": 6.25 }, - { "matrix": [5, 3], "x": 8.75, "y": 3, "w": 1.25 }, - { "matrix": [5, 4], "x": 10, "y": 3, "w": 1.25 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [1, 0], "x": 6.25, "y": 0}, + {"matrix": [1, 1], "x": 7.25, "y": 0}, + {"matrix": [1, 2], "x": 8.25, "y": 0}, + {"matrix": [1, 3], "x": 9.25, "y": 0}, + {"matrix": [1, 4], "x": 10.25, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 1}, + {"matrix": [2, 2], "x": 2.75, "y": 1}, + {"matrix": [2, 3], "x": 3.75, "y": 1}, + {"matrix": [2, 4], "x": 4.75, "y": 1}, + {"matrix": [2, 5], "x": 5.75, "y": 1}, + {"matrix": [3, 0], "x": 6.75, "y": 1}, + {"matrix": [3, 1], "x": 7.75, "y": 1}, + {"matrix": [3, 2], "x": 8.75, "y": 1}, + {"matrix": [1, 5], "x": 10, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + {"matrix": [4, 2], "x": 3, "y": 2}, + {"matrix": [4, 3], "x": 4, "y": 2}, + {"matrix": [4, 4], "x": 5, "y": 2}, + {"matrix": [4, 5], "x": 6, "y": 2}, + {"matrix": [3, 3], "x": 7, "y": 2}, + {"matrix": [3, 4], "x": 8, "y": 2}, + {"matrix": [3, 5], "x": 9, "y": 2}, + {"matrix": [5, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 3, "w": 6.25}, + {"matrix": [5, 3], "x": 8.75, "y": 3, "w": 1.25}, + {"matrix": [5, 4], "x": 10, "y": 3, "w": 1.25} ] } } -- cgit v1.2.3 From 63dca1a0ab20ab130d5cfc0e44c4638b3bff0c29 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Mon, 8 May 2023 18:09:27 -0600 Subject: Fixup dogtag (#20808) --- keyboards/takashicompany/dogtag/config.h | 57 ---------------------- keyboards/takashicompany/dogtag/info.json | 25 ++++++++++ .../takashicompany/dogtag/keymaps/via/rules.mk | 3 +- keyboards/takashicompany/dogtag/rules.mk | 17 +------ 4 files changed, 28 insertions(+), 74 deletions(-) delete mode 100644 keyboards/takashicompany/dogtag/config.h (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h deleted file mode 100644 index f71ff71726..0000000000 --- a/keyboards/takashicompany/dogtag/config.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -Copyright 2021 takashicompany - -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 - -# define RGBLED_NUM 4 * 2 -# define RGBLED_SPLIT { 4, 4 } -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# 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 */ -#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 - -/* 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 - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index e826e36741..6827375d84 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -8,6 +8,12 @@ "pid": "0x0018", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "ws2812": { "pin": "D3" }, @@ -17,11 +23,13 @@ }, "diode_direction": "COL2ROW", "encoder": { + "enabled": true, "rotary": [ {"pin_a": "D4", "pin_b": "C6"} ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { @@ -32,6 +40,23 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "rgblight": { + "led_count": 8, + "split_count": [4, 4], + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/takashicompany/dogtag/keymaps/via/rules.mk b/keyboards/takashicompany/dogtag/keymaps/via/rules.mk index 036bd6d1c3..36b7ba9cbc 100644 --- a/keyboards/takashicompany/dogtag/keymaps/via/rules.mk +++ b/keyboards/takashicompany/dogtag/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/takashicompany/dogtag/rules.mk b/keyboards/takashicompany/dogtag/rules.mk index f4556ff1c6..6e7633bfe0 100644 --- a/keyboards/takashicompany/dogtag/rules.mk +++ b/keyboards/takashicompany/dogtag/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes -MOUSEKEY_ENABLE = yes \ No newline at end of file +# This file intentionally left blank -- 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/takashicompany/center_enter/config.h | 1 - keyboards/takashicompany/compacx/config.h | 1 - keyboards/takashicompany/endzone34/config.h | 1 - keyboards/takashicompany/heavy_left/config.h | 1 - keyboards/takashicompany/minizone/config.h | 1 - keyboards/takashicompany/qoolee/config.h | 1 - keyboards/takashicompany/radialex/config.h | 1 - 7 files changed, 7 deletions(-) (limited to 'keyboards/takashicompany') diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h index 6610fca8bf..83952009e5 100644 --- a/keyboards/takashicompany/center_enter/config.h +++ b/keyboards/takashicompany/center_enter/config.h @@ -21,7 +21,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 255 /* 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/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h index 90d19444ad..07287712f3 100644 --- a/keyboards/takashicompany/compacx/config.h +++ b/keyboards/takashicompany/compacx/config.h @@ -22,7 +22,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 255 /* 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/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h index 59c63c91fd..ccd72051a7 100644 --- a/keyboards/takashicompany/endzone34/config.h +++ b/keyboards/takashicompany/endzone34/config.h @@ -21,7 +21,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 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== all animations enable ==*/ #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h index a4685b9d06..df15f55f72 100644 --- a/keyboards/takashicompany/heavy_left/config.h +++ b/keyboards/takashicompany/heavy_left/config.h @@ -22,7 +22,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 255 /* 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/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h index 6f631456ea..2c494ea329 100644 --- a/keyboards/takashicompany/minizone/config.h +++ b/keyboards/takashicompany/minizone/config.h @@ -7,7 +7,6 @@ # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 # 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 */ # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h index 6610fca8bf..83952009e5 100644 --- a/keyboards/takashicompany/qoolee/config.h +++ b/keyboards/takashicompany/qoolee/config.h @@ -21,7 +21,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 255 /* 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/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h index 39e1d8df5b..34ab4a1239 100644 --- a/keyboards/takashicompany/radialex/config.h +++ b/keyboards/takashicompany/radialex/config.h @@ -21,7 +21,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 255 /* 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 -- cgit v1.2.3