From 9989e9f4ce14d3b07df7fa544fcfa03061a6ac70 Mon Sep 17 00:00:00 2001 From: Sadek Baroudi Date: Mon, 12 Sep 2022 10:36:16 -0700 Subject: [PATCH] updated default keymap for 3 way thumbwheel, and added my keymap --- .../fingerpunch/ximi/keymaps/default/keymap.c | 49 ++++++++++++------- .../ximi/keymaps/sadekbaroudi/keymap.c | 26 ++++++---- users/sadekbaroudi/wrappers.h | 7 ++- 3 files changed, 54 insertions(+), 28 deletions(-) diff --git a/keyboards/fingerpunch/ximi/keymaps/default/keymap.c b/keyboards/fingerpunch/ximi/keymaps/default/keymap.c index 59970cc6e6..8205b2b080 100644 --- a/keyboards/fingerpunch/ximi/keymaps/default/keymap.c +++ b/keyboards/fingerpunch/ximi/keymaps/default/keymap.c @@ -23,9 +23,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Shft | Z | X | C | V | B | | N | M | , | . | / | Ctrl | * `-----------------------------------------' `-----------------------------------------' - * ,--------------------. ,--------------------. - * | LOWER| Enter| Del | |BckSpc| Space| RAISE| - * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | LOWER| Enter| Del | |BckSpc| Space| RAISE| + * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumbwheel + * `--------------------' `--------------------. */ // Default config uses home row mods. So hold each of the keys on the home row to use ctrl, gui, alt, or shift @@ -34,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, LCTL_T(KC_A), LGUI_T(KC_S), LALT_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, RSFT_T(KC_J), RALT_T(KC_K), RGUI_T(KC_L), RCTL_T(KC_SCLN), KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, LOWER, KC_ENT, KC_DEL, KC_BSPC, KC_SPC, RAISE, - LOWER, KC_ENT, KC_DEL, KC_BSPC, KC_SPC, RAISE + C(KC_Z), C(S(KC_Z)), C(KC_Y), KC_VOLD, KC_MUTE, KC_VOLU ), /* Colemak @@ -46,9 +49,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Shft | Z | X | C | D | V | | K | H | , | . | / | Ctrl | * `--------------------+--------------------' `-----------------------------------------' - * ,--------------------. ,--------------------. - * | LOWER| Enter| ' | |BckSpc| Space| RAISE| - * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | LOWER| Enter| ' | |BckSpc| Space| RAISE| + * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumbwheel + * `--------------------' `--------------------. */ // Default config uses home row mods. So hold each of the keys on the home row to use ctrl, gui, alt, or shift @@ -57,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, LCTL_T(KC_A), LGUI_T(KC_R), LALT_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, RSFT_T(KC_N), RALT_T(KC_E), RGUI_T(KC_I), RCTL_T(KC_O), KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL, LOWER, KC_ENT, KC_QUOT, KC_BSPC, KC_SPC, RAISE, - LOWER, KC_ENT, KC_QUOT, KC_BSPC, KC_SPC, RAISE + C(KC_Z), C(S(KC_Z)), C(KC_Y), KC_VOLD, KC_MUTE, KC_VOLU ), /* Raise @@ -69,9 +75,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | ____ | Ctrl| ` | GUI | Alt | | | | | | \ | ' | ____ | * `-----------------------------------------' `-----------------------------------------' - * ,--------------------. ,--------------------. - * | LOWER| | | | | | RAISE| - * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | LOWER| | | | | | RAISE| + * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumbwheel + * `--------------------' `--------------------. */ [_RAISE] = LAYOUT_ximi( _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, @@ -90,9 +99,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | ____ | Caps| ~ | | | | | | | | | | ' | ____ | * `-----------------------------------------' `-----------------------------------------' - * ,--------------------. ,--------------------. - * | LOWER| | | | Del | | RAISE| - * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | LOWER| | | | Del | | RAISE| + * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumbwheel + * `--------------------' `--------------------. */ [_LOWER] = LAYOUT_ximi( _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, @@ -111,9 +123,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | ____ | SPD_D| HUE_D| SAT_D| VAL_D| | | F11 | F12 | | | Reset| ____ | * `-----------------------------------------' `-----------------------------------------' - * ,--------------------. ,--------------------. - * | LOWER| | | | | | RAISE| - * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | LOWER| | | | | | RAISE| + * `--------------------' `--------------------. + * ,--------------------. ,--------------------. + * | Undo | Redo2| Redo | | Vol- | Mute | Vol+ | // 3 way thumbwheel + * `--------------------' `--------------------. */ [_ADJUST] = LAYOUT_ximi( _______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, TO(_QWERTY), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, diff --git a/keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/keymap.c index 1efd198de6..916d9c2070 100644 --- a/keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/fingerpunch/ximi/keymaps/sadekbaroudi/keymap.c @@ -30,7 +30,7 @@ // _______, KC_BSPC, LT(_NAVIGATION,KC_ENT), LT(_SYMBOLS,KC_SPACE), KC_QUOT, _______ "\" // clang-format off -#define LAYOUT_luakeeb_base( \ +#define LAYOUT_ximi_base( \ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \ @@ -40,22 +40,23 @@ N_SEL_LINE, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), K08, K09, K0A, KC_BSLS, \ LCTL(KC_C), LCTL_T(K11), LGUI_T(K12), LALT_T(K13), LSFT_T(K14), K15, LT(_MOUSE, K16), RSFT_T(K17), RALT_T(K18), RGUI_T(K19), RCTL_T(K1A), LCTL(KC_V), \ TG(_NAVIGATION), K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, S_ALT_TAB, \ - KC_MUTE, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, LCTL(KC_BSPC) \ + K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, \ + C(KC_Z), C(S(KC_Z)), C(KC_Y), KC_VOLD, KC_MUTE, KC_VOLU \ ) /* Re-pass though to allow templates to be used */ -#define LAYOUT_luakeeb_base_wrapper(...) LAYOUT_luakeeb_base(__VA_ARGS__) +#define LAYOUT_ximi_base_wrapper(...) LAYOUT_ximi_base(__VA_ARGS__) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_ALPHA_ALT] = LAYOUT_luakeeb_base_wrapper( + [_ALPHA_ALT] = LAYOUT_ximi_base_wrapper( _________________ALPHA_ALT_L1_________________, _________________ALPHA_ALT_R1_________________, _________________ALPHA_ALT_L2_________________, _________________ALPHA_ALT_R2_________________, _________________ALPHA_ALT_L3_________________, _________________ALPHA_ALT_R3_________________, __ALPHA_ALT_THUMBS_6__ ), - [_ALPHA] = LAYOUT_luakeeb_base_wrapper( + [_ALPHA] = LAYOUT_ximi_base_wrapper( __________________ALPHA_L1____________________, __________________ALPHA_R1____________________, __________________ALPHA_L2____________________, __________________ALPHA_R2____________________, __________________ALPHA_L3____________________, __________________ALPHA_R3____________________, @@ -66,35 +67,40 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, ________________NAVIGATION_1_______________, _________________NUMPAD_1__________________, _______, _______, ________________NAVIGATION_2_______________, _________________NUMPAD_2__________________, _______, _______, ________________NAVIGATION_3_______________, _________________NUMPAD_3__________________, _______, - _______, _______, _______, KC_TAB, KC_BSPC, KC_SPACE, KC_DOT, _______ + _______, _______, KC_TAB, KC_BSPC, KC_SPACE, KC_DOT, + _______, _______, _______, _______, _______, _______ ), [_SYMBOLS] = LAYOUT_wrapper( _______, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______, _______, ________________SYMBOLS_L2_________________, ________________SYMBOLS_R2_________________, _______, _______, ________________SYMBOLS_L3_________________, ________________SYMBOLS_R3_________________, _______, - _______, _______, KC_ENT, KC_DEL, KC_BSPC, _______, _______, _______ + _______, KC_ENT, KC_DEL, KC_BSPC, _______, _______, + _______, _______, _______, _______, _______, _______ ), [_FUNCTION] = LAYOUT_wrapper( _______, ________________SHIFTNAV_1_________________, ________________FUNCTION_1_________________, _______, _______, ________________SHIFTNAV_2_________________, ________________FUNCTION_2_________________, _______, _______, ________________SHIFTNAV_3_________________, ________________FUNCTION_3_________________, _______, - _______, _______, _______, _______, N_DEL_LINE, KC_SPACE, _______, _______ + _______, _______, _______, N_DEL_LINE, KC_SPACE, _______, + _______, _______, _______, _______, _______, _______ ), [_MEDIA] = LAYOUT_wrapper( _______, ___________________RGB_1___________________, _________________MACROS_1__________________, _______, _______, ___________________RGB_2___________________, _________________MACROS_2__________________, _______, _______, ___________________RGB_3___________________, _________________MACROS_3__________________, _______, - _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), [_MOUSE] = LAYOUT_wrapper( _______, __________________MOUSE_1__________________, ___________________BLANK___________________, _______, _______, __________________MOUSE_2__________________, ___________________BLANK___________________, _______, _______, __________________MOUSE_3__________________, ___________________BLANK___________________, _______, - _______, _______, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN3, KC_MS_BTN2, _______, _______ + _______, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN3, KC_MS_BTN2, _______, + _______, _______, _______, _______, _______, _______ ) }; diff --git a/users/sadekbaroudi/wrappers.h b/users/sadekbaroudi/wrappers.h index b790f46cd4..4796a9759c 100755 --- a/users/sadekbaroudi/wrappers.h +++ b/users/sadekbaroudi/wrappers.h @@ -116,6 +116,11 @@ expanded before being used as arguments to the LAYOUT_xxx macro. # define LAYOUT LAYOUT_arachnophobe #endif +// Since ximi uses the name LAYOUT_ximi instead of LAYOUT +#if (!defined(LAYOUT) && defined(LAYOUT_ximi)) +# define LAYOUT LAYOUT_ximi +#endif + // clang-format off #define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) @@ -427,7 +432,7 @@ NOTE: These are all the same length. If you do a search/replace // MOUSE LAYER -#define __MOUSE_1_K1__ RESET +#define __MOUSE_1_K1__ QK_BOOT #define __MOUSE_1_K2__ KC_MS_WH_UP #define __MOUSE_1_K3__ KC_MS_UP #define __MOUSE_1_K4__ KC_MS_WH_DOWN