From 891780b17f0dcf86624cadc18fb0fbeb2ee418d8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 20 Jan 2023 01:59:46 +0000 Subject: Refactor some layouts which contain keyboard name (#19642) --- keyboards/reviung/reviung5/info.json | 5 ++++- keyboards/reviung/reviung5/keymaps/default/keymap.c | 4 ++-- keyboards/reviung/reviung5/keymaps/default_lre/keymap.c | 4 ++-- keyboards/reviung/reviung5/keymaps/default_rre/keymap.c | 4 ++-- keyboards/reviung/reviung5/reviung5.h | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) (limited to 'keyboards/reviung/reviung5') diff --git a/keyboards/reviung/reviung5/info.json b/keyboards/reviung/reviung5/info.json index 12320d7774..d804be4a86 100644 --- a/keyboards/reviung/reviung5/info.json +++ b/keyboards/reviung/reviung5/info.json @@ -8,8 +8,11 @@ "pid": "0x4F0D", "device_version": "0.0.1" }, + "layout_aliases": { + "LAYOUT_reviung5": "LAYOUT" + }, "layouts": { - "LAYOUT_reviung5": { + "LAYOUT": { "layout": [ {"label": "k00", "x": 0, "y": 0}, {"label": "k01", "x": 1, "y": 0.25}, diff --git a/keyboards/reviung/reviung5/keymaps/default/keymap.c b/keyboards/reviung/reviung5/keymaps/default/keymap.c index 39f6669a52..9372ba20b5 100644 --- a/keyboards/reviung/reviung5/keymaps/default/keymap.c +++ b/keyboards/reviung/reviung5/keymaps/default/keymap.c @@ -25,10 +25,10 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT_reviung5( + [_BASE] = LAYOUT( LO_VD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU ), - [_LOWER] = LAYOUT_reviung5( + [_LOWER] = LAYOUT( _______, RGB_HUI, RGB_MOD, RGB_TOG, KC_MUTE ) }; diff --git a/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c b/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c index 2e732e72fe..1d4b07c645 100644 --- a/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c +++ b/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c @@ -23,10 +23,10 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT_reviung5( + [_BASE] = LAYOUT( TG(_LOWER), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE ), - [_LOWER] = LAYOUT_reviung5( + [_LOWER] = LAYOUT( _______, LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), RGB_TOG ) }; diff --git a/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c b/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c index 9ee41cb7e9..99880d524e 100644 --- a/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c +++ b/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c @@ -23,10 +23,10 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT_reviung5( + [_BASE] = LAYOUT( KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, TG(_LOWER) ), - [_LOWER] = LAYOUT_reviung5( + [_LOWER] = LAYOUT( RGB_TOG, LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______ ) }; diff --git a/keyboards/reviung/reviung5/reviung5.h b/keyboards/reviung/reviung5/reviung5.h index f5d952ba94..f58f755800 100644 --- a/keyboards/reviung/reviung5/reviung5.h +++ b/keyboards/reviung/reviung5/reviung5.h @@ -26,7 +26,7 @@ * The second converts the arguments into a two-dimensional array which * represents the switch matrix. */ -#define LAYOUT_reviung5( \ +#define LAYOUT( \ K00, K01, K02, K03, K04 \ ) { \ { K00, K01, K02, K03, K04 } \ -- cgit v1.2.3