From e933e0411f442fa411d3d5ec488180fee241e2ef Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 05:41:58 +1100 Subject: Move matrix config to info.json, part 5 (#20003) Co-authored-by: Nick Brassel --- keyboards/adpenrose/akemipad/config.h | 17 ----------------- keyboards/adpenrose/akemipad/info.json | 5 +++++ keyboards/adpenrose/kintsugi/config.h | 17 ----------------- keyboards/adpenrose/kintsugi/info.json | 5 +++++ keyboards/adpenrose/obi/config.h | 17 ----------------- keyboards/adpenrose/obi/info.json | 5 +++++ keyboards/adpenrose/shisaku/config.h | 17 ----------------- keyboards/adpenrose/shisaku/info.json | 5 +++++ 8 files changed, 20 insertions(+), 68 deletions(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h index 47fcf429ac..9743566d12 100644 --- a/keyboards/adpenrose/akemipad/config.h +++ b/keyboards/adpenrose/akemipad/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, D7, E6, B6, B4, B5 } -#define MATRIX_COL_PINS { D3, D2, F5, F6, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Audio functionality */ diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index 9b5a8d6ef6..80085f949e 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -7,6 +7,11 @@ "pid": "0x0004", "vid": "0x4450" }, + "matrix_pins": { + "cols": ["D3", "D2", "F5", "F6", "B2"], + "rows": ["D4", "D7", "E6", "B6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B3"} diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index 5ffeb86837..0e10856cc8 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/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 { B0, E6, D7, C6, D4, D2, F4, F5, B5, B4 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6, F0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Underglow options: */ diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index a26c65b42a..efe7d069d0 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "F0"], + "rows": ["B0", "E6", "D7", "C6", "D4", "D2", "F4", "F5", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B7", "pin_b": "D5"} diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h index c9f606999e..fd9156ca82 100644 --- a/keyboards/adpenrose/obi/config.h +++ b/keyboards/adpenrose/obi/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 { F4, F5, C7, C6 } -#define MATRIX_COL_PINS { F6, B7, B6, B4, B5, D6, D5, D3, D7, D4, D2, D1, D0, B0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 /* Underglow options: */ diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index c0c1b73c64..6417bf57ca 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -7,6 +7,11 @@ "pid": "0x0002", "vid": "0x4450" }, + "matrix_pins": { + "cols": ["F6", "B7", "B6", "B4", "B5", "D6", "D5", "D3", "D7", "D4", "D2", "D1", "D0", "B0"], + "rows": ["F4", "F5", "C7", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F1", "pin_b": "F0"} diff --git a/keyboards/adpenrose/shisaku/config.h b/keyboards/adpenrose/shisaku/config.h index 47555b5190..9113167572 100644 --- a/keyboards/adpenrose/shisaku/config.h +++ b/keyboards/adpenrose/shisaku/config.h @@ -3,22 +3,5 @@ #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, B0, B1, D0, B4, D6, B3, D7 } -#define MATRIX_COL_PINS { D1, C3, C4, D4, C0, C1, C2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Solenoid pin */ #define SOLENOID_PIN C5 diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json index dd1aaf540a..9223f5a101 100644 --- a/keyboards/adpenrose/shisaku/info.json +++ b/keyboards/adpenrose/shisaku/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "C3", "C4", "D4", "C0", "C1", "C2"], + "rows": ["B2", "B0", "B1", "D0", "B4", "D6", "B3", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "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/adpenrose/obi/obi.c | 5 ----- keyboards/adpenrose/shisaku/shisaku.c | 4 ---- 2 files changed, 9 deletions(-) delete mode 100644 keyboards/adpenrose/obi/obi.c delete mode 100644 keyboards/adpenrose/shisaku/shisaku.c (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/obi/obi.c b/keyboards/adpenrose/obi/obi.c deleted file mode 100644 index 2efd4eba47..0000000000 --- a/keyboards/adpenrose/obi/obi.c +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2022 Arturo Avila (@ADPenrose) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "obi.h" - diff --git a/keyboards/adpenrose/shisaku/shisaku.c b/keyboards/adpenrose/shisaku/shisaku.c deleted file mode 100644 index a1ab356ac6..0000000000 --- a/keyboards/adpenrose/shisaku/shisaku.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Arturo Avila (@ADPenrose) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "shisaku.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/adpenrose/kintsugi/config.h | 2 -- keyboards/adpenrose/obi/config.h | 2 -- 2 files changed, 4 deletions(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index 0e10856cc8..2895613932 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* Underglow options: */ #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -37,4 +36,3 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h index fd9156ca82..2eb0a46c99 100644 --- a/keyboards/adpenrose/obi/config.h +++ b/keyboards/adpenrose/obi/config.h @@ -7,7 +7,6 @@ /* Underglow options: */ #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -23,4 +22,3 @@ # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -#endif -- 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/adpenrose/akemipad/config.h | 2 -- keyboards/adpenrose/akemipad/info.json | 3 +++ keyboards/adpenrose/kintsugi/config.h | 1 - keyboards/adpenrose/kintsugi/info.json | 3 +++ keyboards/adpenrose/obi/config.h | 1 - keyboards/adpenrose/obi/info.json | 3 +++ 6 files changed, 9 insertions(+), 4 deletions(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h index 9743566d12..5756903c66 100644 --- a/keyboards/adpenrose/akemipad/config.h +++ b/keyboards/adpenrose/akemipad/config.h @@ -11,8 +11,6 @@ #define AUDIO_ENABLE_TONE_MULTIPLEXING #define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10 -// The pin connected to the data pin of the LEDs -#define RGB_DI_PIN F4 // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 27 #define RGB_MATRIX_CENTER { 60, 77 } diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index 80085f949e..50a0498f0e 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -7,6 +7,9 @@ "pid": "0x0004", "vid": "0x4450" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D3", "D2", "F5", "F6", "B2"], "rows": ["D4", "D7", "E6", "B6", "B4", "B5"] diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index 2895613932..9bfa7d996c 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 /* Underglow options: */ -#define RGB_DI_PIN F1 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index efe7d069d0..1014362503 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -8,6 +8,9 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "ws2812": { + "pin": "F1" + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "F0"], "rows": ["B0", "E6", "D7", "C6", "D4", "D2", "F4", "F5", "B5", "B4"] diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h index 2eb0a46c99..43002ba35c 100644 --- a/keyboards/adpenrose/obi/config.h +++ b/keyboards/adpenrose/obi/config.h @@ -6,7 +6,6 @@ #define TAP_CODE_DELAY 10 /* Underglow options: */ -#define RGB_DI_PIN F7 # define RGBLED_NUM 16 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index 6417bf57ca..c3e8d7b43b 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -7,6 +7,9 @@ "pid": "0x0002", "vid": "0x4450" }, + "ws2812": { + "pin": "F7" + }, "matrix_pins": { "cols": ["F6", "B7", "B6", "B4", "B5", "D6", "D5", "D3", "D7", "D4", "D2", "D1", "D0", "B0"], "rows": ["F4", "F5", "C7", "C6"] -- cgit v1.2.3 From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 18:08:08 +1000 Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350) --- keyboards/adpenrose/akemipad/info.json | 3 +++ keyboards/adpenrose/akemipad/rules.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index 50a0498f0e..6dc558c78e 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -10,6 +10,9 @@ "ws2812": { "pin": "F4" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["D3", "D2", "F5", "F6", "B2"], "rows": ["D4", "D7", "E6", "B6", "B4", "B5"] diff --git a/keyboards/adpenrose/akemipad/rules.mk b/keyboards/adpenrose/akemipad/rules.mk index 9886164987..084dbaec05 100644 --- a/keyboards/adpenrose/akemipad/rules.mk +++ b/keyboards/adpenrose/akemipad/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = yes # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 ENCODER_ENABLE = yes -- cgit v1.2.3 From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/adpenrose/kintsugi/info.json | 130 ++++++++++++++++---------------- keyboards/adpenrose/kintsugi/kintsugi.c | 2 +- keyboards/adpenrose/kintsugi/kintsugi.h | 46 ----------- 3 files changed, 66 insertions(+), 112 deletions(-) delete mode 100644 keyboards/adpenrose/kintsugi/kintsugi.h (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index 1014362503..3daf3326ac 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -26,75 +26,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0, "w": 2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, + {"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": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Enc", "x":15, "y":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": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [7, 6], "x": 15, "y": 2}, - {"label":"LShift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"RShift", "x":12.25, "y":3, "w":1.75}, - {"label":"Up", "x":14, "y":3}, - {"label":"M1", "x":15, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [8, 0], "x": 8.25, "y": 3}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [8, 5], "x": 14, "y": 3}, + {"matrix": [8, 6], "x": 15, "y": 3}, - {"label":"LCtrl", "x":0, "y":4, "w":1.25}, - {"label":"LSuper", "x":1.25, "y":4, "w":1.25}, - {"label":"LAlt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"L1", "x":10, "y":4, "w":1.5}, - {"label":"L2", "x":11.5, "y":4, "w":1.5}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "x":15, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 13, "y": 4}, + {"matrix": [9, 5], "x": 14, "y": 4}, + {"matrix": [9, 6], "x": 15, "y": 4} ] } } diff --git a/keyboards/adpenrose/kintsugi/kintsugi.c b/keyboards/adpenrose/kintsugi/kintsugi.c index 59e7d79b55..0fd26d317e 100644 --- a/keyboards/adpenrose/kintsugi/kintsugi.c +++ b/keyboards/adpenrose/kintsugi/kintsugi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "kintsugi.h" +#include "quantum.h" #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { diff --git a/keyboards/adpenrose/kintsugi/kintsugi.h b/keyboards/adpenrose/kintsugi/kintsugi.h deleted file mode 100644 index 728ef72d0a..0000000000 --- a/keyboards/adpenrose/kintsugi/kintsugi.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2022 adpenrose - * - * 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, K06, K50, K51, K52, K53, K54, K55, K56, \ - K10, K11, K12, K13, K14, K15, K16, K60, K61, K62, K63, K64, K65, K66, \ - K20, K21, K22, K23, K24, K25, K26, K70, K71, K72, K73, K74, K75, K76, \ - K30, K31, K32, K33, K34, K35, K36, K80, K81, K82, K83, K84, K85, K86, \ - K40, K41, K42, K46, K92, K93, K94, K95, K96 \ -) { \ - { 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, KC_NO, KC_NO, KC_NO, K46 }, \ - { K50, K51, K52, K53, K54, K55, K56 }, \ - { K60, K61, K62, K63, K64, K65, K66 }, \ - { K70, K71, K72, K73, K74, K75, K76 }, \ - { K80, K81, K82, K83, K84, K85, K86 }, \ - { KC_NO, KC_NO, K92, K93, K94, K95, K96 } \ -} -- cgit v1.2.3 From 172a40686b84af7f887350a20c526855c7f7649c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:08:15 +1000 Subject: Move single `LAYOUT_all`s to data driven (#20430) --- keyboards/adpenrose/akemipad/akemipad.c | 2 +- keyboards/adpenrose/akemipad/akemipad.h | 31 --------- keyboards/adpenrose/akemipad/info.json | 56 ++++++++-------- keyboards/adpenrose/obi/info.json | 110 +++++++++++++++++--------------- keyboards/adpenrose/obi/obi.h | 26 -------- keyboards/adpenrose/shisaku/info.json | 55 +++++++++++++++- keyboards/adpenrose/shisaku/shisaku.h | 32 ---------- 7 files changed, 143 insertions(+), 169 deletions(-) delete mode 100644 keyboards/adpenrose/akemipad/akemipad.h delete mode 100644 keyboards/adpenrose/obi/obi.h delete mode 100644 keyboards/adpenrose/shisaku/shisaku.h (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/akemipad/akemipad.c b/keyboards/adpenrose/akemipad/akemipad.c index 647740927c..993396dca0 100644 --- a/keyboards/adpenrose/akemipad/akemipad.c +++ b/keyboards/adpenrose/akemipad/akemipad.c @@ -1,7 +1,7 @@ // Copyright 2022 Arturo Avila (@ADPenrose) // SPDX-License-Identifier: GPL-2.0-or-later -#include "akemipad.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/adpenrose/akemipad/akemipad.h b/keyboards/adpenrose/akemipad/akemipad.h deleted file mode 100644 index 2e4b13baef..0000000000 --- a/keyboards/adpenrose/akemipad/akemipad.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2022 Arturo Avila (@ADPenrose) -// SPDX-License-Identifier: GPL-2.0-or-later - -#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_all( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K54, K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03, KC_NO }, \ - { K10, K11, K12, K13, KC_NO }, \ - { K20, K21, K22, K23, KC_NO }, \ - { K30, K31, K32, K33, KC_NO }, \ - { K40, K41, K42, K43, KC_NO }, \ - { K50, K51, K52, K53, K54 } \ -} diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index 6dc558c78e..95f1c903e5 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -28,31 +28,37 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "Num Lock", "x": 1.25, "y": 1.25 }, - { "label": "/", "x": 2.25, "y": 1.25 }, - { "label": "*", "x": 3.25, "y": 1.25 }, - { "label": "-", "x": 4.25, "y": 1.25 }, - { "label": "7", "x": 1.25, "y": 2.25 }, - { "label": "8", "x": 2.25, "y": 2.25 }, - { "label": "9", "x": 3.25, "y": 2.25 }, - { "x": 4.25, "y": 2.25 }, - { "label": "4", "x": 1.25, "y": 3.25 }, - { "label": "5", "x": 2.25, "y": 3.25 }, - { "label": "6", "x": 3.25, "y": 3.25 }, - { "x": 4.25, "y": 3.25 }, - { "label": "1", "x": 1.25, "y": 4.25 }, - { "label": "2", "x": 2.25, "y": 4.25 }, - { "label": "3", "x": 3.25, "y": 4.25 }, - { "x": 4.25, "y": 4.25 }, - { "label": "Enc", "x": 0, "y": 5.25 }, - { "x": 1.25, "y": 5.25 }, - { "x": 2.25, "y": 5.25 }, - { "label": ".", "x": 3.25, "y": 5.25 }, - { "x": 4.25, "y": 5.25 } + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 1.25}, + {"matrix": [1, 1], "x": 2.25, "y": 1.25}, + {"matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 1.25, "y": 2.25}, + {"matrix": [2, 1], "x": 2.25, "y": 2.25}, + {"matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"matrix": [2, 3], "x": 4.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 1.25, "y": 3.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 1.25, "y": 4.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + + {"matrix": [5, 4], "x": 0, "y": 5.25}, + + {"matrix": [5, 0], "x": 1.25, "y": 5.25}, + {"matrix": [5, 1], "x": 2.25, "y": 5.25}, + {"matrix": [5, 2], "x": 3.25, "y": 5.25}, + {"matrix": [5, 3], "x": 4.25, "y": 5.25} ] } } diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index c3e8d7b43b..3f16b579df 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -25,60 +25,64 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"F1", "x":0, "y":0}, - {"label":"Tab", "x":1.25, "y":0, "w":1.5}, - {"label":"Q", "x":2.75, "y":0}, - {"label":"W", "x":3.75, "y":0}, - {"label":"E", "x":4.75, "y":0}, - {"label":"R", "x":5.75, "y":0}, - {"label":"T", "x":6.75, "y":0}, - {"label":"Y", "x":7.75, "y":0}, - {"label":"U", "x":8.75, "y":0}, - {"label":"I", "x":9.75, "y":0}, - {"label":"O", "x":10.75, "y":0}, - {"label":"P", "x":11.75, "y":0}, - {"label":"{", "x":12.75, "y":0}, - {"label":"Backspace", "x":13.75, "y":0, "w":1.5}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label":"F2", "x":0, "y":1}, - {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75}, - {"label":"A", "x":3, "y":1}, - {"label":"S", "x":4, "y":1}, - {"label":"D", "x":5, "y":1}, - {"label":"F", "x":6, "y":1}, - {"label":"G", "x":7, "y":1}, - {"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":":", "x":12, "y":1}, - {"label":"Enter", "x":13, "y":1, "w":2.25}, - - {"label":"F3", "x":0, "y":2}, - {"label":"Shift", "x":1.25, "y":2, "w":2.25}, - {"label":"Z", "x":3.5, "y":2}, - {"label":"X", "x":4.5, "y":2}, - {"label":"C", "x":5.5, "y":2}, - {"label":"V", "x":6.5, "y":2}, - {"label":"B", "x":7.5, "y":2}, - {"label":"N", "x":8.5, "y":2}, - {"label":"M", "x":9.5, "y":2}, - {"label":"<", "x":10.5, "y":2}, - {"label":"Shift", "x":11.5, "y":2, "w":1.75}, - {"label":"Up", "x":13.25, "y":2}, - {"label":"?", "x":14.25, "y":2}, - - {"label":"F4", "x":0, "y":3}, - {"label":"Ctrl", "x":1.25, "y":3, "w":1.25}, - {"label":"Win", "x":2.5, "y":3}, - {"label":"Alt", "x":3.5, "y":3, "w":1.25}, - {"label":"Spacebar", "x":4.75, "y":3, "w":2.25}, - {"label":"Spacebar", "x":7, "y":3, "w":1.25}, - {"label":"Spacebar", "x":8.25, "y":3, "w":2.75}, - {"label":"Alt", "x":11, "y":3, "w":1.25}, - {"label":"Left", "x":12.25, "y":3}, - {"label":"Down", "x":13.25, "y":3}, - {"label":"Right", "x":14.25, "y":3} + {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"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}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 2.25}, + {"matrix": [2, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 3], "x": 4.5, "y": 2}, + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 5], "x": 6.5, "y": 2}, + {"matrix": [2, 6], "x": 7.5, "y": 2}, + {"matrix": [2, 7], "x": 8.5, "y": 2}, + {"matrix": [2, 8], "x": 9.5, "y": 2}, + {"matrix": [2, 9], "x": 10.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2, "w": 1.75}, + {"matrix": [2, 12], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 7, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 8.25, "y": 3, "w": 2.75}, + {"matrix": [3, 10], "x": 11, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 12.25, "y": 3}, + {"matrix": [3, 12], "x": 13.25, "y": 3}, + {"matrix": [3, 13], "x": 14.25, "y": 3} ] } } diff --git a/keyboards/adpenrose/obi/obi.h b/keyboards/adpenrose/obi/obi.h deleted file mode 100644 index 09bf9b29fc..0000000000 --- a/keyboards/adpenrose/obi/obi.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2022 Arturo Avila (@ADPenrose) -// SPDX-License-Identifier: GPL-2.0-or-later - -#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_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D, \ - K30, K31, K32, K33, K35, K36, K37, K3A, K3B, K3C, K3D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, KC_NO, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_NO, K2C, K2D }, \ - { K30, K31, K32, K33, KC_NO, K35, K36, K37, KC_NO, KC_NO, K3A, K3B, K3C, K3D } \ -} diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json index 9223f5a101..8105d338db 100644 --- a/keyboards/adpenrose/shisaku/info.json +++ b/keyboards/adpenrose/shisaku/info.json @@ -18,7 +18,60 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":1.25, "y":0}, {"label":"Q", "x":2.25, "y":0}, {"label":"W", "x":3.25, "y":0}, {"label":"E", "x":4.25, "y":0}, {"label":"R", "x":5.25, "y":0}, {"label":"T", "x":6.25, "y":0}, {"label":"Y", "x":7.75, "y":0}, {"label":"U", "x":8.75, "y":0}, {"label":"I", "x":9.75, "y":0}, {"label":"O", "x":10.75, "y":0}, {"label":"P", "x":11.75, "y":0}, {"label":"Backspace", "x":12.75, "y":0, "w":1.5}, {"label":"Caps Lock", "x":0.5, "y":1, "w":1.75}, {"label":"A", "x":2.25, "y":1}, {"label":"S", "x":3.25, "y":1}, {"label":"D", "x":4.25, "y":1}, {"label":"F", "x":5.25, "y":1}, {"label":"G", "x":6.25, "y":1}, {"label":"H", "x":7.75, "y":1}, {"label":"J", "x":8.75, "y":1}, {"label":"K", "x":9.75, "y":1}, {"label":"L", "x":10.75, "y":1}, {"label":":", "x":11.75, "y":1}, {"label":"Enter", "x":12.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.25}, {"label":"Fn", "x":1.25, "y":2}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"B", "x":7.75, "y":2}, {"label":"N", "x":8.75, "y":2}, {"label":"M", "x":9.75, "y":2}, {"label":"<", "x":10.75, "y":2}, {"label":">", "x":11.75, "y":2}, {"label":"Up", "x":12.75, "y":2}, {"label":"?", "x":13.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.5}, {"label":"Win", "x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"label":"Alt", "x":6.25, "y":3}, {"x":7.75, "y":3, "w":2.75}, {"label":"Left", "x":11.75, "y":3}, {"label":"Down", "x":12.75, "y":3}, {"label":"Right", "x":13.75, "y":3} + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + + {"matrix": [0, 6], "x": 7.75, "y": 0}, + {"matrix": [1, 0], "x": 8.75, "y": 0}, + {"matrix": [1, 1], "x": 9.75, "y": 0}, + {"matrix": [1, 2], "x": 10.75, "y": 0}, + {"matrix": [1, 3], "x": 11.75, "y": 0}, + {"matrix": [1, 4], "x": 12.75, "y": 0, "w": 1.5}, + + {"matrix": [1, 5], "x": 0.5, "y": 1, "w": 1.75}, + {"matrix": [1, 6], "x": 2.25, "y": 1}, + {"matrix": [2, 0], "x": 3.25, "y": 1}, + {"matrix": [2, 1], "x": 4.25, "y": 1}, + {"matrix": [2, 2], "x": 5.25, "y": 1}, + {"matrix": [2, 3], "x": 6.25, "y": 1}, + + {"matrix": [2, 4], "x": 7.75, "y": 1}, + {"matrix": [2, 5], "x": 8.75, "y": 1}, + {"matrix": [2, 6], "x": 9.75, "y": 1}, + {"matrix": [3, 0], "x": 10.75, "y": 1}, + {"matrix": [3, 3], "x": 11.75, "y": 1}, + {"matrix": [3, 4], "x": 12.75, "y": 1, "w": 1.75}, + + {"matrix": [3, 5], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [4, 0], "x": 1.25, "y": 2}, + {"matrix": [4, 1], "x": 2.25, "y": 2}, + {"matrix": [4, 2], "x": 3.25, "y": 2}, + {"matrix": [4, 3], "x": 4.25, "y": 2}, + {"matrix": [4, 4], "x": 5.25, "y": 2}, + {"matrix": [4, 5], "x": 6.25, "y": 2}, + + {"matrix": [5, 0], "x": 7.75, "y": 2}, + {"matrix": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 11.75, "y": 2}, + {"matrix": [5, 5], "x": 12.75, "y": 2}, + {"matrix": [6, 0], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [6, 1], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [6, 2], "x": 3, "y": 3}, + {"matrix": [6, 3], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [6, 4], "x": 6.25, "y": 3}, + + {"matrix": [6, 5], "x": 7.75, "y": 3, "w": 2.75}, + + {"matrix": [7, 0], "x": 11.75, "y": 3}, + {"matrix": [7, 4], "x": 12.75, "y": 3}, + {"matrix": [7, 5], "x": 13.75, "y": 3} ] } } diff --git a/keyboards/adpenrose/shisaku/shisaku.h b/keyboards/adpenrose/shisaku/shisaku.h deleted file mode 100644 index ea92202435..0000000000 --- a/keyboards/adpenrose/shisaku/shisaku.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2022 Arturo Avila (@ADPenrose) -// SPDX-License-Identifier: GPL-2.0-or-later - -#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 XXX KC_NO - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k10, k11, k12, k13, k14, \ - k15, k16, k20, k21, k22, k23, k24, k25, k26, k30, k33, k34, \ - k35, k40, k41, k42, k43, k44, k45, k50, k51, k52, k53, k54, k55, k60, \ - k61, k62, k63, k64, k65, k70, k74, k75 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, XXX, XXX, k33, k34, k35, XXX }, \ - { k40, k41, k42, k43, k44, k45, XXX }, \ - { k50, k51, k52, k53, k54, k55, XXX }, \ - { k60, k61, k62, k63, k64, k65, XXX }, \ - { k70, XXX, XXX, XXX, k74, k75, XXX } \ -} -- 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/adpenrose/akemipad/keymaps/default/keymap.c | 2 +- keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c | 2 +- keyboards/adpenrose/akemipad/keymaps/via/keymap.c | 2 +- keyboards/adpenrose/kintsugi/keymaps/default/keymap.c | 2 +- keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c | 2 +- keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c | 2 +- keyboards/adpenrose/kintsugi/keymaps/via/keymap.c | 2 +- keyboards/adpenrose/obi/keymaps/default/keymap.c | 2 +- keyboards/adpenrose/obi/keymaps/via/keymap.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c index 0aa98ed309..7226b85f2c 100644 --- a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c +++ b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, [2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, diff --git a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c index 5839acbbfe..f9ccfbe769 100644 --- a/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c +++ b/keyboards/adpenrose/akemipad/keymaps/oled_bongocat/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, [2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, diff --git a/keyboards/adpenrose/akemipad/keymaps/via/keymap.c b/keyboards/adpenrose/akemipad/keymaps/via/keymap.c index 732c287a7a..e20ed0c9c7 100644 --- a/keyboards/adpenrose/akemipad/keymaps/via/keymap.c +++ b/keyboards/adpenrose/akemipad/keymaps/via/keymap.c @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, [2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, diff --git a/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c index f7f960e4b0..fb1fb0aa96 100644 --- a/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c +++ b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; diff --git a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c index 2db96a11c2..900bb3e265 100644 --- a/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c +++ b/keyboards/adpenrose/kintsugi/keymaps/oled_bongocat/keymap.c @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Encoder */ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c index 59955d33bd..7a9e6fb24e 100644 --- a/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c +++ b/keyboards/adpenrose/kintsugi/keymaps/snailmap_port/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Encoder */ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c index 5a42fa9b2f..7d6af4f0ea 100644 --- a/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c +++ b/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/adpenrose/obi/keymaps/default/keymap.c b/keyboards/adpenrose/obi/keymaps/default/keymap.c index 6d55dc73fb..586fdaa2c3 100644 --- a/keyboards/adpenrose/obi/keymaps/default/keymap.c +++ b/keyboards/adpenrose/obi/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/adpenrose/obi/keymaps/via/keymap.c b/keyboards/adpenrose/obi/keymaps/via/keymap.c index efede949b8..7430292731 100644 --- a/keyboards/adpenrose/obi/keymaps/via/keymap.c +++ b/keyboards/adpenrose/obi/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, -- 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/adpenrose/obi/info.json | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index 7db370c935..00a2572e7a 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -81,7 +81,6 @@ {"label": "Right", "matrix": [3, 13], "x": 14.25, "y": 3} ] }, - "LAYOUT_625u_space": { "layout": [ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, -- cgit v1.2.3 From 4ae45ca995b1f01b8e7ab3d115efe241c9adfee3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 10 May 2023 22:55:49 +0100 Subject: Tidy up encoder_map directions (#20847) --- keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c b/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c index defb516962..448a009d87 100644 --- a/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c +++ b/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, -- cgit v1.2.3 From f8313adffb6d2564465e51c4f365f135119c9d16 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 15 May 2023 08:56:26 -0700 Subject: adpenrose/shisaku: rename LAYOUT_all to LAYOUT (#20958) --- keyboards/adpenrose/shisaku/info.json | 5 ++++- keyboards/adpenrose/shisaku/keymaps/default/keymap.c | 8 ++++---- keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c | 8 ++++---- keyboards/adpenrose/shisaku/keymaps/via/keymap.c | 8 ++++---- 4 files changed, 16 insertions(+), 13 deletions(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json index 8105d338db..5ccc7e1d11 100644 --- a/keyboards/adpenrose/shisaku/info.json +++ b/keyboards/adpenrose/shisaku/info.json @@ -15,8 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", + "layout_aliases": { + "LAYOUT_all": "LAYOUT" + }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 1.25, "y": 0}, {"matrix": [0, 1], "x": 2.25, "y": 0}, diff --git a/keyboards/adpenrose/shisaku/keymaps/default/keymap.c b/keyboards/adpenrose/shisaku/keymaps/default/keymap.c index 43ab3d7528..5b55e18e0d 100644 --- a/keyboards/adpenrose/shisaku/keymaps/default/keymap.c +++ b/keyboards/adpenrose/shisaku/keymaps/default/keymap.c @@ -4,25 +4,25 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LSFT, MO(2), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LEFT, KC_DOWN, KC_RIGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT( KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT_all( + [2] = LAYOUT( KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_all( + [3] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c b/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c index a41895d1e9..0d69e305d1 100644 --- a/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c +++ b/keyboards/adpenrose/shisaku/keymaps/solenoid/keymap.c @@ -4,25 +4,25 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LSFT, MO(2), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LEFT, KC_DOWN, KC_RIGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT( KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, HF_TOGG, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT_all( + [2] = LAYOUT( KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_all( + [3] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/adpenrose/shisaku/keymaps/via/keymap.c b/keyboards/adpenrose/shisaku/keymaps/via/keymap.c index 43ab3d7528..5b55e18e0d 100644 --- a/keyboards/adpenrose/shisaku/keymaps/via/keymap.c +++ b/keyboards/adpenrose/shisaku/keymaps/via/keymap.c @@ -4,25 +4,25 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, KC_LSFT, MO(2), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LEFT, KC_DOWN, KC_RIGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT( KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT_all( + [2] = LAYOUT( KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_all( + [3] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -- cgit v1.2.3 From 631e4e50dda1b471c87701d97ba144033933ea23 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 15 May 2023 22:17:55 -0700 Subject: ADPenrose Akemipad Layout Addition (#20957) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_numpad with reference keymap --- keyboards/adpenrose/akemipad/info.json | 82 +++++++++++++++------- .../akemipad/keymaps/default_numpad/keymap.c | 49 +++++++++++++ .../akemipad/keymaps/default_numpad/readme.md | 12 ++++ .../akemipad/keymaps/default_numpad/rules.mk | 1 + keyboards/adpenrose/akemipad/matrix_diagram.md | 21 ++++++ 5 files changed, 140 insertions(+), 25 deletions(-) create mode 100644 keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c create mode 100644 keyboards/adpenrose/akemipad/keymaps/default_numpad/readme.md create mode 100644 keyboards/adpenrose/akemipad/keymaps/default_numpad/rules.mk create mode 100644 keyboards/adpenrose/akemipad/matrix_diagram.md (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index 95f1c903e5..fb70fb00a4 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -28,37 +28,69 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 1.25, "y": 0}, - {"matrix": [0, 1], "x": 2.25, "y": 0}, - {"matrix": [0, 2], "x": 3.25, "y": 0}, - {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"label": "Fn", "matrix": [0, 0], "x": 1.25, "y": 0}, + {"label": "Fn2", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "Fn3", "matrix": [0, 2], "x": 3.25, "y": 0}, + {"label": "Delete", "matrix": [0, 3], "x": 4.25, "y": 0}, - {"matrix": [1, 0], "x": 1.25, "y": 1.25}, - {"matrix": [1, 1], "x": 2.25, "y": 1.25}, - {"matrix": [1, 2], "x": 3.25, "y": 1.25}, - {"matrix": [1, 3], "x": 4.25, "y": 1.25}, + {"label": "Num Lock", "matrix": [1, 0], "x": 1.25, "y": 1.25}, + {"label": "/", "matrix": [1, 1], "x": 2.25, "y": 1.25}, + {"label": "*", "matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"label": "-", "matrix": [1, 3], "x": 4.25, "y": 1.25}, - {"matrix": [2, 0], "x": 1.25, "y": 2.25}, - {"matrix": [2, 1], "x": 2.25, "y": 2.25}, - {"matrix": [2, 2], "x": 3.25, "y": 2.25}, - {"matrix": [2, 3], "x": 4.25, "y": 2.25}, + {"label": "7", "matrix": [2, 0], "x": 1.25, "y": 2.25}, + {"label": "8", "matrix": [2, 1], "x": 2.25, "y": 2.25}, + {"label": "9", "matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"label": "+", "matrix": [2, 3], "x": 4.25, "y": 2.25}, - {"matrix": [3, 0], "x": 1.25, "y": 3.25}, - {"matrix": [3, 1], "x": 2.25, "y": 3.25}, - {"matrix": [3, 2], "x": 3.25, "y": 3.25}, - {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"label": "4", "matrix": [3, 0], "x": 1.25, "y": 3.25}, + {"label": "5", "matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"label": "6", "matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"label": "+", "matrix": [3, 3], "x": 4.25, "y": 3.25}, - {"matrix": [4, 0], "x": 1.25, "y": 4.25}, - {"matrix": [4, 1], "x": 2.25, "y": 4.25}, - {"matrix": [4, 2], "x": 3.25, "y": 4.25}, - {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "1", "matrix": [4, 0], "x": 1.25, "y": 4.25}, + {"label": "2", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "3", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "Enter", "matrix": [4, 3], "x": 4.25, "y": 4.25}, - {"matrix": [5, 4], "x": 0, "y": 5.25}, + {"label": "Mute", "matrix": [5, 4], "x": 0, "y": 5.25}, - {"matrix": [5, 0], "x": 1.25, "y": 5.25}, - {"matrix": [5, 1], "x": 2.25, "y": 5.25}, - {"matrix": [5, 2], "x": 3.25, "y": 5.25}, - {"matrix": [5, 3], "x": 4.25, "y": 5.25} + {"label": "0", "matrix": [5, 0], "x": 1.25, "y": 5.25}, + {"label": "0", "matrix": [5, 1], "x": 2.25, "y": 5.25}, + {"label": ".", "matrix": [5, 2], "x": 3.25, "y": 5.25}, + {"label": "Enter", "matrix": [5, 3], "x": 4.25, "y": 5.25} + ] + }, + "LAYOUT_numpad": { + "layout": [ + {"label": "Fn", "matrix": [0, 0], "x": 1.25, "y": 0}, + {"label": "Fn2", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "Fn3", "matrix": [0, 2], "x": 3.25, "y": 0}, + {"label": "Delete", "matrix": [0, 3], "x": 4.25, "y": 0}, + + {"label": "Num Lock", "matrix": [1, 0], "x": 1.25, "y": 1.25}, + {"label": "/", "matrix": [1, 1], "x": 2.25, "y": 1.25}, + {"label": "*", "matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"label": "-", "matrix": [1, 3], "x": 4.25, "y": 1.25}, + + {"label": "7", "matrix": [2, 0], "x": 1.25, "y": 2.25}, + {"label": "8", "matrix": [2, 1], "x": 2.25, "y": 2.25}, + {"label": "9", "matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"label": "+", "matrix": [2, 3], "x": 4.25, "y": 2.25, "h": 2}, + + {"label": "4", "matrix": [3, 0], "x": 1.25, "y": 3.25}, + {"label": "5", "matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"label": "6", "matrix": [3, 2], "x": 3.25, "y": 3.25}, + + {"label": "1", "matrix": [4, 0], "x": 1.25, "y": 4.25}, + {"label": "2", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "3", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "Enter", "matrix": [4, 3], "x": 4.25, "y": 4.25, "h": 2}, + + {"label": "Mute", "matrix": [5, 4], "x": 0, "y": 5.25}, + + {"label": "0", "matrix": [5, 0], "x": 1.25, "y": 5.25, "w": 2}, + {"label": ".", "matrix": [5, 2], "x": 3.25, "y": 5.25} ] } } diff --git a/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c b/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c new file mode 100644 index 0000000000..080df8d182 --- /dev/null +++ b/keyboards/adpenrose/akemipad/keymaps/default_numpad/keymap.c @@ -0,0 +1,49 @@ +// Copyright 2022 Arturo Avila (@ADPenrose) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +/* Keymap */ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_numpad( + MO(1), MO(2), MO(3), KC_DEL, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_MUTE, KC_P0, KC_PDOT + ), + [1] = LAYOUT_numpad( + KC_TRNS, CK_DOWN, CK_UP, CK_RST, + MU_TOGG, MU_NEXT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + CK_TOGG, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT_numpad( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT_numpad( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, + [2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + [3] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif diff --git a/keyboards/adpenrose/akemipad/keymaps/default_numpad/readme.md b/keyboards/adpenrose/akemipad/keymaps/default_numpad/readme.md new file mode 100644 index 0000000000..9f2d2d431b --- /dev/null +++ b/keyboards/adpenrose/akemipad/keymaps/default_numpad/readme.md @@ -0,0 +1,12 @@ +# The default_numpad keymap for the AkemiPad + + +## Features +- Audio Click and Music Mode capabilities. +- RGB Matrix Lighting (cycles left-right and up-down). +- Encoder Map feature. + +### Disclaimer +The AkemiPad has multiple layout options (each one with its own LED positions), but this keymap does not take that into consideration. +If you want to select an specific layout (and see how the LEDs turn on and off accordingly), you +should use the [via keymap](../via). diff --git a/keyboards/adpenrose/akemipad/keymaps/default_numpad/rules.mk b/keyboards/adpenrose/akemipad/keymaps/default_numpad/rules.mk new file mode 100644 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/adpenrose/akemipad/keymaps/default_numpad/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/adpenrose/akemipad/matrix_diagram.md b/keyboards/adpenrose/akemipad/matrix_diagram.md new file mode 100644 index 0000000000..06fc867532 --- /dev/null +++ b/keyboards/adpenrose/akemipad/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for ADPenrose AkemiPad + +``` + ┌───┬───┬───┬───┐ + │00 │01 │02 │03 │ + └───┴───┴───┴───┘ + ┌───┬───┬───┬───┐ + │10 │11 │12 │13 │ + ├───┼───┼───┼───┤ ┌───┐ + │20 │21 │22 │23 │ │ │ + ├───┼───┼───┼───┤ │23 │ 2u Numpad Plus + │30 │31 │32 │33 │ │ │ + ├───┼───┼───┼───┤ ├───┤ + │40 │41 │42 │43 │ │ │ + ┌───┐├───┼───┼───┼───┤ │43 │ 2u Numpad Enter +Encoder ─ │54 ││50 │51 │52 │53 │ │ │ + └───┘└───┴───┴───┴───┘ └───┘ + ┌───────┐ + │50 │ 2u Numpad Zero + └───────┘ +``` -- 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/adpenrose/kintsugi/config.h | 1 - keyboards/adpenrose/obi/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/adpenrose') diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index 9bfa7d996c..088b40139b 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/config.h @@ -24,7 +24,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/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h index 43002ba35c..862c0fe1ee 100644 --- a/keyboards/adpenrose/obi/config.h +++ b/keyboards/adpenrose/obi/config.h @@ -10,7 +10,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 -- cgit v1.2.3