From e2d1547f31c0ceda27b68e26e79224b49cadaa97 Mon Sep 17 00:00:00 2001 From: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Fri, 14 Jan 2022 01:15:01 +0800 Subject: [Keyboard] Switch a_dux, cradio and ferris to split_3x5_2 (#15850) --- keyboards/a_dux/a_dux.h | 4 +++- keyboards/a_dux/info.json | 2 +- keyboards/a_dux/keymaps/default/keymap.c | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'keyboards/a_dux') diff --git a/keyboards/a_dux/a_dux.h b/keyboards/a_dux/a_dux.h index d143295845..83c0a3692b 100644 --- a/keyboards/a_dux/a_dux.h +++ b/keyboards/a_dux/a_dux.h @@ -28,7 +28,7 @@ // readability #define ___ KC_NO -#define LAYOUT( \ +#define LAYOUT_split_3x5_2( \ L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ @@ -45,3 +45,5 @@ { R16, R17, ___, ___, ___ } \ } +#define LAYOUT LAYOUT_split_3x5_2 + diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json index f1869f7332..e276128a62 100644 --- a/keyboards/a_dux/info.json +++ b/keyboards/a_dux/info.json @@ -3,7 +3,7 @@ "url": "https://github.com/tapioki/cephalopoda", "maintainer": "@tapioki", "layouts": { - "LAYOUT": { + "LAYOUT_split_3x5_2": { "layout": [ {"x": 0, "y": 1.33}, {"x": 1, "y": 0.31}, diff --git a/keyboards/a_dux/keymaps/default/keymap.c b/keyboards/a_dux/keymaps/default/keymap.c index 560c5654e9..b58c9d447f 100644 --- a/keyboards/a_dux/keymaps/default/keymap.c +++ b/keyboards/a_dux/keymaps/default/keymap.c @@ -7,31 +7,31 @@ // https://stevep99.github.io/seniply const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_split_3x5_2( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LT(3,KC_TAB), KC_LSFT, KC_SPC, LT(1,KC_ENT) ), - [1] = LAYOUT( + [1] = LAYOUT_split_3x5_2( KC_EXLM, KC_AT, KC_SCLN, KC_COLN, KC_UNDS, KC_EQL, KC_7, KC_8, KC_9, KC_PLUS, KC_BSLS, KC_PIPE, KC_LCBR, KC_LPRN, KC_LBRC, KC_ASTR, KC_4, KC_5, KC_6, KC_MINS, KC_NO, KC_NO, KC_RCBR, KC_RPRN, KC_RBRC, KC_0, KC_1, KC_2, KC_3, KC_SLSH, _______, MO(2), _______, _______ ), - [2] = LAYOUT( + [2] = LAYOUT_split_3x5_2( RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), KC_BRIU, KC_NO, KC_AMPR, KC_GRV, KC_TILD, KC_NO, KC_MUTE, KC_VOLD, KC_MPLY, KC_VOLU, KC_BRID, KC_NO, KC_DLR, KC_PERC, KC_CIRC, KC_UNDS, KC_EJCT, KC_MPRV, KC_MSTP, KC_MNXT, KC_NO, KC_NO, KC_EXLM, KC_AT, KC_HASH, KC_NO, _______, _______, _______, _______ ), - [3] = LAYOUT( + [3] = LAYOUT_split_3x5_2( KC_ESC, LALT(KC_LEFT), LCTL(KC_F), LALT(KC_RGHT), KC_INS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_CAPS, OSM(MOD_LALT), OSM(MOD_LGUI), OSM(MOD_LSFT), OSM(MOD_LCTL), OSM(MOD_RALT), KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), KC_TAB, LCTL(KC_V), KC_ENT, KC_BSPC, KC_RCTL, KC_LALT, KC_APP, _______, _______, _______, MO(4) ), - [4] = LAYOUT( + [4] = LAYOUT_split_3x5_2( KC_NO, KC_NO, RCS(KC_F), KC_PSCR, KC_NO, KC_F12, KC_F7, KC_F8, KC_F9, KC_NO, OSM(MOD_LALT), OSM(MOD_LGUI), OSM(MOD_LSFT), OSM(MOD_LCTL), OSM(MOD_RALT), KC_F11, KC_F4, KC_F5, KC_F6, KC_NO, RCS(KC_Z), RCS(KC_X), RCS(KC_C), LSFT(KC_TAB), RCS(KC_V), KC_F10, KC_F1, KC_F2, KC_F3, KC_NO, -- cgit v1.2.3