From 716969a01a5a2a6d48bfb4d8595bf85092b7244b Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 22 Oct 2022 16:07:31 -0700 Subject: [PATCH] Macro3: rename LAYOUT to LAYOUT_ortho_2x4 (#18820) --- keyboards/macro3/info.json | 5 ++++- keyboards/macro3/keymaps/default/keymap.c | 4 ++-- keyboards/macro3/macro3.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json index f3ebdb8acd..b95ab110f3 100644 --- a/keyboards/macro3/info.json +++ b/keyboards/macro3/info.json @@ -8,8 +8,11 @@ "pid": "0x3388", "device_version": "0.0.3" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_2x4" + }, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_2x4": { "layout": [ {"x": 0, "y": 0}, {"x": 1, "y": 0}, diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/macro3/keymaps/default/keymap.c index 8881612a3f..50cafe9d0f 100644 --- a/keyboards/macro3/keymaps/default/keymap.c +++ b/keyboards/macro3/keymaps/default/keymap.c @@ -6,11 +6,11 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_2x4( KC_MUTE, KC_MPLY, KC_MRWD, LT(1,KC_MFFD), C(KC_Z), C(KC_X), C(KC_C), C(KC_V) ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_2x4( _______, _______, _______, _______, QK_BOOT, _______, _______, _______ ) diff --git a/keyboards/macro3/macro3.h b/keyboards/macro3/macro3.h index d95f504083..4a5071cbfe 100644 --- a/keyboards/macro3/macro3.h +++ b/keyboards/macro3/macro3.h @@ -5,7 +5,7 @@ #include "quantum.h" -#define LAYOUT( \ +#define LAYOUT_ortho_2x4( \ K00, K01, K02, K03, \ K10, K11, K12, K13 \ ) \