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/cradio/cradio.h | 2 +- keyboards/cradio/info.json | 2 +- keyboards/cradio/keymaps/default/keymap.c | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'keyboards/cradio') diff --git a/keyboards/cradio/cradio.h b/keyboards/cradio/cradio.h index 29e81ef9b8..527cc16ad0 100644 --- a/keyboards/cradio/cradio.h +++ b/keyboards/cradio/cradio.h @@ -31,7 +31,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, \ diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json index c553810656..78cb7ef195 100644 --- a/keyboards/cradio/info.json +++ b/keyboards/cradio/info.json @@ -3,7 +3,7 @@ "url": "https://github.com/davidphilipbarr/Sweep", "maintainer": "@davidphilipbarr", "layouts": { - "LAYOUT": { + "LAYOUT_split_3x5_2": { "layout": [ {"x": 0, "y": 1.27}, {"x": 1, "y": 0.31}, diff --git a/keyboards/cradio/keymaps/default/keymap.c b/keyboards/cradio/keymaps/default/keymap.c index bb7e2d35e6..f060be4e39 100644 --- a/keyboards/cradio/keymaps/default/keymap.c +++ b/keyboards/cradio/keymaps/default/keymap.c @@ -24,28 +24,29 @@ */ 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, SFT_T(KC_A),ALT_T(KC_S),CTL_T(KC_D),GUI_T(KC_F), KC_G, KC_H, GUI_T(KC_J),CTL_T(KC_K),ALT_T(KC_L),SFT_T(KC_SCLN), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LT(2,KC_TAB), KC_ENT, KC_SPC, LT(1,KC_BSPC) ), - [1] = LAYOUT( + [1] = LAYOUT_split_3x5_2( _______, KC_1, KC_2, KC_3, KC_VOLU, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_DQUO, _______, KC_4, KC_5, KC_6, KC_VOLD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, KC_CAPS, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, _______, _______, MO(3), KC_GESC, _______, _______ ), - [2] = LAYOUT( + [2] = LAYOUT_split_3x5_2( _______, KC_LBRC, KC_LCBR, KC_RCBR, _______, KC_CIRC, KC_LPRN, KC_RPRN, KC_RBRC, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, _______, _______, _______, _______, _______, KC_ASTR, KC_UNDS, KC_PLUS, KC_PIPE, _______, _______, _______, KC_DEL, MO(3) ), - [3] = LAYOUT( + [3] = LAYOUT_split_3x5_2( _______, KC_F1, KC_F2, KC_F3, KC_F10, _______, KC_WH_U, KC_WH_D, _______, RESET, _______, KC_F4, KC_F5, KC_F6, KC_F11, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_INS, _______, KC_F7, KC_F8, KC_F9, KC_F12, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, _______ ) }; + -- cgit v1.2.1