From 5a631ed9ac23b58b1e58ba169e58d443ba5fad87 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:21:59 -0700 Subject: [PATCH] Balloondogcaps TR90 and TR90PM: rename LAYOUT to LAYOUT_ortho_3x3 (#17879) * balloondogcaps/tr90: rename LAYOUT to LAYOUT_ortho_3x3 * balloondogcaps/tr90pm: rename LAYOUT to LAYOUT_ortho_3x3 --- keyboards/balloondogcaps/tr90/info.json | 5 ++++- keyboards/balloondogcaps/tr90/keymaps/default/keymap.c | 4 ++-- keyboards/balloondogcaps/tr90/keymaps/via/keymap.c | 8 ++++---- keyboards/balloondogcaps/tr90pm/info.json | 5 ++++- keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c | 4 ++-- keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c | 8 ++++---- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/keyboards/balloondogcaps/tr90/info.json b/keyboards/balloondogcaps/tr90/info.json index c17cafaebf..c4b8c265a0 100644 --- a/keyboards/balloondogcaps/tr90/info.json +++ b/keyboards/balloondogcaps/tr90/info.json @@ -23,8 +23,11 @@ "pid": "0x0001", "vid": "0x4243" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_3x3" + }, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_3x3": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, diff --git a/keyboards/balloondogcaps/tr90/keymaps/default/keymap.c b/keyboards/balloondogcaps/tr90/keymaps/default/keymap.c index 793212e002..ddb34dfc5f 100644 --- a/keyboards/balloondogcaps/tr90/keymaps/default/keymap.c +++ b/keyboards/balloondogcaps/tr90/keymaps/default/keymap.c @@ -16,12 +16,12 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ + [0] = LAYOUT_ortho_3x3( /* Base */ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_VOLD, KC_VOLU, MO(1) ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_3x3( KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_PLUS, RESET, KC_AT , KC_TRNS diff --git a/keyboards/balloondogcaps/tr90/keymaps/via/keymap.c b/keyboards/balloondogcaps/tr90/keymaps/via/keymap.c index efe6eefa77..55fd22cc0d 100644 --- a/keyboards/balloondogcaps/tr90/keymaps/via/keymap.c +++ b/keyboards/balloondogcaps/tr90/keymaps/via/keymap.c @@ -16,22 +16,22 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ + [0] = LAYOUT_ortho_3x3( /* Base */ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_VOLD, KC_VOLU, MO(1) ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_3x3( KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_PLUS, RESET, KC_AT , KC_TRNS ), - [2] = LAYOUT( + [2] = LAYOUT_ortho_3x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT( + [3] = LAYOUT_ortho_3x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/balloondogcaps/tr90pm/info.json b/keyboards/balloondogcaps/tr90pm/info.json index d028b4a3cd..c04fef7840 100644 --- a/keyboards/balloondogcaps/tr90pm/info.json +++ b/keyboards/balloondogcaps/tr90pm/info.json @@ -23,8 +23,11 @@ "pid": "0x0002", "vid": "0x4243" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_3x3" + }, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_3x3": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, diff --git a/keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c b/keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c index 793212e002..ddb34dfc5f 100644 --- a/keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c +++ b/keyboards/balloondogcaps/tr90pm/keymaps/default/keymap.c @@ -16,12 +16,12 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ + [0] = LAYOUT_ortho_3x3( /* Base */ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_VOLD, KC_VOLU, MO(1) ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_3x3( KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_PLUS, RESET, KC_AT , KC_TRNS diff --git a/keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c b/keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c index efe6eefa77..55fd22cc0d 100644 --- a/keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c +++ b/keyboards/balloondogcaps/tr90pm/keymaps/via/keymap.c @@ -16,22 +16,22 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( /* Base */ + [0] = LAYOUT_ortho_3x3( /* Base */ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_VOLD, KC_VOLU, MO(1) ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_3x3( KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_PLUS, RESET, KC_AT , KC_TRNS ), - [2] = LAYOUT( + [2] = LAYOUT_ortho_3x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT( + [3] = LAYOUT_ortho_3x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS