From 94a7d075e9b7338e597cedaa7c2bdb875c3d4cf8 Mon Sep 17 00:00:00 2001 From: Sadek Baroudi Date: Thu, 13 Jun 2024 22:24:03 -0700 Subject: [PATCH] set up my personal keymap for ximega --- keyboards/fingerpunch/ximega/v1/fp_build.json | 2 +- .../ximega/v1/keymaps/sadekbaroudi/keymap.c | 26 ++++++++++++------- users/sadekbaroudi/wrappers.h | 5 ++++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/keyboards/fingerpunch/ximega/v1/fp_build.json b/keyboards/fingerpunch/ximega/v1/fp_build.json index c077fcfe32..79d544e7c5 100644 --- a/keyboards/fingerpunch/ximega/v1/fp_build.json +++ b/keyboards/fingerpunch/ximega/v1/fp_build.json @@ -32,6 +32,6 @@ { "type" : "single", "name" : "FP_VIK2_RGB", - "user_input": "Do you want to use the RGB on VIK2? This disableds per key rgb and VIK1 RGB." + "user_input": "Do you want to use the RGB on VIK2? This disables per key rgb and VIK1 RGB." } ] diff --git a/keyboards/fingerpunch/ximega/v1/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/ximega/v1/keymaps/sadekbaroudi/keymap.c index 649ecee893..dd472fa632 100644 --- a/keyboards/fingerpunch/ximega/v1/keymaps/sadekbaroudi/keymap.c +++ b/keyboards/fingerpunch/ximega/v1/keymaps/sadekbaroudi/keymap.c @@ -37,11 +37,12 @@ K33, K34, K35, K36, K37, K38 \ ) \ LAYOUT_wrapper( \ - KC_MS_BTN3, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), K08, K09, K0A, FP_ZOOM_TOG, \ - KC_MS_BTN1, 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), FP_SCROLL_TOG, \ - KC_MS_BTN2, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, FP_SNIPE_TOG, \ - KC_MUTE, K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, KC_MUTE, \ - KC_MS_BTN3, KC_MS_BTN1, KC_MS_BTN2, KC_VOLD, KC_MUTE, KC_VOLU \ + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + KC_MS_BTN3, K01, K02, K03, LT(_FUNCTION, K04), K05, K06, LT(_FUNCTION, K07), K08, K09, K0A, FP_ZOOM_TOG, \ + KC_MS_BTN1, 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), FP_SCROLL_TOG, \ + KC_MS_BTN2, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, FP_SNIPE_TOG, \ + LCTL(LSFT(KC_TAB)), LCTL(KC_TAB), K33, LT(_NAVIGATION,K34), LT(_FUNCTION,K35), LT(_MEDIA,K36), LT(_SYMBOLS,K37), K38, LCTL(LGUI(KC_LEFT)), LCTL(LGUI(KC_RIGHT)), \ + KC_MS_BTN3, KC_MS_BTN1, KC_MS_BTN2, KC_VOLD, KC_MUTE, KC_VOLU \ ) /* Re-pass though to allow templates to be used */ @@ -64,42 +65,47 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_NAVIGATION] = LAYOUT_wrapper( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ________________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 d3255bfe14..88db27a871 100755 --- a/users/sadekbaroudi/wrappers.h +++ b/users/sadekbaroudi/wrappers.h @@ -131,6 +131,11 @@ expanded before being used as arguments to the LAYOUT_xxx macro. # define LAYOUT LAYOUT_ximi #endif +// Since ximega uses the name LAYOUT_ximega instead of LAYOUT +#if (!defined(LAYOUT) && defined(LAYOUT_ximega)) +# define LAYOUT LAYOUT_ximega +#endif + // Since badwings uses the name LAYOUT_badwings instead of LAYOUT #if (!defined(LAYOUT) && defined(LAYOUT_badwings)) # define LAYOUT LAYOUT_badwings