From 7a8265247b75bf389c791738a30a01fe3dba2263 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 1 Mar 2023 02:06:11 +1100 Subject: Remove `"w":1` and `"h":1` from info.json (#19961) --- keyboards/ibnuda/squiggle/rev1/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index 7f48b11c76..6016649bce 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -145,15 +145,15 @@ {"label":".", "x":8, "y":2.2}, {"label":"/", "x":9, "y":2.9}, - {"label":"bspc", "x":3, "y":3.6, "h":1}, - {"label":"esc/sft", "x":4, "y":3.65, "h":1}, - {"label":"ent/alt", "x":5, "y":3.65, "h":1}, - {"label":"spc", "x":6, "y":3.6, "h":1}, - - {"label":"lower", "x":3, "y":4.6, "h":1}, - {"label":"gui", "x":4, "y":4.65, "h":1}, - {"label":"tab", "x":5, "y":4.65, "h":1}, - {"label":"raise", "x":6, "y":4.6, "h":1} + {"label":"bspc", "x":3, "y":3.6}, + {"label":"esc/sft", "x":4, "y":3.65}, + {"label":"ent/alt", "x":5, "y":3.65}, + {"label":"spc", "x":6, "y":3.6}, + + {"label":"lower", "x":3, "y":4.6}, + {"label":"gui", "x":4, "y":4.65}, + {"label":"tab", "x":5, "y":4.65}, + {"label":"raise", "x":6, "y":4.6} ] } } -- cgit v1.2.3 From 23c365b023e409885e6f201f12df56e5145dde47 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Mar 2023 09:53:52 +1100 Subject: Move matrix config to info.json, part 1 (#19985) --- keyboards/ibnuda/alicia_cook/config.h | 35 -------------------------------- keyboards/ibnuda/alicia_cook/info.json | 5 +++++ keyboards/ibnuda/gurindam/config.h | 17 ---------------- keyboards/ibnuda/gurindam/info.json | 5 +++++ keyboards/ibnuda/squiggle/rev1/config.h | 16 --------------- keyboards/ibnuda/squiggle/rev1/info.json | 5 +++++ 6 files changed, 15 insertions(+), 68 deletions(-) delete mode 100644 keyboards/ibnuda/alicia_cook/config.h (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h deleted file mode 100644 index c414e3254c..0000000000 --- a/keyboards/ibnuda/alicia_cook/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 Ibnu D. Aji - -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 - - -/* - * 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 { D2, D3, F4, F5 } -#define MATRIX_COL_PINS { B5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json index 9e34484de5..137c6bc7de 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -8,6 +8,11 @@ "pid": "0x6955", "device_version": "8.9.9" }, + "matrix_pins": { + "cols": ["B5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["D2", "D3", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h index bf563918c9..2521d16e8c 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/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 { B5, B4, E6, D7, C6, D4, D0, D1, D2} -#define MATRIX_COL_PINS { F6, F5, F4, F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index 7b3c71aa88..3fd6dfe21a 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -8,6 +8,11 @@ "pid": "0x6974", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h index f943c2c053..10887bdf18 100644 --- a/keyboards/ibnuda/squiggle/rev1/config.h +++ b/keyboards/ibnuda/squiggle/rev1/config.h @@ -1,19 +1,3 @@ #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 { B1, B3, B2, B6 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MASTER_LEFT diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index 6016649bce..e2e2b4a3f7 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, -- cgit v1.2.3 From 9dbee3e23d28e5f61384bbb5650505a572022341 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 16 Mar 2023 20:18:33 +1100 Subject: Remove useless "ifdef KEYBOARD_*" (#20078) Co-authored-by: Nick Brassel --- keyboards/ibnuda/squiggle/rev1/rev1.c | 1 - keyboards/ibnuda/squiggle/rev1/rev1.h | 2 -- keyboards/ibnuda/squiggle/squiggle.c | 17 ----------------- keyboards/ibnuda/squiggle/squiggle.h | 23 ----------------------- 4 files changed, 43 deletions(-) delete mode 100644 keyboards/ibnuda/squiggle/rev1/rev1.c delete mode 100644 keyboards/ibnuda/squiggle/squiggle.c delete mode 100644 keyboards/ibnuda/squiggle/squiggle.h (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/ibnuda/squiggle/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h index 73cb7abd2f..7d2ce91cdd 100644 --- a/keyboards/ibnuda/squiggle/rev1/rev1.h +++ b/keyboards/ibnuda/squiggle/rev1/rev1.h @@ -1,7 +1,5 @@ #pragma once -#include "squiggle.h" - #include "quantum.h" #define ___ KC_NO diff --git a/keyboards/ibnuda/squiggle/squiggle.c b/keyboards/ibnuda/squiggle/squiggle.c deleted file mode 100644 index 7c73aabf51..0000000000 --- a/keyboards/ibnuda/squiggle/squiggle.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Ibnu D. Aji - * - * 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 "squiggle.h" diff --git a/keyboards/ibnuda/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h deleted file mode 100644 index 4ed95e707c..0000000000 --- a/keyboards/ibnuda/squiggle/squiggle.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2020 Ibnu D. Aji - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#ifdef KEYBOARD_ibnuda_squiggle_rev1 - #include "rev1.h" -#endif - -#include "quantum.h" -- 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/ibnuda/alicia_cook/alicia_cook.c | 17 ----------------- keyboards/ibnuda/gurindam/gurindam.c | 16 ---------------- 2 files changed, 33 deletions(-) delete mode 100644 keyboards/ibnuda/alicia_cook/alicia_cook.c delete mode 100644 keyboards/ibnuda/gurindam/gurindam.c (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/alicia_cook.c b/keyboards/ibnuda/alicia_cook/alicia_cook.c deleted file mode 100644 index 39f17e4a7d..0000000000 --- a/keyboards/ibnuda/alicia_cook/alicia_cook.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Ibnu D. Aji - * - * 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 "alicia_cook.h" diff --git a/keyboards/ibnuda/gurindam/gurindam.c b/keyboards/ibnuda/gurindam/gurindam.c deleted file mode 100644 index bdca0269c2..0000000000 --- a/keyboards/ibnuda/gurindam/gurindam.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Ibnu D. Aji - * - * 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 "gurindam.h" -- cgit v1.2.3 From e40b6ca3b05e50253c3f6bbc08673e1720ddd9be Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 1 Apr 2023 13:09:53 +1100 Subject: Move split layouts to data driven (#20290) --- keyboards/ibnuda/squiggle/rev1/info.json | 407 +++++++++++++++++++++---------- keyboards/ibnuda/squiggle/rev1/rev1.h | 117 --------- 2 files changed, 277 insertions(+), 247 deletions(-) delete mode 100644 keyboards/ibnuda/squiggle/rev1/rev1.h (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index e2e2b4a3f7..c5f15104f6 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -22,143 +22,290 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"bspc/lwr", "x":3, "y":3.6, "h":2}, - {"label":"esc/sft", "x":4, "y":3.65, "h":2}, - - {"label":"ent/alt", "x":5, "y":3.65, "h":2}, - {"label":"spc/ris", "x":6, "y":3.6, "h":2} + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2}, + {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2}, + + {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2}, + {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2} + ] + }, + "LAYOUT_complicated": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 3], "x": 3, "y": 3.6}, + {"matrix": [3, 4], "x": 4, "y": 3.65}, + + {"matrix": [7, 4], "x": 5, "y": 3.65}, + {"matrix": [7, 3], "x": 6, "y": 3.6}, + + {"matrix": [3, 1], "x": 3, "y": 4.6}, + {"matrix": [3, 2], "x": 4, "y": 4.65}, + + {"matrix": [7, 2], "x": 5, "y": 4.65}, + {"matrix": [7, 1], "x": 6, "y": 4.6} + ] + }, + "LAYOUT_full": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + + {"matrix": [4, 4], "x": 5, "y": 0}, + {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 0], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 10, "y": 0}, + {"matrix": [1, 1], "x": 11, "y": 0}, + {"matrix": [1, 2], "x": 12, "y": 0}, + {"matrix": [1, 3], "x": 13, "y": 0}, + {"matrix": [1, 4], "x": 14, "y": 0}, + + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0}, + {"matrix": [5, 2], "x": 17, "y": 0}, + {"matrix": [5, 1], "x": 18, "y": 0}, + {"matrix": [5, 0], "x": 19, "y": 0}, + + {"matrix": [2, 0], "x": 20, "y": 0}, + {"matrix": [2, 1], "x": 21, "y": 0}, + {"matrix": [2, 2], "x": 22, "y": 0}, + {"matrix": [2, 3], "x": 23, "y": 0}, + {"matrix": [2, 4], "x": 24, "y": 0}, + + {"matrix": [6, 4], "x": 25, "y": 0}, + {"matrix": [6, 3], "x": 26, "y": 0}, + {"matrix": [6, 2], "x": 27, "y": 0}, + {"matrix": [6, 1], "x": 28, "y": 0}, + {"matrix": [6, 0], "x": 29, "y": 0}, + + {"matrix": [3, 0], "x": 30, "y": 0}, + {"matrix": [3, 1], "x": 31, "y": 0}, + {"matrix": [3, 2], "x": 32, "y": 0}, + {"matrix": [3, 3], "x": 33, "y": 0}, + {"matrix": [3, 4], "x": 34, "y": 0}, + + {"matrix": [7, 4], "x": 35, "y": 0}, + {"matrix": [7, 3], "x": 36, "y": 0}, + {"matrix": [7, 2], "x": 37, "y": 0}, + {"matrix": [7, 1], "x": 38, "y": 0}, + {"matrix": [7, 0], "x": 39, "y": 0} + ] + }, + "LAYOUT_reversed": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [0, 2], "x": 7, "y": 0}, + {"matrix": [0, 1], "x": 8, "y": 0}, + {"matrix": [0, 0], "x": 9, "y": 0}, + + {"matrix": [5, 0], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 4], "x": 14, "y": 0}, + + {"matrix": [1, 4], "x": 15, "y": 0}, + {"matrix": [1, 3], "x": 16, "y": 0}, + {"matrix": [1, 2], "x": 17, "y": 0}, + {"matrix": [1, 1], "x": 18, "y": 0}, + {"matrix": [1, 0], "x": 19, "y": 0}, + + {"matrix": [6, 0], "x": 20, "y": 0}, + {"matrix": [6, 1], "x": 21, "y": 0}, + {"matrix": [6, 2], "x": 22, "y": 0}, + {"matrix": [6, 3], "x": 23, "y": 0}, + {"matrix": [6, 4], "x": 24, "y": 0}, + + {"matrix": [2, 4], "x": 25, "y": 0}, + {"matrix": [2, 3], "x": 26, "y": 0}, + {"matrix": [2, 2], "x": 27, "y": 0}, + {"matrix": [2, 1], "x": 28, "y": 0}, + {"matrix": [2, 0], "x": 29, "y": 0}, + + {"matrix": [7, 3], "x": 30, "y": 0}, + {"matrix": [7, 4], "x": 31, "y": 0}, + + {"matrix": [3, 4], "x": 32, "y": 0}, + {"matrix": [3, 3], "x": 33, "y": 0} ] }, "LAYOUT_split_3x5_3": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"lower", "x":2, "y":3.6, "h":1.25}, - {"label":"bspc", "x":3, "y":3.6, "h":2}, - {"label":"esc/sft", "x":4, "y":3.65, "h":2}, - - {"label":"ent/alt", "x":5, "y":3.65, "h":2}, - {"label":"spc", "x":6, "y":3.6, "h":2}, - {"label":"raise", "x":7, "y":3.6, "h":1.25} + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 2], "x": 2, "y": 3.6, "h": 1.25}, + {"matrix": [3, 3], "x": 3, "y": 3.6, "h": 2}, + {"matrix": [3, 4], "x": 4, "y": 3.65, "h": 2}, + + {"matrix": [7, 4], "x": 5, "y": 3.65, "h": 2}, + {"matrix": [7, 3], "x": 6, "y": 3.6, "h": 2}, + {"matrix": [7, 2], "x": 7, "y": 3.6, "h": 1.25} ] }, - "LAYOUT_complicated": { + "LAYOUT_thumbrow": { "layout": [ - {"label":"q", "x":0, "y":0.9}, - {"label":"w", "x":1, "y":0.2}, - {"label":"e", "x":2, "y":0}, - {"label":"r", "x":3, "y":0.1}, - {"label":"t", "x":4, "y":0.15}, - - {"label":"y", "x":5, "y":0.15}, - {"label":"u", "x":6, "y":0.1}, - {"label":"i", "x":7, "y":0}, - {"label":"o", "x":8, "y":0.2}, - {"label":"p", "x":9, "y":0.9}, - - {"label":"a", "x":0, "y":1.9}, - {"label":"s", "x":1, "y":1.2}, - {"label":"d", "x":2, "y":1}, - {"label":"f", "x":3, "y":1.1}, - {"label":"g", "x":4, "y":1.15}, - - {"label":"h", "x":5, "y":1.15}, - {"label":"j", "x":6, "y":1.1}, - {"label":"k", "x":7, "y":1}, - {"label":"l", "x":8, "y":1.2}, - {"label":"'", "x":9, "y":1.9}, - - {"label":"z", "x":0, "y":2.9}, - {"label":"x", "x":1, "y":2.2}, - {"label":"c", "x":2, "y":2}, - {"label":"v", "x":3, "y":2.1}, - {"label":"b", "x":4, "y":2.15}, - - {"label":"n", "x":5, "y":2.15}, - {"label":"m", "x":6, "y":2.1}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2.2}, - {"label":"/", "x":9, "y":2.9}, - - {"label":"bspc", "x":3, "y":3.6}, - {"label":"esc/sft", "x":4, "y":3.65}, - {"label":"ent/alt", "x":5, "y":3.65}, - {"label":"spc", "x":6, "y":3.6}, - - {"label":"lower", "x":3, "y":4.6}, - {"label":"gui", "x":4, "y":4.65}, - {"label":"tab", "x":5, "y":4.65}, - {"label":"raise", "x":6, "y":4.6} + {"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": [4, 4], "x": 5, "y": 0}, + {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [4, 2], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 0], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 10, "y": 0}, + {"matrix": [1, 1], "x": 11, "y": 0}, + {"matrix": [1, 2], "x": 12, "y": 0}, + {"matrix": [1, 3], "x": 13, "y": 0}, + {"matrix": [1, 4], "x": 14, "y": 0}, + + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0}, + {"matrix": [5, 2], "x": 17, "y": 0}, + {"matrix": [5, 1], "x": 18, "y": 0}, + {"matrix": [5, 0], "x": 19, "y": 0}, + + {"matrix": [2, 0], "x": 20, "y": 0}, + {"matrix": [2, 1], "x": 21, "y": 0}, + {"matrix": [2, 2], "x": 22, "y": 0}, + {"matrix": [2, 3], "x": 23, "y": 0}, + {"matrix": [2, 4], "x": 24, "y": 0}, + + {"matrix": [6, 4], "x": 25, "y": 0}, + {"matrix": [6, 3], "x": 26, "y": 0}, + {"matrix": [6, 2], "x": 27, "y": 0}, + {"matrix": [6, 1], "x": 28, "y": 0}, + {"matrix": [6, 0], "x": 29, "y": 0}, + + {"matrix": [3, 1], "x": 30, "y": 0}, + {"matrix": [3, 2], "x": 31, "y": 0}, + {"matrix": [3, 3], "x": 32, "y": 0}, + {"matrix": [3, 4], "x": 33, "y": 0}, + + {"matrix": [7, 4], "x": 34, "y": 0}, + {"matrix": [7, 3], "x": 35, "y": 0}, + {"matrix": [7, 2], "x": 36, "y": 0}, + {"matrix": [7, 1], "x": 37, "y": 0} ] } } diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h deleted file mode 100644 index 7d2ce91cdd..0000000000 --- a/keyboards/ibnuda/squiggle/rev1/rev1.h +++ /dev/null @@ -1,117 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ 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( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L33, L34, R30, R31 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, ___, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, ___, R31, R30 }, \ -} - -#define LAYOUT_reversed( \ - R04, R03, R02, R01, R00, L04, L03, L02, L01, L00, \ - R14, R13, R12, R11, R10, L14, L13, L12, L11, L10, \ - R24, R23, R22, R21, R20, L24, L23, L22, L21, L20, \ - R31, R30, L34, L33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, ___, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, ___, R31, R30 }, \ -} - -#define LAYOUT_split_3x5_3(\ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L32, L33, L34, R30, R31, R32 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, R32, R31, R30 }, \ -} - -#define LAYOUT_complicated(\ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L33, L34, R30, R31, \ - L31, L32, R32, R33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, R33, R32, R31, R30 }, \ -} - -#define LAYOUT_thumbrow(\ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L31, L32, L33, L34, R30, R31, R32, R33 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, R33, R32, R31, R30 }, \ -} - -#define LAYOUT_full(\ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32, L33, L34 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { R34, R33, R32, R31, R30 }, \ -} - -- cgit v1.2.3 From 1899793f27c9b165b55b28b086bd989f12baf137 Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Mon, 3 Apr 2023 07:32:47 +0200 Subject: Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps (#20211) --- keyboards/ibnuda/alicia_cook/keymaps/rick/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/default/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/default38/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/rick/config.h | 1 - 7 files changed, 7 deletions(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h index fc9cdfe786..ccfd50638b 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h @@ -17,7 +17,6 @@ #define COMBO_TERM 50 #define COMBO_COUNT 50 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TERM 175 #define TAPPING_TERM 175 diff --git a/keyboards/ibnuda/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h index 9b7c369dda..fa95320e90 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default38/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h @@ -21,5 +21,4 @@ along with this program. If not, see . #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h index 1c8cff4bb6..65eec1d7f8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h @@ -18,5 +18,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h index 5b97451890..9920602ab8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h @@ -2,7 +2,6 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define LEADER_TIMEOUT 300 diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h index 88c4203d8b..6411ba8c66 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h @@ -2,5 +2,4 @@ #define COMBO_TERM 100 #define COMBO_COUNT 38 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD -- 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/ibnuda/gurindam/config.h | 1 - keyboards/ibnuda/gurindam/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h index 2521d16e8c..dc525a111d 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN D3 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index 3fd6dfe21a..f8acee360f 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -8,6 +8,9 @@ "pid": "0x6974", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"] -- 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/ibnuda/gurindam/gurindam.h | 46 ----------- keyboards/ibnuda/gurindam/info.json | 143 +++++++++++++++++++---------------- 2 files changed, 76 insertions(+), 113 deletions(-) delete mode 100644 keyboards/ibnuda/gurindam/gurindam.h (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/gurindam/gurindam.h b/keyboards/ibnuda/gurindam/gurindam.h deleted file mode 100644 index 9967bcf528..0000000000 --- a/keyboards/ibnuda/gurindam/gurindam.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Ibnu D. Aji - * - * 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 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( \ - k1, k6, k10, k15, k19, k24, k28, k33, k37, k42, k46, k51, k55, k60, k64, k65, \ - k2, k7, k11, k16, k20, k25, k29, k34, k38, k43, k47, k52, k56, k61, k66, \ - k3, k8, k12, k17, k21, k26, k30, k35, k39, k44, k48, k53, k57, k62, \ - k4, k9, k13, k18, k22, k27, k31, k36, k40, k45, k49, k54, k58, \ - k5, k14, k23, k32, k41, k50, k59, k63, k67 \ -) \ -{ \ - { k1, k10, k19, k28, k37, k46, k55, k64 }, \ - { k6, k15, k24, k33, k42, k51, k60, XXX }, \ - { k2, k11, k20, k29, k38, k47, k56, k65 }, \ - { k7, k16, k25, k34, k43, k52, k61, XXX }, \ - { k3, k12, k21, k30, k39, k48, k57, k66 }, \ - { k8, k17, k26, k35, k44, k53, k62, XXX }, \ - { k4, k13, k22, k31, k40, k49, k58, k67 }, \ - { k9, k18, k27, k36, k45, k54, k63, XXX }, \ - { k5, k14, k23, k32, k41, k50, k59, XXX } \ -} diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index f8acee360f..2b18d0417e 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -21,77 +21,86 @@ "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":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":17.3, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "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":8.5, "y":1}, - {"x":9.5, "y":1}, - {"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.5, "y":1, "w":1.5}, - {"x":17.3, "y":1}, + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [0, 4], "x": 10, "y": 0}, + {"matrix": [1, 4], "x": 11, "y": 0}, + {"matrix": [0, 5], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0}, + {"matrix": [0, 6], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, + {"matrix": [0, 7], "x": 16, "y": 0}, - {"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":8.75, "y":2}, - {"x":9.75, "y":2}, - {"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, "w":2.25}, - {"x":17.3, "y":2}, + {"matrix": [2, 7], "x": 17.3, "y": 0}, - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3, "w":1.75}, - {"x":16.3, "y":3.25}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, - {"x":0, "y":4, "w":1.5}, - {"x":3.25, "y":4, "w":1.5}, - {"x":4.75, "y":4, "w":2}, - {"x":6.75, "y":4, "w":1.25}, - {"x":8.75, "y":4, "w":2.75}, - {"x":11.5, "y":4, "w":1.5}, - {"x":15.3, "y":4.25}, - {"x":16.3, "y":4.25}, - {"x":17.3, "y":4.25} + {"matrix": [2, 3], "x": 8.5, "y": 1}, + {"matrix": [3, 3], "x": 9.5, "y": 1}, + {"matrix": [2, 4], "x": 10.5, "y": 1}, + {"matrix": [3, 4], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [3, 5], "x": 13.5, "y": 1}, + {"matrix": [2, 6], "x": 14.5, "y": 1}, + {"matrix": [3, 6], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 7], "x": 17.3, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [5, 3], "x": 9.75, "y": 2}, + {"matrix": [4, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 11.75, "y": 2}, + {"matrix": [4, 5], "x": 12.75, "y": 2}, + {"matrix": [5, 5], "x": 13.75, "y": 2}, + {"matrix": [4, 6], "x": 14.75, "y": 2, "w": 2.25}, + + {"matrix": [5, 6], "x": 17.3, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + + {"matrix": [6, 3], "x": 9.25, "y": 3}, + {"matrix": [7, 3], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3}, + {"matrix": [7, 4], "x": 12.25, "y": 3}, + {"matrix": [6, 5], "x": 13.25, "y": 3}, + {"matrix": [7, 5], "x": 14.25, "y": 3, "w": 1.75}, + + {"matrix": [6, 6], "x": 16.3, "y": 3.25}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 1], "x": 3.25, "y": 4, "w": 1.5}, + {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 2}, + {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 8.75, "y": 4, "w": 2.75}, + {"matrix": [8, 5], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.3, "y": 4.25}, + {"matrix": [7, 6], "x": 16.3, "y": 4.25}, + {"matrix": [6, 7], "x": 17.3, "y": 4.25} ] } } -- 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/ibnuda/alicia_cook/alicia_cook.h | 41 ------------ keyboards/ibnuda/alicia_cook/info.json | 104 ++++++++++++++--------------- 2 files changed, 52 insertions(+), 93 deletions(-) delete mode 100644 keyboards/ibnuda/alicia_cook/alicia_cook.h (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/alicia_cook.h b/keyboards/ibnuda/alicia_cook/alicia_cook.h deleted file mode 100644 index 35c803b3ae..0000000000 --- a/keyboards/ibnuda/alicia_cook/alicia_cook.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Ibnu D. Aji - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -#define 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_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k30, k31, k33, k34, k35, k36, k37, k38, k3b, k3c \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \ - { k30, k31, XXX, k33, k34, k35, k36, k37, k38, XXX, XXX, k3b, k3c } \ -} diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json index 137c6bc7de..c10d038bf2 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -16,60 +16,60 @@ "processor": "atmega32u4", "bootloader": "caterina", "layouts": { - "LAYOUT_all": { - "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":7,"y":0}, - {"x":8,"y":0}, - {"x":9,"y":0}, - {"x":10,"y":0}, - {"x":11,"y":0}, - {"x":12,"y":0}, - {"x":13,"y":0}, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 7, "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}, + {"matrix": [0, 12], "x": 13, "y": 0}, - {"x":0,"y":1,"w":1.25}, - {"x":1.25,"y":1}, - {"x":2.25,"y":1}, - {"x":3.25,"y":1}, - {"x":4.25,"y":1}, - {"x":5.25,"y":1}, - {"x":7.25,"y":1}, - {"x":8.25,"y":1}, - {"x":9.25,"y":1}, - {"x":10.25,"y":1}, - {"x":11.25,"y":1}, - {"x":12.25,"y":1,"w":1.75}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 7.25, "y": 1}, + {"matrix": [1, 7], "x": 8.25, "y": 1}, + {"matrix": [1, 8], "x": 9.25, "y": 1}, + {"matrix": [1, 9], "x": 10.25, "y": 1}, + {"matrix": [1, 10], "x": 11.25, "y": 1}, + {"matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, - {"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":6.75,"y":2}, - {"x":7.75,"y":2}, - {"x":8.75,"y":2}, - {"x":9.75,"y":2}, - {"x":10.75,"y":2}, - {"x":11.75,"y":2}, - {"x":12.75,"y":2,"w":1.25}, + {"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": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, - {"x":0,"y":3,"w":1.25}, - {"x":1.25,"y":3,"w":1.25}, - {"x":3.5,"y":3,"w":1.25}, - {"x":4.75,"y":3}, - {"x":5.75,"y":3}, - {"x":6.75,"y":3,"w":1.25}, - {"x":8,"y":3}, - {"x":9,"y":3,"w":1.25}, - {"x":11.5,"y":3,"w":1.25}, - {"x":12.75,"y":3,"w":1.25} - ] - } + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + } } } -- cgit v1.2.3 From 982ac061b16aa6c47015f0badec5f4fad84be4ca Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 May 2023 15:36:29 -0700 Subject: Alicia Cook Layout Macro Additions (#20675) * add matrix_diagram.md * info.json: apply friendly formatting * add LAYOUT_long_lspace * add LAYOUT_long_rspace * add LAYOUT_long_spaces * Update keyboards/ibnuda/alicia_cook/info.json --- keyboards/ibnuda/alicia_cook/info.json | 299 +++++++++++++++++++------ keyboards/ibnuda/alicia_cook/matrix_diagram.md | 16 ++ 2 files changed, 246 insertions(+), 69 deletions(-) create mode 100644 keyboards/ibnuda/alicia_cook/matrix_diagram.md (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json index c10d038bf2..1405e5d093 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -1,75 +1,236 @@ { - "keyboard_name": "Alicia Cook", - "manufacturer": "Ibnu D. Aji", - "url": "https://github.com/ibnuda/alicia-cook", - "maintainer": "ibnuda", - "usb": { - "vid": "0xFEED", - "pid": "0x6955", - "device_version": "8.9.9" - }, - "matrix_pins": { - "cols": ["B5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], - "rows": ["D2", "D3", "F4", "F5"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT_all": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 7, "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}, - {"matrix": [0, 12], "x": 13, "y": 0}, + "keyboard_name": "Alicia Cook", + "manufacturer": "Ibnu D. Aji", + "url": "https://github.com/ibnuda/alicia-cook", + "maintainer": "ibnuda", + "usb": { + "vid": "0xFEED", + "pid": "0x6955", + "device_version": "8.9.9" + }, + "matrix_pins": { + "cols": ["B5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["D2", "D3", "F4", "F5"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "Delete", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 12], "x": 13, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, - {"matrix": [1, 1], "x": 1.25, "y": 1}, - {"matrix": [1, 2], "x": 2.25, "y": 1}, - {"matrix": [1, 3], "x": 3.25, "y": 1}, - {"matrix": [1, 4], "x": 4.25, "y": 1}, - {"matrix": [1, 5], "x": 5.25, "y": 1}, - {"matrix": [1, 6], "x": 7.25, "y": 1}, - {"matrix": [1, 7], "x": 8.25, "y": 1}, - {"matrix": [1, 8], "x": 9.25, "y": 1}, - {"matrix": [1, 9], "x": 10.25, "y": 1}, - {"matrix": [1, 10], "x": 11.25, "y": 1}, - {"matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, + {"label": "Ctrl", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [1, 10], "x": 11.25, "y": 1}, + {"label": ";", "matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, - {"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": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "MO(1)", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, - {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, - {"matrix": [3, 4], "x": 4.75, "y": 3}, - {"matrix": [3, 5], "x": 5.75, "y": 3}, - {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 1.25}, - {"matrix": [3, 7], "x": 8, "y": 3}, - {"matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, - {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, - {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} - ] + {"label": "GUI", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"label": "Backspace", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "Esc", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "Enter", "matrix": [3, 6], "x": 6.75, "y": 3, "w": 1.25}, + {"label": "Space", "matrix": [3, 7], "x": 8, "y": 3}, + {"label": "Alt", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"label": "Ctrl", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + }, + "LAYOUT_long_lspace": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "Delete", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 12], "x": 13, "y": 0}, + + {"label": "Ctrl", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [1, 10], "x": 11.25, "y": 1}, + {"label": ";", "matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, + + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "MO(1)", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, + + {"label": "GUI", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"label": "Esc", "matrix": [3, 5], "x": 4.75, "y": 3, "w": 2}, + {"label": "Enter", "matrix": [3, 6], "x": 6.75, "y": 3, "w": 1.25}, + {"label": "Space", "matrix": [3, 7], "x": 8, "y": 3}, + {"label": "Alt", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"label": "Ctrl", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + }, + "LAYOUT_long_rspace": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "Delete", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 12], "x": 13, "y": 0}, + + {"label": "Ctrl", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [1, 10], "x": 11.25, "y": 1}, + {"label": ";", "matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, + + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "MO(1)", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, + + {"label": "GUI", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"label": "Backspace", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "Esc", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "Enter", "matrix": [3, 6], "x": 6.75, "y": 3, "w": 2.25}, + {"label": "Alt", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"label": "Ctrl", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + }, + "LAYOUT_long_spaces": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "W", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "E", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "R", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "T", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Y", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "U", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "I", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "O", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "P", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "Delete", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 12], "x": 13, "y": 0}, + + {"label": "Ctrl", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1}, + {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1}, + {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1}, + {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1}, + {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1}, + {"label": "H", "matrix": [1, 6], "x": 7.25, "y": 1}, + {"label": "J", "matrix": [1, 7], "x": 8.25, "y": 1}, + {"label": "K", "matrix": [1, 8], "x": 9.25, "y": 1}, + {"label": "L", "matrix": [1, 9], "x": 10.25, "y": 1}, + {"label": "'", "matrix": [1, 10], "x": 11.25, "y": 1}, + {"label": ";", "matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.75}, + + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": ",", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "MO(1)", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, + + {"label": "GUI", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "Alt", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"label": "Esc", "matrix": [3, 5], "x": 4.75, "y": 3, "w": 2}, + {"label": "Enter", "matrix": [3, 6], "x": 6.75, "y": 3, "w": 2.25}, + {"label": "Alt", "matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"label": "GUI", "matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"label": "Ctrl", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + } } - } } diff --git a/keyboards/ibnuda/alicia_cook/matrix_diagram.md b/keyboards/ibnuda/alicia_cook/matrix_diagram.md new file mode 100644 index 0000000000..8011ac442e --- /dev/null +++ b/keyboards/ibnuda/alicia_cook/matrix_diagram.md @@ -0,0 +1,16 @@ +# Matrix Diagram for Alicia Cook by Ibnu D. Aji + +``` +┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │ │06 │07 │08 │09 │0A │0B │0C │ +├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤ +│10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │ +├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤ +│20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2C │ +├────┬─┴──┬┴──┬┴───┼───┼───┤ ├───┴┬──┴┬──┴─┬─┴──┬┴───┼────┤ +│30 │31 │ │33 │34 │35 │ │36 │37 │38 │ │3B │3C │ +└────┴────┘ └────┴───┴───┘ └────┴───┴────┘ └────┴────┘ + ┌───────┐ ┌────────┐ + 2u Left Space │35 │ │36 │ 2.25u Right Space + └───────┘ └────────┘ +``` -- cgit v1.2.3 From 5faa23d54ca1e3ab83097f2a07922f48800616e6 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Mon, 15 May 2023 22:27:37 +1000 Subject: Keymap introspection for combos. (#19670) --- keyboards/ibnuda/alicia_cook/keymaps/rick/config.h | 1 - keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/default/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/default/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/default38/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/default38/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/rick/config.h | 1 - keyboards/ibnuda/squiggle/keymaps/rick/keymap.c | 2 +- 14 files changed, 7 insertions(+), 14 deletions(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h index ccfd50638b..d4b4480810 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h @@ -16,7 +16,6 @@ #pragma once #define COMBO_TERM 50 -#define COMBO_COUNT 50 #define PERMISSIVE_HOLD #define TAPPING_TERM 175 #define TAPPING_TERM 175 diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c index 88c3784754..9c1f0cb63e 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c @@ -188,7 +188,7 @@ const uint16_t PROGMEM rl_r_m_i_combo[] = {RLR, RLM, RLI, COMBO_END}; // both hand combinations. const uint16_t PROGMEM bl_m_m_combo[] = {LLM, RLM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [L_U_PINKY_RING] = COMBO(lu_p_r_combo, KC_TAB), [L_U_RING_MIDDLE] = COMBO(lu_r_m_combo, KC_QUES), diff --git a/keyboards/ibnuda/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h index 6411ba8c66..22ceb2f996 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h @@ -1,5 +1,4 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c index c85099a144..47269b07ff 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[] = {KC_Z, KC_SLSH, COMBO_END}; const uint16_t PROGMEM x_comma_combo[] = {KC_X, KC_COMM, COMBO_END}; const uint16_t PROGMEM j_f_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [Q_W] = COMBO(q_w_combo, KC_TAB), [W_E] = COMBO(w_e_combo, KC_DQT), diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h index fa95320e90..822264ca78 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default38/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h @@ -20,5 +20,4 @@ along with this program. If not, see . #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c index aa51f479ff..8e4685757c 100644 --- a/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[] = {KC_Z, KC_SLSH, COMBO_END}; const uint16_t PROGMEM x_comma_combo[] = {KC_X, KC_COMM, COMBO_END}; const uint16_t PROGMEM j_f_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [Q_W] = COMBO(q_w_combo, KC_TAB), [W_E] = COMBO(w_e_combo, KC_DQT), diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h index 65eec1d7f8..127f7d0fb8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h @@ -17,5 +17,4 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c index 78f9617cf0..0d56ef08a8 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[] = {KC_Z, KC_SLSH, COMBO_END}; const uint16_t PROGMEM x_comma_combo[] = {KC_X, KC_COMM, COMBO_END}; const uint16_t PROGMEM j_f_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [Q_W] = COMBO(q_w_combo, KC_TAB), [W_E] = COMBO(w_e_combo, KC_DQT), diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h index 6411ba8c66..22ceb2f996 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h @@ -1,5 +1,4 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c index 477aa2229e..171f1a373e 100644 --- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM z_slash_combo[] = {KC_Z, KC_SLSH, COMBO_END}; const uint16_t PROGMEM x_comma_combo[] = {KC_X, KC_COMM, COMBO_END}; const uint16_t PROGMEM j_f_combo[] = {KC_F, KC_J, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [Q_W] = COMBO(q_w_combo, KC_TAB), [W_E] = COMBO(w_e_combo, KC_DQT), diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h index 9920602ab8..2392b46be6 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h @@ -1,7 +1,6 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD #define LEADER_TIMEOUT 300 diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c index c030738400..b28fc84499 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c @@ -121,7 +121,7 @@ const uint16_t PROGMEM m_b_combo[] = {KC_M, KC_B, COMBO_END}; // both hand combinations. const uint16_t PROGMEM j_w_combo[] = {KC_J, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [COLON_COMMA] = COMBO(colon_comma_combo, KC_TAB), [COMMA_DOT] = COMBO(comma_dot_combo, KC_QUES), diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h index 6411ba8c66..22ceb2f996 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h +++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h @@ -1,5 +1,4 @@ #pragma once #define COMBO_TERM 100 -#define COMBO_COUNT 38 #define PERMISSIVE_HOLD diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c index f0ab692f28..75ea54c548 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c @@ -121,7 +121,7 @@ const uint16_t PROGMEM m_b_combo[] = {KC_M, KC_B, COMBO_END}; // both hand combinations. const uint16_t PROGMEM j_w_combo[] = {KC_J, KC_W, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [COLON_COMMA] = COMBO(colon_comma_combo, KC_TAB), [COMMA_DOT] = COMBO(comma_dot_combo, KC_QUES), -- cgit v1.2.3 From 17de141c9248a7a1a1814d96d1f12f36df3d6a8f Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 16 May 2023 17:00:08 +1000 Subject: Add missing layout data for a handful of boards (#20931) * Add missing layout data for a handful of boards * typo * Add missing layouts for stoutgat * Add missing layout for j80 * Replace missing layout with alias for wraith * Add missing layout for matrix/me * Add missing layout for satisfaction75/prototype * Apply suggestions from code review * Rename wt80-a layouts * Rename rosa layouts * Add missing layouts for naked48 * Add missing layouts for naked60 * Add missing layouts for uma * Remove unused and pointless `LAYOUT_stack` for buzzard * Add missing layout for keyboardio/model01 * Add missing layout for smk65 revf * Fix via keymap for h60 * Add missing layout for jabberwocky/v1 * Apply suggestions from code review * Add missing layout for m3n3van * Add missing layout for giabalanai * Add missing layouts for treadstone48/rev1 * Add missing layouts for squiggle * Update keyboards/marksard/treadstone48/rev1/info.json --- keyboards/ibnuda/squiggle/rev1/info.json | 248 +++++++++++++++---------------- 1 file changed, 124 insertions(+), 124 deletions(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index c5f15104f6..081dd8ddd5 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -118,98 +118,98 @@ }, "LAYOUT_full": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, - {"matrix": [4, 4], "x": 5, "y": 0}, - {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, {"matrix": [4, 2], "x": 7, "y": 0}, - {"matrix": [4, 1], "x": 8, "y": 0}, - {"matrix": [4, 0], "x": 9, "y": 0}, - - {"matrix": [1, 0], "x": 10, "y": 0}, - {"matrix": [1, 1], "x": 11, "y": 0}, - {"matrix": [1, 2], "x": 12, "y": 0}, - {"matrix": [1, 3], "x": 13, "y": 0}, - {"matrix": [1, 4], "x": 14, "y": 0}, - - {"matrix": [5, 4], "x": 15, "y": 0}, - {"matrix": [5, 3], "x": 16, "y": 0}, - {"matrix": [5, 2], "x": 17, "y": 0}, - {"matrix": [5, 1], "x": 18, "y": 0}, - {"matrix": [5, 0], "x": 19, "y": 0}, - - {"matrix": [2, 0], "x": 20, "y": 0}, - {"matrix": [2, 1], "x": 21, "y": 0}, - {"matrix": [2, 2], "x": 22, "y": 0}, - {"matrix": [2, 3], "x": 23, "y": 0}, - {"matrix": [2, 4], "x": 24, "y": 0}, - - {"matrix": [6, 4], "x": 25, "y": 0}, - {"matrix": [6, 3], "x": 26, "y": 0}, - {"matrix": [6, 2], "x": 27, "y": 0}, - {"matrix": [6, 1], "x": 28, "y": 0}, - {"matrix": [6, 0], "x": 29, "y": 0}, - - {"matrix": [3, 0], "x": 30, "y": 0}, - {"matrix": [3, 1], "x": 31, "y": 0}, - {"matrix": [3, 2], "x": 32, "y": 0}, - {"matrix": [3, 3], "x": 33, "y": 0}, - {"matrix": [3, 4], "x": 34, "y": 0}, - - {"matrix": [7, 4], "x": 35, "y": 0}, - {"matrix": [7, 3], "x": 36, "y": 0}, - {"matrix": [7, 2], "x": 37, "y": 0}, - {"matrix": [7, 1], "x": 38, "y": 0}, - {"matrix": [7, 0], "x": 39, "y": 0} + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 0], "x": 0, "y": 3.9}, + {"matrix": [3, 1], "x": 1, "y": 3.2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.1}, + {"matrix": [3, 4], "x": 4, "y": 3.15}, + + {"matrix": [7, 4], "x": 5, "y": 3.15}, + {"matrix": [7, 3], "x": 6, "y": 3.1}, + {"matrix": [7, 2], "x": 7, "y": 3}, + {"matrix": [7, 1], "x": 8, "y": 3.2}, + {"matrix": [7, 0], "x": 9, "y": 3.9} ] }, "LAYOUT_reversed": { "layout": [ - {"matrix": [4, 0], "x": 0, "y": 0}, - {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 0], "x": 0, "y": 0.9}, + {"matrix": [4, 1], "x": 1, "y": 0.2}, {"matrix": [4, 2], "x": 2, "y": 0}, - {"matrix": [4, 3], "x": 3, "y": 0}, - {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0.1}, + {"matrix": [4, 4], "x": 4, "y": 0.15}, - {"matrix": [0, 4], "x": 5, "y": 0}, - {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.15}, + {"matrix": [0, 3], "x": 6, "y": 0.1}, {"matrix": [0, 2], "x": 7, "y": 0}, - {"matrix": [0, 1], "x": 8, "y": 0}, - {"matrix": [0, 0], "x": 9, "y": 0}, - - {"matrix": [5, 0], "x": 10, "y": 0}, - {"matrix": [5, 1], "x": 11, "y": 0}, - {"matrix": [5, 2], "x": 12, "y": 0}, - {"matrix": [5, 3], "x": 13, "y": 0}, - {"matrix": [5, 4], "x": 14, "y": 0}, - - {"matrix": [1, 4], "x": 15, "y": 0}, - {"matrix": [1, 3], "x": 16, "y": 0}, - {"matrix": [1, 2], "x": 17, "y": 0}, - {"matrix": [1, 1], "x": 18, "y": 0}, - {"matrix": [1, 0], "x": 19, "y": 0}, - - {"matrix": [6, 0], "x": 20, "y": 0}, - {"matrix": [6, 1], "x": 21, "y": 0}, - {"matrix": [6, 2], "x": 22, "y": 0}, - {"matrix": [6, 3], "x": 23, "y": 0}, - {"matrix": [6, 4], "x": 24, "y": 0}, - - {"matrix": [2, 4], "x": 25, "y": 0}, - {"matrix": [2, 3], "x": 26, "y": 0}, - {"matrix": [2, 2], "x": 27, "y": 0}, - {"matrix": [2, 1], "x": 28, "y": 0}, - {"matrix": [2, 0], "x": 29, "y": 0}, - - {"matrix": [7, 3], "x": 30, "y": 0}, - {"matrix": [7, 4], "x": 31, "y": 0}, - - {"matrix": [3, 4], "x": 32, "y": 0}, - {"matrix": [3, 3], "x": 33, "y": 0} + {"matrix": [0, 1], "x": 8, "y": 0.2}, + {"matrix": [0, 0], "x": 9, "y": 0.9}, + + {"matrix": [5, 0], "x": 0, "y": 1.9}, + {"matrix": [5, 1], "x": 1, "y": 1.2}, + {"matrix": [5, 2], "x": 2, "y": 1}, + {"matrix": [5, 3], "x": 3, "y": 1.1}, + {"matrix": [5, 4], "x": 4, "y": 1.15}, + + {"matrix": [1, 4], "x": 5, "y": 1.15}, + {"matrix": [1, 3], "x": 6, "y": 1.1}, + {"matrix": [1, 2], "x": 7, "y": 1}, + {"matrix": [1, 1], "x": 8, "y": 1.2}, + {"matrix": [1, 0], "x": 9, "y": 1.9}, + + {"matrix": [6, 0], "x": 0, "y": 2.9}, + {"matrix": [6, 1], "x": 1, "y": 2.2}, + {"matrix": [6, 2], "x": 2, "y": 2}, + {"matrix": [6, 3], "x": 3, "y": 2.1}, + {"matrix": [6, 4], "x": 4, "y": 2.15}, + + {"matrix": [2, 4], "x": 5, "y": 2.15}, + {"matrix": [2, 3], "x": 6, "y": 2.1}, + {"matrix": [2, 2], "x": 7, "y": 2}, + {"matrix": [2, 1], "x": 8, "y": 2.2}, + {"matrix": [2, 0], "x": 9, "y": 2.9}, + + {"matrix": [7, 3], "x": 3, "y": 3.6, "h": 2}, + {"matrix": [7, 4], "x": 4, "y": 3.65, "h": 2}, + + {"matrix": [3, 4], "x": 5, "y": 3.65, "h": 2}, + {"matrix": [3, 3], "x": 6, "y": 3.6, "h": 2} ] }, "LAYOUT_split_3x5_3": { @@ -261,51 +261,51 @@ }, "LAYOUT_thumbrow": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.9}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, - {"matrix": [4, 4], "x": 5, "y": 0}, - {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [4, 4], "x": 5, "y": 0.15}, + {"matrix": [4, 3], "x": 6, "y": 0.1}, {"matrix": [4, 2], "x": 7, "y": 0}, - {"matrix": [4, 1], "x": 8, "y": 0}, - {"matrix": [4, 0], "x": 9, "y": 0}, - - {"matrix": [1, 0], "x": 10, "y": 0}, - {"matrix": [1, 1], "x": 11, "y": 0}, - {"matrix": [1, 2], "x": 12, "y": 0}, - {"matrix": [1, 3], "x": 13, "y": 0}, - {"matrix": [1, 4], "x": 14, "y": 0}, - - {"matrix": [5, 4], "x": 15, "y": 0}, - {"matrix": [5, 3], "x": 16, "y": 0}, - {"matrix": [5, 2], "x": 17, "y": 0}, - {"matrix": [5, 1], "x": 18, "y": 0}, - {"matrix": [5, 0], "x": 19, "y": 0}, - - {"matrix": [2, 0], "x": 20, "y": 0}, - {"matrix": [2, 1], "x": 21, "y": 0}, - {"matrix": [2, 2], "x": 22, "y": 0}, - {"matrix": [2, 3], "x": 23, "y": 0}, - {"matrix": [2, 4], "x": 24, "y": 0}, - - {"matrix": [6, 4], "x": 25, "y": 0}, - {"matrix": [6, 3], "x": 26, "y": 0}, - {"matrix": [6, 2], "x": 27, "y": 0}, - {"matrix": [6, 1], "x": 28, "y": 0}, - {"matrix": [6, 0], "x": 29, "y": 0}, - - {"matrix": [3, 1], "x": 30, "y": 0}, - {"matrix": [3, 2], "x": 31, "y": 0}, - {"matrix": [3, 3], "x": 32, "y": 0}, - {"matrix": [3, 4], "x": 33, "y": 0}, - - {"matrix": [7, 4], "x": 34, "y": 0}, - {"matrix": [7, 3], "x": 35, "y": 0}, - {"matrix": [7, 2], "x": 36, "y": 0}, - {"matrix": [7, 1], "x": 37, "y": 0} + {"matrix": [4, 1], "x": 8, "y": 0.2}, + {"matrix": [4, 0], "x": 9, "y": 0.9}, + + {"matrix": [1, 0], "x": 0, "y": 1.9}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + + {"matrix": [5, 4], "x": 5, "y": 1.15}, + {"matrix": [5, 3], "x": 6, "y": 1.1}, + {"matrix": [5, 2], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1.2}, + {"matrix": [5, 0], "x": 9, "y": 1.9}, + + {"matrix": [2, 0], "x": 0, "y": 2.9}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + + {"matrix": [6, 4], "x": 5, "y": 2.15}, + {"matrix": [6, 3], "x": 6, "y": 2.1}, + {"matrix": [6, 2], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2.2}, + {"matrix": [6, 0], "x": 9, "y": 2.9}, + + {"matrix": [3, 1], "x": 3, "y": 4.6}, + {"matrix": [3, 2], "x": 4, "y": 4.65}, + {"matrix": [3, 3], "x": 3, "y": 3.6}, + {"matrix": [3, 4], "x": 4, "y": 3.65}, + + {"matrix": [7, 4], "x": 5, "y": 3.65}, + {"matrix": [7, 3], "x": 6, "y": 3.6}, + {"matrix": [7, 2], "x": 5, "y": 4.65}, + {"matrix": [7, 1], "x": 6, "y": 4.6} ] } } -- cgit v1.2.3