From 68d32da4ae0af4ebe5c56a5f6533dddd023fd610 Mon Sep 17 00:00:00 2001 From: jaspertandy Date: Wed, 3 Apr 2024 08:45:36 +0100 Subject: [PATCH] Fix some upstream issues --- .../3x5/keymaps/jaspertandy/keymap.c | 24 +++++++++++--- keyboards/dz60/keymaps/jaspertandy/keymap.c | 32 +++++++++++++------ keyboards/ferris/0_1/0_1.h | 4 +-- keyboards/ferris/0_2/0_2.h | 2 +- keyboards/ferris/keymaps/jaspertandy/keymap.c | 26 +++++++++++---- keyboards/ferris/sweep/info.json | 28 ++++++++-------- .../aurora/sweep/keymaps/jaspertandy/keymap.c | 18 +++++++++-- .../le_chiffre/keymaps/jaspertandy/keymap.c | 16 +++++++++- 8 files changed, 110 insertions(+), 40 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/jaspertandy/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/jaspertandy/keymap.c index f1dfdb746a29..b4e8ddeb3371 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/jaspertandy/keymap.c +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/jaspertandy/keymap.c @@ -37,10 +37,12 @@ #define C5_MT MT(MOD_RCTL, KC_QUOT) enum userspace_keycodes { - TMUXPN = CHARYBDIS_SAFE_RANGE, + TMUXPN = SAFE_RANGE, TMUXPP, VIM_VP, VIM_VR, + VIM_QN, + VIM_QP, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -73,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_charybdis_3x5( // NAV //,-----------------------------------------------------. ,-----------------------------------------------------. - _______, _______, _______, _______, _______, CAPSWRD, KC_CAPS, _______, _______, _______, + _______, _______, _______, _______, _______, CW_TOGG, KC_CAPS, _______, _______, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_COLON, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -140,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. LAG(KC_BSLS), LCTL(KC_SPC), LCA(KC_SPC), _______, _______, _______, _______, _______, _______, _______, // 1Password, Things, Fantastical //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, _______, _______, VIM_VP, TMUXPP, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), _______, // Screenshots + VIM_QP, VIM_QN, _______, VIM_VP, TMUXPP, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), _______, // Screenshots //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, _______, _______, VIM_VR, TMUXPN, LSG(KC_5), _______, _______, _______, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| @@ -165,13 +167,25 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case VIM_VP: if (record->event.pressed) { - SEND_STRING(SS_TAP(X_ESCAPE)"\\vp"); + SEND_STRING(SS_TAP(X_ESCAPE)",vp"); } return false; break; case VIM_VR: if (record->event.pressed) { - SEND_STRING(SS_TAP(X_ESCAPE)"\\r"); + SEND_STRING(SS_TAP(X_ESCAPE)",r"); + } + return false; + break; + case VIM_QN: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)")"SS_DELAY(50)"q"SS_TAP(X_ESCAPE)); + } + return false; + break; + case VIM_QP: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)"("SS_DELAY(50)"q"SS_TAP(X_ESCAPE)); } return false; break; diff --git a/keyboards/dz60/keymaps/jaspertandy/keymap.c b/keyboards/dz60/keymaps/jaspertandy/keymap.c index 19a69a3cd45f..00afbe6d40ba 100644 --- a/keyboards/dz60/keymaps/jaspertandy/keymap.c +++ b/keyboards/dz60/keymaps/jaspertandy/keymap.c @@ -7,7 +7,9 @@ enum custom_keycodes { TMPN, TMPP, TMWN, - TMWP + TMWP, + VIM_VR, + VIM_VP }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -30,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, ______, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, ______, - KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1), - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_LCTL, KC_ENT, KC_RGUI, KC_GRV, KC_LEFT, KC_DOWN, KC_RIGHT + KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, TMPP, KC_UP, MO(1), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_LCTL, KC_ENT, KC_GRV, TMPN, KC_LEFT, KC_DOWN, KC_RIGHT ), /* FN Layer @@ -50,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT_directional( ______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ______, ______, - ______, TMPP, TMPN, ______, RGB_TOG, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD, ______, ______, ______, + ______, VIM_VP, VIM_VR, ______, RGB_TOG, RGB_VAI, RGB_VAD, RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD, ______, ______, ______, ______, TMWP, TMWN, ______, RGB_MOD, RGB_RMOD, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - RESET, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ + QK_BOOT, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ ), }; @@ -61,25 +63,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case TMPN: if (record->event.pressed) { - SEND_STRING(SS_LCTRL("b")"o"); + SEND_STRING(SS_LCTL("b")"o"); } return false; break; case TMPP: if (record->event.pressed) { - SEND_STRING(SS_LCTRL("b")"p"); + SEND_STRING(SS_LCTL("b")"p"); } return false; break; case TMWN: if (record->event.pressed) { - SEND_STRING(SS_LCTRL("b")"n"); + SEND_STRING(SS_LCTL("b")"n"); } return false; break; case TMWP: if (record->event.pressed) { - SEND_STRING(SS_LCTRL("b")"m"); + SEND_STRING(SS_LCTL("b")"m"); + } + return false; + break; + case VIM_VP: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)"\\vp"); + } + return false; + break; + case VIM_VR: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)"\\r"); } return false; break; diff --git a/keyboards/ferris/0_1/0_1.h b/keyboards/ferris/0_1/0_1.h index 2f58831df781..f6dff24c07e1 100644 --- a/keyboards/ferris/0_1/0_1.h +++ b/keyboards/ferris/0_1/0_1.h @@ -24,7 +24,7 @@ along with this program. If not, see . /* left hand right hand */ #define LAYOUT_split_3x5_2(\ K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ - K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ + K1_0, K1_1, K1_2, K1_3, K1_4, K1_9, K1_8, K1_7, K1_6, K1_5,\ K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ K3_3, K3_4, K3_5, K3_6)\ /* matrix positions */\ @@ -35,7 +35,7 @@ along with this program. If not, see . {KC_NO, KC_NO, KC_NO, K3_3, K3_4},\ \ {K0_5, K0_6, K0_7, K0_8, K0_9},\ - {K1_5, K1_6, K1_7, K1_8, K1_9},\ + {K1_9, K1_8, K1_7, K1_6, K1_5},\ {K2_5, K2_6, K2_7, K2_8, K2_9},\ {K3_5, K3_6, KC_NO, KC_NO, KC_NO}\ } diff --git a/keyboards/ferris/0_2/0_2.h b/keyboards/ferris/0_2/0_2.h index 2f58831df781..9e559213c1c6 100644 --- a/keyboards/ferris/0_2/0_2.h +++ b/keyboards/ferris/0_2/0_2.h @@ -24,7 +24,7 @@ along with this program. If not, see . /* left hand right hand */ #define LAYOUT_split_3x5_2(\ K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ - K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ + K1_0, K1_1, K1_2, K1_3, K1_4, K1_9, K1_8, K1_7, K1_6, K1_5,\ K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ K3_3, K3_4, K3_5, K3_6)\ /* matrix positions */\ diff --git a/keyboards/ferris/keymaps/jaspertandy/keymap.c b/keyboards/ferris/keymaps/jaspertandy/keymap.c index f4fcaf386014..de5ca00bbf31 100644 --- a/keyboards/ferris/keymaps/jaspertandy/keymap.c +++ b/keyboards/ferris/keymaps/jaspertandy/keymap.c @@ -24,6 +24,8 @@ enum userspace_keycodes { TMUXPP, VIM_VP, VIM_VR, + VIM_QN, + VIM_QP, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -56,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( // NAV //,-----------------------------------------------------. ,-----------------------------------------------------. - _______, _______, _______, _______, _______, CAPSWRD, KC_CAPS, _______, _______, _______, + _______, _______, _______, _______, _______, CW_TOGG, KC_CAPS, _______, _______, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_COLON, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -123,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. LAG(KC_BSLS), LCTL(KC_SPC), LCA(KC_SPC), _______, _______, _______, _______, _______, _______, _______, // 1Password, Things, Fantastical //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, _______, _______, VIM_VP, TMUXPP, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), _______, // Screenshots + VIM_QP, VIM_QN, _______, VIM_VP, TMUXPP, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), _______, // Screenshots //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, _______, _______, VIM_VR, TMUXPN, LSG(KC_5), _______, _______, _______, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| @@ -136,25 +138,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case TMUXPN: if (record->event.pressed) { - SEND_STRING(SS_LCTRL("b")"o"); + SEND_STRING(SS_LCTL("b")"o"); } return false; break; case TMUXPP: if (record->event.pressed) { - SEND_STRING(SS_LCTRL("b")"p"); + SEND_STRING(SS_LCTL("b")"p"); } return false; break; case VIM_VP: if (record->event.pressed) { - SEND_STRING(SS_TAP(X_ESCAPE)"\\vp"); + SEND_STRING(SS_TAP(X_ESCAPE)",vp"); } return false; break; case VIM_VR: if (record->event.pressed) { - SEND_STRING(SS_TAP(X_ESCAPE)"\\r"); + SEND_STRING(SS_TAP(X_ESCAPE)",r"); + } + return false; + break; + case VIM_QN: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)")"SS_DELAY(50)"q"SS_TAP(X_ESCAPE)); + } + return false; + break; + case VIM_QP: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)"("SS_DELAY(50)"q"SS_TAP(X_ESCAPE)); } return false; break; diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json index 567ef16a8640..ff2e1c7dff12 100644 --- a/keyboards/ferris/sweep/info.json +++ b/keyboards/ferris/sweep/info.json @@ -51,11 +51,11 @@ {"x": 3, "y": 0.28, "matrix": [0, 3]}, {"x": 4, "y": 0.42, "matrix": [0, 4]}, - {"x": 7, "y": 0.42, "matrix": [4, 0]}, - {"x": 8, "y": 0.28, "matrix": [4, 1]}, + {"x": 7, "y": 0.42, "matrix": [4, 4]}, + {"x": 8, "y": 0.28, "matrix": [4, 3]}, {"x": 9, "y": 0, "matrix": [4, 2]}, - {"x": 10, "y": 0.31, "matrix": [4, 3]}, - {"x": 11, "y": 0.93, "matrix": [4, 4]}, + {"x": 10, "y": 0.31, "matrix": [4, 1]}, + {"x": 11, "y": 0.93, "matrix": [4, 0]}, {"x": 0, "y": 1.93, "matrix": [1, 0]}, {"x": 1, "y": 1.31, "matrix": [1, 1]}, @@ -63,11 +63,11 @@ {"x": 3, "y": 1.28, "matrix": [1, 3]}, {"x": 4, "y": 1.42, "matrix": [1, 4]}, - {"x": 7, "y": 1.42, "matrix": [5, 0]}, - {"x": 8, "y": 1.28, "matrix": [5, 1]}, + {"x": 7, "y": 1.42, "matrix": [5, 4]}, + {"x": 8, "y": 1.28, "matrix": [5, 3]}, {"x": 9, "y": 1, "matrix": [5, 2]}, - {"x": 10, "y": 1.31, "matrix": [5, 3]}, - {"x": 11, "y": 1.93, "matrix": [5, 4]}, + {"x": 10, "y": 1.31, "matrix": [5, 1]}, + {"x": 11, "y": 1.93, "matrix": [5, 0]}, {"x": 0, "y": 2.93, "matrix": [2, 0]}, {"x": 1, "y": 2.31, "matrix": [2, 1]}, @@ -75,17 +75,17 @@ {"x": 3, "y": 2.28, "matrix": [2, 3]}, {"x": 4, "y": 2.42, "matrix": [2, 4]}, - {"x": 7, "y": 2.42, "matrix": [6, 0]}, - {"x": 8, "y": 2.28, "matrix": [6, 1]}, + {"x": 7, "y": 2.42, "matrix": [6, 4]}, + {"x": 8, "y": 2.28, "matrix": [6, 3]}, {"x": 9, "y": 2, "matrix": [6, 2]}, - {"x": 10, "y": 2.31, "matrix": [6, 3]}, - {"x": 11, "y": 2.93, "matrix": [6, 4]}, + {"x": 10, "y": 2.31, "matrix": [6, 1]}, + {"x": 11, "y": 2.93, "matrix": [6, 0]}, {"x": 3.5, "y": 3.75, "matrix": [3, 0]}, {"x": 4.5, "y": 4, "matrix": [3, 1]}, - {"x": 6.5, "y": 4, "matrix": [7, 0]}, - {"x": 7.5, "y": 3.75, "matrix": [7, 1]} + {"x": 6.5, "y": 4, "matrix": [7, 1]}, + {"x": 7.5, "y": 3.75, "matrix": [7, 0]} ] } } diff --git a/keyboards/splitkb/aurora/sweep/keymaps/jaspertandy/keymap.c b/keyboards/splitkb/aurora/sweep/keymaps/jaspertandy/keymap.c index 55106cfd9681..888ab63454c6 100644 --- a/keyboards/splitkb/aurora/sweep/keymaps/jaspertandy/keymap.c +++ b/keyboards/splitkb/aurora/sweep/keymaps/jaspertandy/keymap.c @@ -41,6 +41,8 @@ enum userspace_keycodes { TMUXPP, VIM_VP, VIM_VR, + VIM_QN, + VIM_QP, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -73,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_split_3x5_2( // NAV //,-----------------------------------------------------. ,-----------------------------------------------------. - _______, _______, _______, _______, _______, CAPSWRD, KC_CAPS, _______, _______, _______, + _______, _______, _______, _______, _______, CW_TOGG, KC_CAPS, _______, _______, _______, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_COLON, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| @@ -140,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. LAG(KC_BSLS), LCTL(KC_SPC), LCA(KC_SPC), _______, _______, _______, _______, _______, _______, _______, // 1Password, Things, Fantastical //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, _______, _______, VIM_VP, TMUXPP, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), _______, // Screenshots + VIM_QP, VIM_QN, _______, VIM_VP, TMUXPP, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), _______, // Screenshots //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, _______, _______, VIM_VR, TMUXPN, LSG(KC_5), _______, _______, _______, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| @@ -175,6 +177,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; + case VIM_QN: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)")"SS_DELAY(50)"q"SS_TAP(X_ESCAPE)); + } + return false; + break; + case VIM_QP: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)"("SS_DELAY(50)"q"SS_TAP(X_ESCAPE)); + } + return false; + break; } return true; } diff --git a/keyboards/tominabox1/le_chiffre/keymaps/jaspertandy/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/jaspertandy/keymap.c index f9c625478f2c..6e30ebd01f06 100644 --- a/keyboards/tominabox1/le_chiffre/keymaps/jaspertandy/keymap.c +++ b/keyboards/tominabox1/le_chiffre/keymaps/jaspertandy/keymap.c @@ -41,6 +41,8 @@ enum userspace_keycodes { TMUXPP, VIM_VP, VIM_VR, + VIM_QN, + VIM_QP, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -140,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,-----------------------------------------------------. ,-----------------------------------------------------. LAG(KC_BSLS), LCTL(KC_SPC), LCA(KC_SPC), _______, _______,_______, _______, _______, _______, _______, _______, // 1Password, Things, Fantastical //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, _______, _______, VIM_VP, TMUXPP, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), _______, // Screenshots + VIM_QP, VIM_QN, _______, VIM_VP, TMUXPP, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), _______, // Screenshots //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| _______, _______, _______, VIM_VR, TMUXPN, LSG(KC_5), _______, _______, _______, _______, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| @@ -175,6 +177,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; + case VIM_QN: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)")"SS_DELAY(50)"q"SS_TAP(X_ESCAPE)); + } + return false; + break; + case VIM_QP: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ESCAPE)"("SS_DELAY(50)"q"SS_TAP(X_ESCAPE)); + } + return false; + break; } return true; }