summaryrefslogtreecommitdiffstats
path: root/keyboards/adm42
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-01-20 05:44:05 +0000
committerGitHub <noreply@github.com>2023-01-20 05:44:05 +0000
commit53cc6170ae2687b0c894f05738181a2f16ad0d6c (patch)
tree8ad46caf24ee9dd35af36c2f292d0ba322650c80 /keyboards/adm42
parent18d107b29bc2b84b13a19f3fc4ef08724247b1bb (diff)
Refactor some layouts which contain keyboard name (#19645)
* Refactor some layouts which contain keyboard name * use planck_mit
Diffstat (limited to 'keyboards/adm42')
-rw-r--r--keyboards/adm42/adm42.h2
-rw-r--r--keyboards/adm42/info.json5
-rw-r--r--keyboards/adm42/rev4/keymaps/default/keymap.c12
3 files changed, 11 insertions, 8 deletions
diff --git a/keyboards/adm42/adm42.h b/keyboards/adm42/adm42.h
index d4ac544a8f..536fb51da5 100644
--- a/keyboards/adm42/adm42.h
+++ b/keyboards/adm42/adm42.h
@@ -18,7 +18,7 @@
#include "quantum.h"
-#define LAYOUT_adm42_3x12_6( \
+#define LAYOUT( \
K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index bf57885afa..5834be2233 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -8,8 +8,11 @@
"pid": "0xE873",
"device_version": "0.0.1"
},
+ "layout_aliases": {
+ "LAYOUT_adm42_3x12_6": "LAYOUT"
+ },
"layouts": {
- "LAYOUT_adm42_3x12_6": {
+ "LAYOUT": {
"layout": [
{"label":"GUI/`~", "x":0, "y":0.8},
{"label":"Q", "x":1, "y":0.8},
diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.c b/keyboards/adm42/rev4/keymaps/default/keymap.c
index 109796f7ae..7720b07be2 100644
--- a/keyboards/adm42/rev4/keymaps/default/keymap.c
+++ b/keyboards/adm42/rev4/keymaps/default/keymap.c
@@ -54,38 +54,38 @@ enum custom_keycodes {
// Not a mistake to have KC_LALT (also) on the right, RALT is kept for compose (LLS_RALT)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_adm42_3x12_6(
+ [_QWERTY] = LAYOUT(
LW_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, RW_EQU,
LC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RC_QUT,
KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LALT,
LLS_ESC, LS_BPC, LLA_DEL, LLE_ENT, RS_SPC, LLS_RALT
),
- [_COLEMAKDH] = LAYOUT_adm42_3x12_6(
+ [_COLEMAKDH] = LAYOUT(
LW_GRV, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, RW_EQU,
LC_TAB, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, RC_QUT,
KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_LALT,
LLS_ESC, LS_BPC, LLA_DEL, LLE_ENT, RS_SPC, LLS_RALT
),
- [_SPECIAL] = LAYOUT_adm42_3x12_6(
+ [_SPECIAL] = LAYOUT(
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, RW_BS,
LC_CIRC, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_EXLM, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MINS, RC_DLR,
_______, KC_AMPR, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_UNDS, KC_ASTR, KC_HASH, KC_PERC, KC_TILD, _______,
KC_ESC, _______, KC_DEL, KC_ENT, _______, KC_RALT
),
- [_EXTRA] = LAYOUT_adm42_3x12_6(
+ [_EXTRA] = LAYOUT(
LW_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RW_F12,
KC_LCTL, KC_PAUS, KC_INS, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_APP, KC_RCTL,
_______, KC_SLEP, KC_PWR, KC_MSTP, KC_MNXT, KC_MPLY, _______, KC_BRID, KC_BRIU, KC_PSCR, KC_WAKE, _______,
KC_CAPS, _______, _______, _______, _______, KC_CAPS
),
- [_ADM] = LAYOUT_adm42_3x12_6(
+ [_ADM] = LAYOUT(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_B, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUD, RGB_HUI, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_P, RGB_SPD, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, SETUP, XXXXXXX, XXXXXXX
),
- [_SETUP] = LAYOUT_adm42_3x12_6(
+ [_SETUP] = LAYOUT(
REFLASH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, DF_QWER, DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,