From 3be5d90b6d1c4534bcfce9725808e8c4d469a845 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 3 Mar 2023 17:50:40 +0000 Subject: Remove some use of keymap.h (#20006) --- keyboards/gboards/butterstick/sten.h | 3 ++- keyboards/gboards/engine/engine.h | 3 +-- keyboards/gboards/g/engine.h | 4 ++-- keyboards/gboards/georgi/sten.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h index 0d5c58df21..84c54c9e2e 100644 --- a/keyboards/gboards/butterstick/sten.h +++ b/keyboards/gboards/butterstick/sten.h @@ -5,9 +5,10 @@ // // Amen. +#pragma once + #include QMK_KEYBOARD_H #include "mousekey.h" -#include "keymap.h" #include "keymap_steno.h" #include "wait.h" diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h index 5b9d5b0ecb..5b2da811d8 100644 --- a/keyboards/gboards/engine/engine.h +++ b/keyboards/gboards/engine/engine.h @@ -10,9 +10,8 @@ crap is removed where possible */ -#include QMK_KEYBOARD_H #pragma once -#include "keymap.h" +#include QMK_KEYBOARD_H #include #include #include diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h index 547ea09fdd..e166ba37d2 100644 --- a/keyboards/gboards/g/engine.h +++ b/keyboards/gboards/g/engine.h @@ -10,9 +10,9 @@ crap is removed where possible */ -#include QMK_KEYBOARD_H #pragma once -#include "keymap.h" + +#include QMK_KEYBOARD_H #include #include #include diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h index 320c49514c..05d518efac 100644 --- a/keyboards/gboards/georgi/sten.h +++ b/keyboards/gboards/georgi/sten.h @@ -4,10 +4,10 @@ // the slave and the master. Until we return from main. // // Amen. +#pragma once #include QMK_KEYBOARD_H #include "mousekey.h" -#include "keymap.h" #include "keymap_steno.h" #include "wait.h" -- 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/gboards/butterstick/config.h | 6 ------ keyboards/gboards/butterstick/info.json | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h index d0415c48f5..a3516ccedb 100644 --- a/keyboards/gboards/butterstick/config.h +++ b/keyboards/gboards/butterstick/config.h @@ -4,9 +4,3 @@ #define VERSION "Paula Deen" #define FORCE_NKRO - -#define MATRIX_ROW_PINS { F4, F5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 085d56f91e..465cd940a1 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -8,6 +8,11 @@ "pid": "0x1337", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"], + "rows": ["F4", "F5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3 From 9e2ef5078a9eb532f492d7d9a15d35f9c1d48744 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 13 Mar 2023 22:22:20 +1100 Subject: Adjust offset for some layouts (#20075) --- keyboards/gboards/ergotaco/info.json | 61 ++++++++---------------------------- 1 file changed, 13 insertions(+), 48 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index 163b76db19..8414985841 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -13,54 +13,19 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 1.25 - }, - { - "x": 1, - "y": 0.75 - }, - { - "x": 2, - "y": 0.5 - }, - { - "x": 3, - "y": 0.25 - }, - { - "x": 4, - "y": 1 - }, - { - "x": 5, - "y": 1.75 - }, - { - "x": 7, - "y": 1.75 - }, - { - "x": 8, - "y": 1 - }, - { - "x": 9, - "y": 0.25 - }, - { - "x": 10, - "y": 0.5 - }, - { - "x": 11, - "y": 0.75 - }, - { - "x": 12, - "y": 1.25 - } + {"x": 0, "y": 1}, + {"x": 1, "y": 0.5}, + {"x": 2, "y": 0.25}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0.75}, + {"x": 5, "y": 1.5}, + + {"x": 7, "y": 1.5}, + {"x": 8, "y": 0.75}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0.25}, + {"x": 11, "y": 0.5}, + {"x": 12, "y": 1} ] } } -- cgit v1.2.3 From d8aec71e485b63408474829436f55cb1af0ea903 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 18 Mar 2023 01:21:53 +1100 Subject: Remove trailing zeroes in info.json layouts (#20156) --- keyboards/gboards/gergo/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index f38051809d..5aadadbaed 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -100,7 +100,7 @@ { "label": "L13", "x": 3.5, - "y": 1.0 + "y": 1 }, { "label": "L14", @@ -137,7 +137,7 @@ { "label": "R13", "x": 15, - "y": 1.0 + "y": 1 }, { "label": "R14", -- cgit v1.2.3 From 3c144fac5e2b634166f6b9cc0fc45029d63d3398 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 20 Mar 2023 08:12:05 +1100 Subject: Clean up usage of `QMK_KEYBOARD_H` (#20167) --- keyboards/gboards/butterstick/sten.h | 2 +- keyboards/gboards/engine/engine.h | 6 ++---- keyboards/gboards/ergotaco/ergotaco.c | 2 +- keyboards/gboards/ergotaco/matrix.c | 7 +------ keyboards/gboards/g/engine.h | 8 +------- keyboards/gboards/georgi/georgi.c | 2 +- keyboards/gboards/georgi/matrix.c | 8 +------- keyboards/gboards/georgi/sten.h | 2 +- keyboards/gboards/gergo/gergo.c | 2 +- keyboards/gboards/gergo/matrix.c | 7 +------ 10 files changed, 11 insertions(+), 35 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h index 84c54c9e2e..39740ac3d3 100644 --- a/keyboards/gboards/butterstick/sten.h +++ b/keyboards/gboards/butterstick/sten.h @@ -7,7 +7,7 @@ #pragma once -#include QMK_KEYBOARD_H +#include "butterstick.h" #include "mousekey.h" #include "keymap_steno.h" #include "wait.h" diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h index 5b2da811d8..005dd730b8 100644 --- a/keyboards/gboards/engine/engine.h +++ b/keyboards/gboards/engine/engine.h @@ -11,13 +11,11 @@ */ #pragma once -#include QMK_KEYBOARD_H + +#include "quantum.h" #include -#include #include #include "config_engine.h" -#include -#include "wait.h" // Maximum values for combos #define COMBO_END 0x00 diff --git a/keyboards/gboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c index ecab74b3a2..daeba1e0a6 100644 --- a/keyboards/gboards/ergotaco/ergotaco.c +++ b/keyboards/gboards/ergotaco/ergotaco.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "ergotaco.h" bool i2c_initialized = 0; i2c_status_t mcp23018_status = 0x20; diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c index 1bab5e8981..63d4c4f5f3 100644 --- a/keyboards/gboards/ergotaco/matrix.c +++ b/keyboards/gboards/ergotaco/matrix.c @@ -17,15 +17,10 @@ along with this program. If not, see . */ #include "matrix.h" -#include -#include -#include #include "wait.h" -#include "action_layer.h" -#include "print.h" #include "debug.h" #include "util.h" -#include QMK_KEYBOARD_H +#include "ergotaco.h" #ifndef DEBOUNCE # define DEBOUNCE 5 diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h index e166ba37d2..a78ddc96ff 100644 --- a/keyboards/gboards/g/engine.h +++ b/keyboards/gboards/g/engine.h @@ -12,16 +12,10 @@ #pragma once -#include QMK_KEYBOARD_H +#include "quantum.h" #include -#include #include #include "config_engine.h" -#include -#include "wait.h" -#ifdef MOUSEKEY_ENABLE -# include "mousekey.h" -#endif // Set defaults #ifndef IN_CHORD_MASK diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c index 8866886ce7..dd95b593f1 100644 --- a/keyboards/gboards/georgi/georgi.c +++ b/keyboards/gboards/georgi/georgi.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "georgi.h" bool i2c_initialized = 0; i2c_status_t mcp23018_status = 0x20; diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c index 5ac696fd31..b66b1a194c 100644 --- a/keyboards/gboards/georgi/matrix.c +++ b/keyboards/gboards/georgi/matrix.c @@ -17,16 +17,10 @@ along with this program. If not, see . */ #include "matrix.h" -#include -#include -#include #include "wait.h" -#include "action_layer.h" -#include "print.h" #include "debug.h" #include "util.h" -#include "keymap_steno.h" -#include QMK_KEYBOARD_H +#include "georgi.h" #ifndef DEBOUNCE # define DEBOUNCE 5 diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h index 05d518efac..b5aa79893e 100644 --- a/keyboards/gboards/georgi/sten.h +++ b/keyboards/gboards/georgi/sten.h @@ -6,7 +6,7 @@ // Amen. #pragma once -#include QMK_KEYBOARD_H +#include "georgi.h" #include "mousekey.h" #include "keymap_steno.h" #include "wait.h" diff --git a/keyboards/gboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c index ba359f8145..da2a3007a8 100644 --- a/keyboards/gboards/gergo/gergo.c +++ b/keyboards/gboards/gergo/gergo.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H +#include "gergo.h" bool i2c_initialized = 0; i2c_status_t mcp23018_status = 0x20; diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c index c352be24e1..8a6b38bf73 100644 --- a/keyboards/gboards/gergo/matrix.c +++ b/keyboards/gboards/gergo/matrix.c @@ -17,16 +17,11 @@ along with this program. If not, see . */ #include "matrix.h" -#include -#include -#include #include "wait.h" -#include "action_layer.h" -#include "print.h" #include "debug.h" #include "util.h" #include "debounce.h" -#include QMK_KEYBOARD_H +#include "gergo.h" #ifdef BALLER #include -- cgit v1.2.3 From 1e07ff1fb108a305feca659b17ec03ba3e750455 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 24 Mar 2023 04:21:37 +1100 Subject: Fix some more missing `#pragma once`s (#20241) --- keyboards/gboards/engine/keymap_engine.h | 2 ++ keyboards/gboards/g/config_default.h | 2 ++ keyboards/gboards/g/keymap_combo.h | 2 ++ keyboards/gboards/g/keymap_engine.h | 3 +++ 4 files changed, 9 insertions(+) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/engine/keymap_engine.h b/keyboards/gboards/engine/keymap_engine.h index 599c1ca3e4..dfed493e21 100644 --- a/keyboards/gboards/engine/keymap_engine.h +++ b/keyboards/gboards/engine/keymap_engine.h @@ -7,6 +7,8 @@ * With this disgusting bodge, you can just edit your .defs and compile! */ +#pragma once + // Clear all X Macros #define PRES BLANK #define KEYS BLANK diff --git a/keyboards/gboards/g/config_default.h b/keyboards/gboards/g/config_default.h index 821c2c4ad5..56dd634d13 100644 --- a/keyboards/gboards/g/config_default.h +++ b/keyboards/gboards/g/config_default.h @@ -1,3 +1,5 @@ +#pragma once + #include "engine.h" // Configuration options for the engine diff --git a/keyboards/gboards/g/keymap_combo.h b/keyboards/gboards/g/keymap_combo.h index 68ea44b1b4..c062a298a5 100644 --- a/keyboards/gboards/g/keymap_combo.h +++ b/keyboards/gboards/g/keymap_combo.h @@ -1,3 +1,5 @@ +#pragma once + // Keymap helpers // define reference layers per layer. #define REF_LAYER_FOR_LAYER(LAYER, REF_LAYER) \ diff --git a/keyboards/gboards/g/keymap_engine.h b/keyboards/gboards/g/keymap_engine.h index 055b5941e4..e134472da0 100644 --- a/keyboards/gboards/g/keymap_engine.h +++ b/keyboards/gboards/g/keymap_engine.h @@ -6,6 +6,9 @@ * using a external generator (Like is done for the ASETNIOP base keymaps) * With this disgusting bodge, you can just edit your .defs and compile! */ + +#pragma once + #include "g/engine.h" // Clear all X Macros -- 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/gboards/gergoplex/gergoplex.h | 18 -------- keyboards/gboards/gergoplex/info.json | 76 +++++++++++++++++---------------- 2 files changed, 40 insertions(+), 54 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/gergoplex/gergoplex.h b/keyboards/gboards/gergoplex/gergoplex.h index eda21d2a94..549228104a 100644 --- a/keyboards/gboards/gergoplex/gergoplex.h +++ b/keyboards/gboards/gergoplex/gergoplex.h @@ -35,21 +35,3 @@ extern i2c_status_t mcp23018_status; #define OLATA 0x14 // output latch register uint8_t init_mcp23018(void); - -#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, \ - L30, L31, L32, R30, R31, R32 \ -) { \ - { L04, L14, L24, XXX }, \ - { L03, L13, L23, L32 }, \ - { L02, L12, L22, L31 }, \ - { L01, L11, L21, L30 }, \ - { L00, L10, L20, XXX }, \ - { R00, R10, R20, XXX }, \ - { R01, R11, R21, R30 }, \ - { R02, R12, R22, R31 }, \ - { R03, R13, R23, R32 }, \ - { R04, R14, R24, XXX } \ -} diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json index 914832aacf..061f8ff869 100644 --- a/keyboards/gboards/gergoplex/info.json +++ b/keyboards/gboards/gergoplex/info.json @@ -14,45 +14,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"label":"L00", "x":0, "y":0.25}, - {"label":"L01", "x":1, "y":0.125}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0.125}, - {"label":"L04", "x":4, "y":0.375}, - {"label":"R00", "x":8, "y":0.375}, - {"label":"R01", "x":9, "y":0.125}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0.125}, - {"label":"R04", "x":12, "y":0.25}, + {"matrix": [4, 0], "x": 0, "y": 0.25}, + {"matrix": [3, 0], "x": 1, "y": 0.125}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 3, "y": 0.125}, + {"matrix": [0, 0], "x": 4, "y": 0.375}, - {"label":"L10", "x":0, "y":1.25}, - {"label":"L11", "x":1, "y":1.125}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1.125}, - {"label":"L14", "x":4, "y":1.375}, - {"label":"R10", "x":8, "y":1.375}, - {"label":"R11", "x":9, "y":1.125}, - {"label":"R12", "x":10, "y":1}, - {"label":"R13", "x":11, "y":1.125}, - {"label":"R14", "x":12, "y":1.25}, + {"matrix": [5, 0], "x": 8, "y": 0.375}, + {"matrix": [6, 0], "x": 9, "y": 0.125}, + {"matrix": [7, 0], "x": 10, "y": 0}, + {"matrix": [8, 0], "x": 11, "y": 0.125}, + {"matrix": [9, 0], "x": 12, "y": 0.25}, - {"label":"L20", "x":0, "y":2.25}, - {"label":"L21", "x":1, "y":2.125}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2.125}, - {"label":"L24", "x":4, "y":2.375}, - {"label":"R20", "x":8, "y":2.375}, - {"label":"R21", "x":9, "y":2.125}, - {"label":"R22", "x":10, "y":2}, - {"label":"R23", "x":11, "y":2.125}, - {"label":"R24", "x":12, "y":2.25}, + {"matrix": [4, 1], "x": 0, "y": 1.25}, + {"matrix": [3, 1], "x": 1, "y": 1.125}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [1, 1], "x": 3, "y": 1.125}, + {"matrix": [0, 1], "x": 4, "y": 1.375}, - {"label":"L30", "x":2, "y":3.5}, - {"label":"L31", "x":3.25, "y":3.625, "w":1.5}, - {"label":"L32", "x":5, "y":3.125, "h":2}, - {"label":"R30", "x":7, "y":3.125, "h":2}, - {"label":"R31", "x":8.25, "y":3.625, "w":1.5}, - {"label":"R32", "x":10, "y":3.5} + {"matrix": [5, 1], "x": 8, "y": 1.375}, + {"matrix": [6, 1], "x": 9, "y": 1.125}, + {"matrix": [7, 1], "x": 10, "y": 1}, + {"matrix": [8, 1], "x": 11, "y": 1.125}, + {"matrix": [9, 1], "x": 12, "y": 1.25}, + + {"matrix": [4, 2], "x": 0, "y": 2.25}, + {"matrix": [3, 2], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [1, 2], "x": 3, "y": 2.125}, + {"matrix": [0, 2], "x": 4, "y": 2.375}, + + {"matrix": [5, 2], "x": 8, "y": 2.375}, + {"matrix": [6, 2], "x": 9, "y": 2.125}, + {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [8, 2], "x": 11, "y": 2.125}, + {"matrix": [9, 2], "x": 12, "y": 2.25}, + + {"matrix": [3, 3], "x": 2, "y": 3.5}, + {"matrix": [2, 3], "x": 3.25, "y": 3.625, "w": 1.5}, + {"matrix": [1, 3], "x": 5, "y": 3.125, "h": 2}, + + {"matrix": [6, 3], "x": 7, "y": 3.125, "h": 2}, + {"matrix": [7, 3], "x": 8.25, "y": 3.625, "w": 1.5}, + {"matrix": [8, 3], "x": 10, "y": 3.5} ] } } -- 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/gboards/ergotaco/config.h | 1 - keyboards/gboards/georgi/config.h | 2 -- keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c | 1 - keyboards/gboards/gergo/config.h | 1 - keyboards/gboards/gergo/keymaps/abstractkb/config.h | 2 -- keyboards/gboards/gergo/keymaps/colemak/keymap.c | 1 - keyboards/gboards/gergo/keymaps/default/config.h | 1 - keyboards/gboards/gergo/keymaps/germ/config.h | 1 - keyboards/gboards/gergo/keymaps/gotham/config.h | 1 - keyboards/gboards/gergo/keymaps/oled/config.h | 1 - keyboards/gboards/gergoplex/config.h | 1 - 11 files changed, 13 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h index 3274a5ab92..ba0078e71b 100644 --- a/keyboards/gboards/ergotaco/config.h +++ b/keyboards/gboards/ergotaco/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index 858f99208f..3e090f9e57 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define FORCE_NKRO #define NO_ACTION_ONESHOT -#define IGNORE_MOD_TAP_INTERRUPT /* key matrix size */ #define MATRIX_ROWS 14 @@ -42,7 +41,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c index bb6ed9dd3e..9b3365d02f 100644 --- a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c +++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c @@ -13,7 +13,6 @@ #include QMK_KEYBOARD_H #include "sten.h" #include "keymap_steno.h" -#define IGNORE_MOD_TAP_INTERRUPT // Steno Layers #define FUNCT ( LSD | LK | LP | LH ) diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h index 2eda942c15..37d4fe8499 100644 --- a/keyboards/gboards/gergo/config.h +++ b/keyboards/gboards/gergo/config.h @@ -44,7 +44,6 @@ along with this program. If not, see . #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/gboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h index bc7b9f7845..d3c17757c8 100644 --- a/keyboards/gboards/gergo/keymaps/abstractkb/config.h +++ b/keyboards/gboards/gergo/keymaps/abstractkb/config.h @@ -1,6 +1,4 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT - #undef DEBOUNCE #define DEBOUNCE 10 diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c index b72e81f6d7..39bafc5e31 100644 --- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c +++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c @@ -8,7 +8,6 @@ #include QMK_KEYBOARD_H -#define IGNORE_MOD_TAP_INTERRUPT #define BASE 0 // default layer #define SYMB 1 // symbols #define NUMB 2 // numbers/motion diff --git a/keyboards/gboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h index 6393d46f14..3f59c932d3 100644 --- a/keyboards/gboards/gergo/keymaps/default/config.h +++ b/keyboards/gboards/gergo/keymaps/default/config.h @@ -1,3 +1,2 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/gboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h index 6393d46f14..3f59c932d3 100644 --- a/keyboards/gboards/gergo/keymaps/germ/config.h +++ b/keyboards/gboards/gergo/keymaps/germ/config.h @@ -1,3 +1,2 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/gboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h index 6393d46f14..3f59c932d3 100644 --- a/keyboards/gboards/gergo/keymaps/gotham/config.h +++ b/keyboards/gboards/gergo/keymaps/gotham/config.h @@ -1,3 +1,2 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/gboards/gergo/keymaps/oled/config.h b/keyboards/gboards/gergo/keymaps/oled/config.h index af960a1eed..327e03d56d 100644 --- a/keyboards/gboards/gergo/keymaps/oled/config.h +++ b/keyboards/gboards/gergo/keymaps/oled/config.h @@ -1,4 +1,3 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define OLED_FONT_H "keyboards/gboards/gergo/keymaps/oled/glcdfont.c" diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h index d733cb3b7a..e6ef1def9e 100644 --- a/keyboards/gboards/gergoplex/config.h +++ b/keyboards/gboards/gergoplex/config.h @@ -34,6 +34,5 @@ along with this program. If not, see . */ #define MATRIX_COL_PINS { F6, F5, F4, F1 } #define MATRIX_ROW_PINS { B1, B2, B3, D2, D3 } -#define IGNORE_MOD_TAP_INTERRUPT #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) -- cgit v1.2.3 From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:46:59 +1000 Subject: Move small macropad-ish layouts to data driven (#20341) --- keyboards/gboards/ergotaco/ergotaco.h | 20 -------------------- keyboards/gboards/ergotaco/info.json | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 32 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h index 5a0cd5e8fb..e23fc264f4 100644 --- a/keyboards/gboards/ergotaco/ergotaco.h +++ b/keyboards/gboards/ergotaco/ergotaco.h @@ -26,23 +26,3 @@ extern i2c_status_t mcp23018_status; void init_ergodox(void); uint8_t init_mcp23018(void); - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ -#define LAYOUT( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05) \ - \ - /* matrix positions */ \ - { \ - {R00}, \ - {R01}, \ - {R02}, \ - {R03}, \ - {R04}, \ - {R05}, \ - {L05}, \ - {L04}, \ - {L03}, \ - {L02}, \ - {L01}, \ - {L00}, \ -} diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index 8414985841..1de1f3ab85 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -13,19 +13,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 1}, - {"x": 1, "y": 0.5}, - {"x": 2, "y": 0.25}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.75}, - {"x": 5, "y": 1.5}, + {"matrix": [11, 0], "x": 0, "y": 1}, + {"matrix": [10, 0], "x": 1, "y": 0.5}, + {"matrix": [9, 0], "x": 2, "y": 0.25}, + {"matrix": [8, 0], "x": 3, "y": 0}, + {"matrix": [7, 0], "x": 4, "y": 0.75}, + {"matrix": [6, 0], "x": 5, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 0.75}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.25}, - {"x": 11, "y": 0.5}, - {"x": 12, "y": 1} + {"matrix": [0, 0], "x": 7, "y": 1.5}, + {"matrix": [1, 0], "x": 8, "y": 0.75}, + {"matrix": [2, 0], "x": 9, "y": 0}, + {"matrix": [3, 0], "x": 10, "y": 0.25}, + {"matrix": [4, 0], "x": 11, "y": 0.5}, + {"matrix": [5, 0], "x": 12, "y": 1} ] } } -- 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/gboards/georgi/georgi.h | 52 ------ keyboards/gboards/georgi/info.json | 60 +++---- keyboards/gboards/gergo/gergo.h | 25 --- keyboards/gboards/gergo/info.json | 321 +++++++------------------------------ 4 files changed, 87 insertions(+), 371 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h index 47fb1831c8..e23fc264f4 100644 --- a/keyboards/gboards/georgi/georgi.h +++ b/keyboards/gboards/georgi/georgi.h @@ -26,55 +26,3 @@ extern i2c_status_t mcp23018_status; void init_ergodox(void); uint8_t init_mcp23018(void); - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ -#define LAYOUT( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \ - L10,L11,L12,L13,L14,L15, R10,R11,R12,R13,R14,R15, \ - L20,L21,L22, R20,R21,R22) \ - \ - { \ - { KC_NO, R00, R10, R21}, \ - { KC_NO, R01, R11, R20}, \ - { KC_NO, R02, R12, R22}, \ - { KC_NO, R03, R13, KC_NO}, \ - { KC_NO, R04, R14, KC_NO}, \ - { KC_NO, R05, R15, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, KC_NO}, \ - \ - { KC_NO, L05, L15, L22}, \ - { KC_NO, L04, L14, L21}, \ - { KC_NO, L03, L13, L20}, \ - { KC_NO, L02, L12, KC_NO}, \ - { KC_NO, L01, L11, KC_NO}, \ - { KC_NO, L00, L10, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, KC_NO}, \ - \ -} - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- -#define LAYOUT_GERGO( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \ - L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ - L20,L21,L22,L23,L24,L25,L26, R20,R21,R22,R23,R24,R25,R26, \ - L31,L32, R33,R34, \ - L30, R30, \ - L33,L34, R31,R32) \ - \ - { \ - { KC_NO, L16, L26, L30}, \ - { L05, L15, L25, L34}, \ - { L04, L14, L24, L33}, \ - { L03, L13, L23, L32}, \ - { L02, L12, L22, L31}, \ - { L01, L11, L21, KC_NO}, \ - { L00, L10, L20, KC_NO}, \ - \ - { KC_NO, R10, R20, R30}, \ - { R00, R11, R21, R31}, \ - { R01, R12, R22, R32}, \ - { R02, R13, R23, R33}, \ - { R03, R14, R24, R34}, \ - { R04, R15, R25, KC_NO}, \ - { R05, R16, R26, KC_NO}, \ -} */ diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 3f1c69b7f5..7ede9d1f43 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -16,41 +16,41 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.5}, - {"x": 1, "y": 0.5}, - {"x": 2, "y": 0.3}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.4}, - {"x": 5, "y": 0.5}, + {"matrix": [12, 1], "x": 0, "y": 0.5}, + {"matrix": [11, 1], "x": 1, "y": 0.5}, + {"matrix": [10, 1], "x": 2, "y": 0.3}, + {"matrix": [9, 1], "x": 3, "y": 0}, + {"matrix": [8, 1], "x": 4, "y": 0.4}, + {"matrix": [7, 1], "x": 5, "y": 0.5}, - {"x": 7, "y": 0.5}, - {"x": 8, "y": 0.4}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.3}, - {"x": 11, "y": 0.5}, - {"x": 12, "y": 0.5}, + {"matrix": [0, 1], "x": 7, "y": 0.5}, + {"matrix": [1, 1], "x": 8, "y": 0.4}, + {"matrix": [2, 1], "x": 9, "y": 0}, + {"matrix": [3, 1], "x": 10, "y": 0.3}, + {"matrix": [4, 1], "x": 11, "y": 0.5}, + {"matrix": [5, 1], "x": 12, "y": 0.5}, - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.3}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.4}, - {"x": 5, "y": 1.5}, + {"matrix": [12, 2], "x": 0, "y": 1.5}, + {"matrix": [11, 2], "x": 1, "y": 1.5}, + {"matrix": [10, 2], "x": 2, "y": 1.3}, + {"matrix": [9, 2], "x": 3, "y": 1}, + {"matrix": [8, 2], "x": 4, "y": 1.4}, + {"matrix": [7, 2], "x": 5, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.4}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.3}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, + {"matrix": [0, 2], "x": 7, "y": 1.5}, + {"matrix": [1, 2], "x": 8, "y": 1.4}, + {"matrix": [2, 2], "x": 9, "y": 1}, + {"matrix": [3, 2], "x": 10, "y": 1.3}, + {"matrix": [4, 2], "x": 11, "y": 1.5}, + {"matrix": [5, 2], "x": 12, "y": 1.5}, - {"x": 3, "y": 2.75}, - {"x": 4, "y": 2.75}, - {"x": 5, "y": 2.75}, + {"matrix": [9, 3], "x": 3, "y": 2.75}, + {"matrix": [8, 3], "x": 4, "y": 2.75}, + {"matrix": [7, 3], "x": 5, "y": 2.75}, - {"x": 7, "y": 2.75}, - {"x": 8, "y": 2.75}, - {"x": 9, "y": 2.75} + {"matrix": [1, 3], "x": 7, "y": 2.75}, + {"matrix": [0, 3], "x": 8, "y": 2.75}, + {"matrix": [2, 3], "x": 9, "y": 2.75} ] } } diff --git a/keyboards/gboards/gergo/gergo.h b/keyboards/gboards/gergo/gergo.h index 9044b374e3..ea6368e2f1 100644 --- a/keyboards/gboards/gergo/gergo.h +++ b/keyboards/gboards/gergo/gergo.h @@ -25,28 +25,3 @@ extern i2c_status_t mcp23018_status; #define OLATB 0x15 uint8_t init_mcp23018(void); - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ -#define LAYOUT( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \ - L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ - L20,L21,L22,L23,L24,L25,L26,L30, R30,R20,R21,R22,R23,R24,R25,R26, \ - L31,L32,L33,L34, R31,R32,R33,R34) \ - /* matrix positions */ \ - { \ - { KC_NO, L16, L26, L30}, \ - { L05, L15, L25, L34}, \ - { L04, L14, L24, L33}, \ - { L03, L13, L23, L32}, \ - { L02, L12, L22, L31}, \ - { L01, L11, L21, KC_NO}, \ - { L00, L10, L20, KC_NO}, \ - \ - { KC_NO, R10, R20, R30}, \ - { R00, R11, R21, R31}, \ - { R01, R12, R22, R32}, \ - { R02, R13, R23, R33}, \ - { R03, R14, R24, R34}, \ - { R04, R15, R25, KC_NO}, \ - { R05, R16, R26, KC_NO}, \ -} diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index 5aadadbaed..53711cb271 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -19,270 +19,63 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "L00", - "w": 1.5, - "x": 0, - "y": 0.38 - }, - { - "label": "L01", - "x": 1.5, - "y": 0.38 - }, - { - "label": "L02", - "x": 2.5, - "y": 0.13 - }, - { - "label": "L03", - "x": 3.5, - "y": 0 - }, - { - "label": "L04", - "x": 4.5, - "y": 0.13 - }, - { - "label": "L05", - "x": 5.5, - "y": 0.25 - }, - { - "label": "R00", - "x": 13, - "y": 0.25 - }, - { - "label": "R01", - "x": 14, - "y": 0.13 - }, - { - "label": "R02", - "x": 15, - "y": 0 - }, - { - "label": "R03", - "x": 16, - "y": 0.13 - }, - { - "label": "R04", - "x": 17, - "y": 0.38 - }, - { - "label": "R05", - "w": 1.5, - "x": 18, - "y": 0.38 - }, - { - "label": "L10", - "w": 1.5, - "x": 0, - "y": 1.3800000000000001 - }, - { - "label": "L11", - "x": 1.5, - "y": 1.3800000000000001 - }, - { - "label": "L12", - "x": 2.5, - "y": 1.1300000000000001 - }, - { - "label": "L13", - "x": 3.5, - "y": 1 - }, - { - "label": "L14", - "x": 4.5, - "y": 1.1300000000000001 - }, - { - "label": "L15", - "x": 5.5, - "y": 1.25 - }, - { - "h": 1.5, - "label": "L16", - "x": 6.5, - "y": 0.25 - }, - { - "h": 1.5, - "label": "R10", - "x": 12, - "y": 0.25 - }, - { - "label": "R11", - "x": 13, - "y": 1.25 - }, - { - "label": "R12", - "x": 14, - "y": 1.1300000000000001 - }, - { - "label": "R13", - "x": 15, - "y": 1 - }, - { - "label": "R14", - "x": 16, - "y": 1.1300000000000001 - }, - { - "label": "R15", - "x": 17, - "y": 1.3800000000000001 - }, - { - "label": "R16", - "w": 1.5, - "x": 18, - "y": 1.3800000000000001 - }, - { - "label": "L20", - "w": 1.5, - "x": 0, - "y": 2.38 - }, - { - "label": "L21", - "x": 1.5, - "y": 2.38 - }, - { - "label": "L22", - "x": 2.5, - "y": 2.13 - }, - { - "label": "L23", - "x": 3.5, - "y": 2 - }, - { - "label": "L24", - "x": 4.5, - "y": 2.13 - }, - { - "label": "L25", - "x": 5.5, - "y": 2.25 - }, - { - "h": 1.5, - "label": "L26", - "x": 6.5, - "y": 1.75 - }, - { - "label": "L30", - "x": 8.25, - "y": 2.75 - }, - { - "label": "R30", - "x": 10.25, - "y": 2.75 - }, - { - "h": 1.5, - "label": "R20", - "x": 12, - "y": 1.75 - }, - { - "label": "R21", - "x": 13, - "y": 2.25 - }, - { - "label": "R22", - "x": 14, - "y": 2.13 - }, - { - "label": "R23", - "x": 15, - "y": 2 - }, - { - "label": "R24", - "x": 16, - "y": 2.13 - }, - { - "label": "R25", - "x": 17, - "y": 2.38 - }, - { - "label": "R26", - "w": 1.5, - "x": 18, - "y": 2.38 - }, - { - "label": "L31", - "x": 4.75, - "y": 3.25 - }, - { - "label": "L32", - "x": 6, - "y": 3.63 - }, - { - "h": 2, - "label": "L33", - "x": 7.25, - "y": 3.75 - }, - { - "h": 2, - "label": "L34", - "x": 8.25, - "y": 3.75 - }, - { - "h": 2, - "label": "R31", - "x": 10.25, - "y": 3.75 - }, - { - "h": 2, - "label": "R32", - "x": 11.25, - "y": 3.75 - }, - { - "label": "R33", - "x": 12.5, - "y": 3.63 - }, - { - "label": "R34", - "x": 13.75, - "y": 3.25 - } + {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 0.38}, + {"matrix": [4, 0], "x": 2.5, "y": 0.13}, + {"matrix": [3, 0], "x": 3.5, "y": 0}, + {"matrix": [2, 0], "x": 4.5, "y": 0.13}, + {"matrix": [1, 0], "x": 5.5, "y": 0.25}, + + {"matrix": [8, 0], "x": 13, "y": 0.25}, + {"matrix": [9, 0], "x": 14, "y": 0.13}, + {"matrix": [10, 0], "x": 15, "y": 0}, + {"matrix": [11, 0], "x": 16, "y": 0.13}, + {"matrix": [12, 0], "x": 17, "y": 0.38}, + {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5}, + + {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 1.38}, + {"matrix": [4, 1], "x": 2.5, "y": 1.13}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 1], "x": 4.5, "y": 1.13}, + {"matrix": [1, 1], "x": 5.5, "y": 1.25}, + {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5}, + + {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5}, + {"matrix": [8, 1], "x": 13, "y": 1.25}, + {"matrix": [9, 1], "x": 14, "y": 1.13}, + {"matrix": [10, 1], "x": 15, "y": 1}, + {"matrix": [11, 1], "x": 16, "y": 1.13}, + {"matrix": [12, 1], "x": 17, "y": 1.38}, + {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5}, + + {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5}, + {"matrix": [5, 2], "x": 1.5, "y": 2.38}, + {"matrix": [4, 2], "x": 2.5, "y": 2.13}, + {"matrix": [3, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2.13}, + {"matrix": [1, 2], "x": 5.5, "y": 2.25}, + {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5}, + {"matrix": [0, 3], "x": 8.25, "y": 2.75}, + + {"matrix": [7, 3], "x": 10.25, "y": 2.75}, + {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5}, + {"matrix": [8, 2], "x": 13, "y": 2.25}, + {"matrix": [9, 2], "x": 14, "y": 2.13}, + {"matrix": [10, 2], "x": 15, "y": 2}, + {"matrix": [11, 2], "x": 16, "y": 2.13}, + {"matrix": [12, 2], "x": 17, "y": 2.38}, + {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5}, + + {"matrix": [4, 3], "x": 4.75, "y": 3.25}, + {"matrix": [3, 3], "x": 6, "y": 3.63}, + {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2}, + {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2}, + + {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2}, + {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2}, + {"matrix": [10, 3], "x": 12.5, "y": 3.63}, + {"matrix": [11, 3], "x": 13.75, "y": 3.25} ] } } -- cgit v1.2.3 From 54634e92634f73a6d9111833adf58214cb4278c3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 14 Apr 2023 19:42:50 +1000 Subject: Fix some missing QMK_KEYBOARD_H includes in user keymaps (#20417) --- keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c index 19b5f122ca..4303ef4165 100644 --- a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c @@ -3,7 +3,7 @@ * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md */ -#include "gergoplex.h" +#include QMK_KEYBOARD_H #include "g/keymap_combo.h" enum { -- cgit v1.2.3 From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/gboards/butterstick/butterstick.c | 2 +- keyboards/gboards/butterstick/butterstick.h | 11 -------- keyboards/gboards/butterstick/info.json | 40 ++++++++++++++--------------- keyboards/gboards/butterstick/sten.h | 2 +- 4 files changed, 22 insertions(+), 33 deletions(-) delete mode 100644 keyboards/gboards/butterstick/butterstick.h (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c index 3bcbcbe8b4..e19edc69ac 100644 --- a/keyboards/gboards/butterstick/butterstick.c +++ b/keyboards/gboards/butterstick/butterstick.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "butterstick.h" +#include "quantum.h" void matrix_scan_kb(void) { #ifdef DEBUG_MATRIX diff --git a/keyboards/gboards/butterstick/butterstick.h b/keyboards/gboards/butterstick/butterstick.h deleted file mode 100644 index f97488c3f5..0000000000 --- a/keyboards/gboards/butterstick/butterstick.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_butter( \ - k09, k08, k07, k06, k05, k04, k03, k02, k01, k00, \ - k19, k18, k17, k16, k15, k14, k13, k12, k11, k10 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \ -} diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index 465cd940a1..d2fc3d3f40 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -18,27 +18,27 @@ "layouts": { "LAYOUT_butter": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, + {"matrix": [0, 9], "x": 0, "y": 0}, + {"matrix": [0, 8], "x": 1, "y": 0}, + {"matrix": [0, 7], "x": 2, "y": 0}, + {"matrix": [0, 6], "x": 3, "y": 0}, + {"matrix": [0, 5], "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1} + {"matrix": [1, 9], "x": 0, "y": 1}, + {"matrix": [1, 8], "x": 1, "y": 1}, + {"matrix": [1, 7], "x": 2, "y": 1}, + {"matrix": [1, 6], "x": 3, "y": 1}, + {"matrix": [1, 5], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 3], "x": 6, "y": 1}, + {"matrix": [1, 2], "x": 7, "y": 1}, + {"matrix": [1, 1], "x": 8, "y": 1}, + {"matrix": [1, 0], "x": 9, "y": 1} ] } } diff --git a/keyboards/gboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h index 39740ac3d3..84c54c9e2e 100644 --- a/keyboards/gboards/butterstick/sten.h +++ b/keyboards/gboards/butterstick/sten.h @@ -7,7 +7,7 @@ #pragma once -#include "butterstick.h" +#include QMK_KEYBOARD_H #include "mousekey.h" #include "keymap_steno.h" #include "wait.h" -- cgit v1.2.3 From 12d42cedd2624db0d5cfe6f538211f9dfcd19822 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 13:33:10 +1000 Subject: Move `FORCE_NKRO` to data driven (#20604) --- keyboards/gboards/butterstick/config.h | 2 -- keyboards/gboards/butterstick/info.json | 3 ++- keyboards/gboards/georgi/config.h | 1 - keyboards/gboards/georgi/info.json | 3 ++- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h index a3516ccedb..a89e672aea 100644 --- a/keyboards/gboards/butterstick/config.h +++ b/keyboards/gboards/butterstick/config.h @@ -2,5 +2,3 @@ #define VERSION "Paula Deen" - -#define FORCE_NKRO diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json index d2fc3d3f40..1695ca0e23 100644 --- a/keyboards/gboards/butterstick/info.json +++ b/keyboards/gboards/butterstick/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x1337", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "C6", "C7"], diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index 3e090f9e57..99bdd06bb5 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define VERSION "v1.1: ClayM" #define VERBOSE -#define FORCE_NKRO #define NO_ACTION_ONESHOT /* key matrix size */ diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 7ede9d1f43..0a654eaa4a 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x1337", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", -- cgit v1.2.3 From 2944e938703e2049bb6262a0ab31e701d27e8ab3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 17:37:12 +1000 Subject: Move `USB_MAX_POWER_CONSUMPTION` to data driven (#20648) --- keyboards/gboards/ergotaco/config.h | 2 -- keyboards/gboards/georgi/config.h | 2 -- keyboards/gboards/gergo/config.h | 2 -- 3 files changed, 6 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h index ba0078e71b..456eb3f9d9 100644 --- a/keyboards/gboards/ergotaco/config.h +++ b/keyboards/gboards/ergotaco/config.h @@ -43,5 +43,3 @@ along with this program. If not, see . /* key combination for command */ #define IS_COMMAND() (get_mods() == MOD_MASK_CTRL || get_mods() == MOD_MASK_SHIFT) - -#define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h index 99bdd06bb5..db2ff42a1e 100644 --- a/keyboards/gboards/georgi/config.h +++ b/keyboards/gboards/georgi/config.h @@ -51,5 +51,3 @@ along with this program. If not, see . get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) - -#define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h index 37d4fe8499..dbff6ccf6f 100644 --- a/keyboards/gboards/gergo/config.h +++ b/keyboards/gboards/gergo/config.h @@ -55,5 +55,3 @@ along with this program. If not, see . get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) - -#define USB_MAX_POWER_CONSUMPTION 500 -- 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/gboards/g/keymap_combo.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/gboards') diff --git a/keyboards/gboards/g/keymap_combo.h b/keyboards/gboards/g/keymap_combo.h index c062a298a5..33520d18af 100644 --- a/keyboards/gboards/g/keymap_combo.h +++ b/keyboards/gboards/g/keymap_combo.h @@ -41,10 +41,7 @@ #define TOGG A_ENUM enum combos { #include "combos.def" - COMBO_LENGTH }; -// Export length to combo module -uint16_t COMBO_LEN = COMBO_LENGTH; // Bake combos into mem #undef COMB -- cgit v1.2.3