diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c index bd4545c3..3957a45d 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c @@ -246,9 +246,9 @@ void get_clever_keycode(uint16_t* next_keycode, keyrecord_t* record) { layer_off(_ODK); return finish_word((uint16_t[]) {FG_O, FG_ODK, FG_T}, 3, next_keycode, record); - case AGRV_SPC: +/* case AGRV_SPC: layer_off(_ODK); - return finish_word((uint16_t[]) {FG_AGR, KC_SPC}, 2, next_keycode, record); + return finish_word((uint16_t[]) {FG_AGR, KC_SPC}, 2, next_keycode, record); */ } //return KC_NO; // Process next keycode normally diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/clever_keys_utilities.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/clever_keys_utilities.c index 19678b3e..8d230475 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/clever_keys_utilities.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/clever_keys_utilities.c @@ -160,7 +160,8 @@ void replace_ongoing_key(uint16_t clever_keycode, uint16_t* ongoing_keycode, key void process_word(uint16_t keycodes[], uint8_t num_keycodes, keyrecord_t* record) { for (int i = 0; i < num_keycodes; ++i) { - process_key(keycodes[i], record); + process_key(keycodes[i], record); // Better solution, if there is enought space in the chip. + //tap_code(keycodes[i]); } bkspc_countdown = num_keycodes; } @@ -173,7 +174,6 @@ void finish_word(uint16_t keycodes[], uint8_t num_keycodes, uint16_t* ongoing_ke bool process_clever_keys(uint16_t keycode, keyrecord_t* record) { - //if (record->event.pressed && !processingCK) { if (record->event.pressed) { uint16_t ongoing_keycode = get_ongoing_keycode(keycode, record); diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/combos.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/combos.c index 877e8b5d..5ea7bf0c 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/combos.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/combos.c @@ -33,7 +33,8 @@ enum combos { PANIC, NUMWRD, ALTTAB, - CTRLALT + //CTRLALT, + }; const uint16_t PROGMEM del_combo_d[] = {FG_S, FG_N, COMBO_END}; @@ -50,7 +51,7 @@ const uint16_t PROGMEM help_combo[] = {FG_VIRG, FG_APOS, COMBO_END}; const uint16_t PROGMEM panic_combo[] = {FG_EACU, FG_L, COMBO_END}; const uint16_t PROGMEM numword_combo[] = {FG_S, FG_R, COMBO_END}; const uint16_t PROGMEM alttab_combo[] = {FG_D, FG_Y, COMBO_END}; -const uint16_t PROGMEM ctrlaFG_Combo[] = {FG_A, FG_I, FG_T, COMBO_END}; +//const uint16_t PROGMEM ctrlalt_Combo[] = {FG_A, FG_I, FG_T, COMBO_END}; combo_t key_combos[] = { [R_BKSPC] = COMBO(bkspc_combo_d, KC_BSPC), @@ -67,7 +68,7 @@ combo_t key_combos[] = { [PANIC] = COMBO(panic_combo, RAZ), [NUMWRD] = COMBO(numword_combo, NUMWORD), [ALTTAB] = COMBO(alttab_combo, KC_NO), - [CTRLALT] = COMBO(ctrlaFG_Combo, RCTL(RALT(KC_DEL))) + //[CTRLALT] = COMBO(ctrlalt_Combo, RCTL(RALT(KC_DEL))) }; /* uint16_t get_combo_term(uint16_t combo_index, combo_t *combo) { @@ -120,13 +121,15 @@ bool process_combo_key_repress(uint16_t combo_index, combo_t *combo, uint8_t key switch (combo_index) { case ALTTAB: switch (keycode) { - case FG_Y: - tap_code16(S(KC_TAB)); - return true; - case FG_D: - tap_code(KC_TAB); - return true; + case FG_Y: + tap_code16(S(KC_TAB)); + return true; + case FG_D: + tap_code(KC_TAB); + return true; } + break; + } return false; } \ No newline at end of file diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c index b5c44377..b680bbf7 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c @@ -37,7 +37,7 @@ bool isLetter(uint16_t keycode) { bool isSendStringMacro(uint16_t keycode) { switch (keycode) { - case AGRV_SPC: + //case AGRV_SPC: case OU_GRV: case MAGIC: return true; @@ -217,6 +217,9 @@ uint16_t get_alt_repeat_key_keycode_user(uint16_t keycode, uint8_t mods) { case C(FG_Y): return C(FG_Z); } + if ((get_mods() | get_weak_mods()) & MOD_BIT(KC_ALGR)) { + return KC_SPC; + } keycode = tap_hold_extractor(keycode); if (isLetter(keycode)) { return MAGIC; } diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c index c0c5dfd4..e97c669e 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c @@ -224,8 +224,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_NUMBERS] = LAYOUT( _______, _______, FG_ASTX, FG_EGAL, KC_7, FG_PERC, S(FG_ACIR), _______, FG_PLUS, FG_MOIN, _______, _______, - _______, KC_6, KC_4, KC_2, MT_SLSH, _______, FG_CARN, MT_1, KC_3, KC_5, KC_7, _______, - _______, _______, _______, _______, KC_8, _______, _______, _______, _______, _______, _______, KC_9, KC_6, _______, FG_ODK, _______, + _______, KC_4, KC_3, KC_2, MT_1, _______, FG_CARN, MT_SLSH, KC_6, KC_7, KC_8, _______, + _______, _______, _______, _______, KC_5, _______, _______, _______, _______, _______, _______, KC_9, KC_6, _______, FG_ODK, _______, _______, _______, KC_PDOT, KC_0 , NUMWORD, LT_REPT, KC_SPC, _______, _______, _______ ), @@ -245,10 +245,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' `----------------------------------' */ [_ODK] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, OU_GRV, _______, _______, FG_3PTS, _______, _______, FG_J, FG_D, FG_AROB, _______, _______, - _______, _______, _______, _______, FG_F, _______, _______, _______, _______, _______, _______, FG_CCED, _______, FG_K, CNL_ODK, _______, - _______, _______, _______, _______, FG_ECIR, _______, AGRV_SPC, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, OU_GRV, _______, _______, FG_3PTS, _______, _______, FG_J, FG_D, FG_AROB, _______, _______, + _______, _______, _______, _______, FG_F, _______, _______, _______, _______, _______, _______, FG_CCED, _______, FG_K, CNL_ODK, _______, + _______, _______, _______, _______, FG_ECIR, _______, _______, _______, _______, _______ ), @@ -267,9 +267,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' `----------------------------------' */ [_SHORTNAV] = LAYOUT( - _______, KC_BSPC, LWIN(KC_TAB), LWIN(FG_V), RCS(FG_V), _______, KC_PGUP, C(KC_LEFT), KC_UP, C(KC_RGHT), _______, _______, - _______, C(FG_A), C(FG_X), C(FG_V), SFT_T(COPY), _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F2 , _______, - _______, KC_SPC, KC_SPC, KC_SPC, C(FG_Z), C(FG_Y), _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, + _______, KC_BSPC, LWIN(KC_TAB), LWIN(FG_V), RCS(FG_V), KC_VOLU, KC_PGUP, C(KC_LEFT), KC_UP, C(KC_RGHT), _______, _______, + _______, C(FG_A), C(FG_X), C(FG_V), SFT_T(COPY), KC_VOLD, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_F2 , _______, + _______, KC_SPC, KC_SPC, KC_MUTE, C(FG_Z), C(FG_Y), _______, _______, _______, _______, _______, C(KC_PGUP), C(KC_PGDN), C(FG_W), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -290,7 +290,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FUNCAPPS] = LAYOUT( _______, KC_F12, KC_F9, KC_F8, KC_F7, QK_BOOT, _______, SWIN(KC_LEFT), LWIN(KC_UP), SWIN(KC_RIGHT), KC_NUM, _______, _______, KC_F11, KC_F6, KC_F5, SFT_T(KC_F4), C(KC_PAUS), TT_FA, LWIN(KC_LEFT), RCTL_T(FEN_B), LWIN(KC_RIGHT), A(KC_ESC), _______, - _______, ALT_T(KC_F10), KC_F3, KC_F2, KC_F1, _______, _______, _______, _______, _______, _______, C(KC_PGUP), A(KC_ESC), C(KC_PGDN), _______, _______, + _______, ALT_T(KC_F10), KC_F3, KC_F2, KC_F1, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),