From 984cab17e8053d381290a7dca4ae8bd197204736 Mon Sep 17 00:00:00 2001 From: Kawamashi Date: Tue, 1 Apr 2025 09:39:58 +0200 Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20branche?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rev1/base/keymaps/Kawamashi/clever_keys.c | 3 +- .../features/clever_keys_utilities.c | 1 + .../base/keymaps/Kawamashi/features/combos.c | 2 + .../base/keymaps/Kawamashi/features/macros.c | 20 --- .../base/keymaps/Kawamashi/features/oneshot.h | 1 + .../Kawamashi/features/typo_layer - 1.c | 167 +++++++++++++++++ .../Kawamashi/features/typo_layer - 2.c | 169 ++++++++++++++++++ .../Kawamashi/features/typo_layer - old.c | 124 +++++++++++++ .../keymaps/Kawamashi/features/typo_layer.c | 2 +- .../keymaps/Kawamashi/features/typo_layer.h | 3 +- .../base/keymaps/Kawamashi/features_conf.c | 2 +- .../rev1/base/keymaps/Kawamashi/keymap.c | 4 +- .../rev1/base/keymaps/Kawamashi/keymap.h | 3 +- .../rev1/base/keymaps/Kawamashi/rules.mk | 1 + 14 files changed, 475 insertions(+), 27 deletions(-) create mode 100644 keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - 1.c create mode 100644 keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - 2.c create mode 100644 keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - old.c 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 577cb30f..16be104c 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/clever_keys.c @@ -33,6 +33,7 @@ bool clever_key_finder(uint16_t next_keycode, keyrecord_t* record) { case FG_2PTS: // Add space between punctuation and letters. invoke_key(KC_SPC, record); + //if (next_keycode == FG_J) { layer_on(_TYPO); } case KC_SPC: switch (recent[RECENT_SIZE - 2]) { @@ -260,7 +261,7 @@ bool clever_key_finder(uint16_t next_keycode, keyrecord_t* record) { case OU_GRV: layer_off(_TYPO); - return finish_word((uint16_t[]) {FG_O, FG_TYPO, FG_D}, 3, record); + return finish_word((uint16_t[]) {FG_O, FG_TYPO, FG_T}, 3, record); case AGRV_SPC: /* const bool is_shifted = (get_mods() | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT; 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 8fc0ba28..0bde9ca9 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 @@ -141,6 +141,7 @@ void process_key(uint16_t keycode, keyrecord_t* record) { void invoke_key(uint16_t keycode, keyrecord_t* record) { process_key(keycode, record); + //record->keycode = keycode; bkspc_countdown = 1; } 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 34b7ab35..877e8b5d 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/combos.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/combos.c @@ -89,6 +89,8 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode case R_BKSPC: case BK_WORD: case ENTER: + case HOME: + case END: return true; default: diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/macros.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/macros.c index 075c76fc..10eba081 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/macros.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/macros.c @@ -28,26 +28,6 @@ bool process_macros(uint16_t keycode, keyrecord_t *record) { case REV_TAB: return process_swapper(S(KC_TAB)); */ -/* case OS_TYPO: - if ((get_mods() | get_weak_mods() | get_oneshot_mods()) & MOD_BIT(KC_ALGR)) { - tap_code16(ALGR(FG_TYPO)); - return false; - } - is_typo_shifted = (get_mods() | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT; - if (is_typo_shifted) { - del_weak_mods(MOD_MASK_SHIFT); - unregister_mods(MOD_MASK_SHIFT); - del_oneshot_mods(MOD_BIT(KC_LSFT)); - } - return true; */ -/* case FG_TYPO: - if ((get_mods() | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) { - del_weak_mods(MOD_MASK_SHIFT); - del_oneshot_mods(MOD_MASK_SHIFT); - unregister_mods(MOD_MASK_SHIFT); - } - return true; */ - case AIDE_MEM: switch(get_highest_layer(layer_state|default_layer_state)) { case _BASE: diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/oneshot.h b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/oneshot.h index a6b8e177..0738ece5 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/oneshot.h +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/oneshot.h @@ -6,6 +6,7 @@ typedef enum { os_up_unqueued, os_up_queued, + //os_up_queued_used, os_down_unused, os_down_used, } oneshot_state; diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - 1.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - 1.c new file mode 100644 index 00000000..fe2b4d2d --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - 1.c @@ -0,0 +1,167 @@ +/* Copyright 2025 @Kawamashi + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + #include "typo_layer.h" + //#include "print.h" + + oneshot_state os_typo_state = os_up_unqueued; + static bool is_shifted = false; + //static uint16_t typo_keycode = KC_NO; +//bool exit_typo = false; + +bool update_oneshot_typo(oneshot_state *state, uint16_t keycode, keyrecord_t *record) { + + const uint8_t mods = get_mods() | get_weak_mods() | get_oneshot_mods(); + + if (keycode == OS_TYPO) { + // Handle the custom OSL that go with this feature + // It's timerless, to avoid problems when rolling with an other key, when shift is on. + if (record->event.pressed) { // On press + // Custom behaviour when alt-gr + if (mods & MOD_BIT(KC_ALGR)) { + tap_code16(ALGR(FG_TYPO)); + return false; + } + is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } + layer_on(_TYPO); + //*state = os_down_unused; + *state = os_up_queued; + return false; + } else { // On release + return true; + } + + //} else if (keycode == CNL_TYPO) { + + + } else if (keycode == FG_TYPO) { + // Special behaviour of FR_TYPO when shifted + // Shift must apply to the next keycode +/* is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } */ + //tap_code(FR_TYPO); + *state = os_up_queued; + return true; + + } else { + if (record->event.pressed) { + uint8_t key_layer = read_source_layers_cache(record->event.key); + if (key_layer == _TYPO) { + // On non-ignored keyup, consider the oneshot used. + switch (*state) { +/* case os_down_unused: + *state = os_down_used; + dprintf("key down, layer: %d, os_down_unused -> os_down_used\n", _TYPO); + return true; */ + case os_up_queued: + *state = os_up_queued_used; + dprintf("key down, layer: %d, os_up_queued -> os_up_queued_used\n", _TYPO); + return true; + case os_up_queued_used: + *state = os_up_unqueued; + layer_off(_TYPO); + dprintf("key down (off), layer: %d, os_up_queued_used -> os_up_unqueued\n", _TYPO); + //return false; + default: + break; + } + } + } else { + // Ignore key ups from other layers + uint8_t key_layer = read_source_layers_cache(record->event.key); + if (key_layer == _TYPO) { + // On non-ignored keyup, consider the oneshot used. + switch (*state) { + case os_up_queued: + *state = os_up_unqueued; + layer_off(_TYPO); + dprintf("key up (off), layer: %d, os_up_queued -> os_up_unqueued\n", _TYPO); + return true; + case os_up_queued_used: + *state = os_up_unqueued; + layer_off(_TYPO); + dprintf("key up (off), layer: %d, os_up_queued_used -> os_up_unqueued\n", _TYPO); + return true; + default: + break; + } + } + } + } + return true; +} + +bool process_typo_layer(uint16_t keycode, keyrecord_t *record) { + + //if (keycode == FG_TYPO) { return true; } + + if (!update_oneshot_typo(&os_typo_state, keycode, record)) { return false; } + + + if (IS_LAYER_ON(_TYPO)) { + if (record->event.pressed) { // On press + + switch (keycode) { + case FG_AROB: + case FG_K: + case FG_J: + case OU_GRV: + case FG_CCED: + case AGRV_SPC: + case KC_SPC: // When space is added by Clever Keys + case CNL_TYPO: + break; + + default: +/* is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } */ + tap_code(FG_TYPO); + } + if (!IS_LAYER_ON(_APOS_DR)) { + switch (keycode) { + case FG_M: + case FG_L: + is_shifted = true; + } + } + if (is_shifted) { + //set_mods(mods); + set_oneshot_mods(MOD_BIT(KC_LSFT)); + is_shifted = false; + } + //exit_typo = true; + } + } + return true; +} + +/* void typo_layer_off(void) { + layer_off(_TYPO); + exit_typo = false; +} */ \ No newline at end of file diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - 2.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - 2.c new file mode 100644 index 00000000..637c8e25 --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - 2.c @@ -0,0 +1,169 @@ +/* Copyright 2025 @Kawamashi + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + #include "typo_layer.h" + //#include "print.h" + + oneshot_state os_typo_state = os_up_unqueued; + static bool is_shifted = false; + //static uint16_t typo_keycode = KC_NO; +//bool exit_typo = false; + +bool update_oneshot_typo(oneshot_state *state, uint16_t keycode, keyrecord_t *record) { + + const uint8_t mods = get_mods() | get_weak_mods() | get_oneshot_mods(); + + if (keycode == OS_TYPO) { + // Handle the custom OSL that go with this feature + // It's timerless, to avoid problems when rolling with an other key, when shift is on. + if (record->event.pressed) { // On press + // Custom behaviour when alt-gr + if (mods & MOD_BIT(KC_ALGR)) { + tap_code16(ALGR(FG_TYPO)); + return false; + } + is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } + layer_on(_TYPO); + //*state = os_down_unused; + *state = os_up_queued; + return false; + } else { // On release + return true; + } + + //} else if (keycode == CNL_TYPO) { + + + } else if (keycode == FG_TYPO) { + // Special behaviour of FR_TYPO when shifted + // Shift must apply to the next keycode +/* is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } */ + //tap_code(FR_TYPO); + //*state = os_up_queued; + return true; + + } else { + if (record->event.pressed) { + //uint8_t key_layer = read_source_layers_cache(record->event.key); + //if (key_layer == _TYPO) { + if (IS_LAYER_ON(_TYPO)) { + // On non-ignored keyup, consider the oneshot used. + switch (*state) { +/* case os_down_unused: + *state = os_down_used; + dprintf("key down, layer: %d, os_down_unused -> os_down_used\n", _TYPO); + return true; */ + case os_up_queued: + *state = os_up_queued_used; + dprintf("key down, layer: %d, os_up_queued -> os_up_queued_used\n", _TYPO); + return true; + case os_up_queued_used: + *state = os_up_unqueued; + layer_off(_TYPO); + dprintf("key down (off), layer: %d, os_up_queued_used -> os_up_unqueued\n", _TYPO); + //return false; + default: + break; + } + } + } else { + // Ignore key ups from other layers + //uint8_t key_layer = read_source_layers_cache(record->event.key); + //if (key_layer == _TYPO) { + if (IS_LAYER_ON(_TYPO)) { + // On non-ignored keyup, consider the oneshot used. + switch (*state) { + case os_up_queued: + *state = os_up_unqueued; + layer_off(_TYPO); + dprintf("key up (off), layer: %d, os_up_queued -> os_up_unqueued\n", _TYPO); + return true; + case os_up_queued_used: + *state = os_up_unqueued; + layer_off(_TYPO); + dprintf("key up (off), layer: %d, os_up_queued_used -> os_up_unqueued\n", _TYPO); + return true; + default: + break; + } + } + } + } + return true; +} + +bool process_typo_layer(uint16_t keycode, keyrecord_t *record) { + + //if (keycode == FG_TYPO) { return true; } + + if (!update_oneshot_typo(&os_typo_state, keycode, record)) { return false; } + + + if (IS_LAYER_ON(_TYPO)) { + if (record->event.pressed) { // On press + + switch (keycode) { + case FG_AROB: + case FG_K: + case FG_J: + case OU_GRV: + case FG_CCED: + case AGRV_SPC: + case KC_SPC: // When space is added by Clever Keys + case CNL_TYPO: + break; + + default: +/* is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } */ + tap_code(FG_TYPO); + } + if (!IS_LAYER_ON(_APOS_DR)) { + switch (keycode) { + case FG_M: + case FG_L: + is_shifted = true; + } + } + if (is_shifted) { + //set_mods(mods); + set_oneshot_mods(MOD_BIT(KC_LSFT)); + is_shifted = false; + } + //exit_typo = true; + } + } + return true; +} + +/* void typo_layer_off(void) { + layer_off(_TYPO); + exit_typo = false; +} */ \ No newline at end of file diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - old.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - old.c new file mode 100644 index 00000000..ce07fbea --- /dev/null +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer - old.c @@ -0,0 +1,124 @@ +/* Copyright 2025 @Kawamashi + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + #include "typo_layer.h" + + static uint16_t typo_keycode = KC_NO; +//bool exit_typo = false; + +bool process_typo(uint16_t keycode, keyrecord_t *record) { + + if (record->event.pressed) { // On press + + const uint8_t mods = get_mods() | get_weak_mods() | get_oneshot_mods(); + static bool is_shifted = false; + + if (keycode == OS_TYPO) { + // Handle the custom OSL that go with this feature + // It's timerless, to avoid problems when rolling with an other key, when shift is on. + // Custom behaviour when alt-gr + if (mods & MOD_BIT(KC_ALGR)) { + tap_code16(ALGR(FG_TYPO)); + return false; + } + is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } + layer_on(_TYPO); + return false; + + } else if (keycode == FG_TYPO) { + // Special behaviour of FR_TYPO when shifted + // Shift must apply to the next keycode +/* is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } */ + //tap_code(FR_TYPO); + return true; + + } else if (IS_LAYER_ON(_TYPO)) { + if (typo_keycode == KC_NO) { + typo_keycode = keycode; + //if (!IS_QK_USER(keycode)) { typo_keycode = keycode; } + } else { + // if another key is tapped when the 1st one is not released yet. + layer_off(_TYPO); + //typo_keycode = KC_NO; + return true; + } + + switch (keycode) { + case FG_AROB: + case FG_K: + case FG_J: + case OU_GRV: + case FG_CCED: + case AGRV_SPC: + case KC_SPC: // When space is added by Clever Keys + case CNL_TYPO: + break; + + default: +/* is_shifted = mods & MOD_MASK_SHIFT; + if (is_shifted) { + del_weak_mods(MOD_MASK_SHIFT); + del_oneshot_mods(MOD_MASK_SHIFT); + unregister_mods(MOD_MASK_SHIFT); + } */ + tap_code(FG_TYPO); + } + if (!IS_LAYER_ON(_APOS_DR)) { + switch (keycode) { + case FG_M: + case FG_L: + is_shifted = true; + } + } + if (is_shifted) { + //set_mods(mods); + set_oneshot_mods(MOD_BIT(KC_LSFT)); + is_shifted = false; + } + //exit_typo = true; + } else { + typo_keycode = KC_NO; + } + } else { // On release + switch (keycode) { + case OS_TYPO: + case FG_TYPO: + break; + default: + //if (exit_typo) { typo_layer_off(); } + if (keycode == typo_keycode) { + layer_off(_TYPO); + typo_keycode = KC_NO; + } + } + } + return true; +} + +/* void typo_layer_off(void) { + layer_off(_TYPO); + exit_typo = false; +} */ \ No newline at end of file diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer.c index 4ff39d80..1643f40f 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer.c @@ -19,7 +19,7 @@ bool exit_typo = false; -bool process_typo(uint16_t keycode, keyrecord_t *record) { +bool process_typo_layer(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { // On press diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer.h b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer.h index 5c3b7dfb..15e329ab 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer.h +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features/typo_layer.h @@ -28,7 +28,8 @@ extern bool exit_typo; void typo_layer_off(void); -bool process_typo(uint16_t keycode, keyrecord_t *record); +//bool update_oneshot_typo(oneshot_state *state, uint16_t keycode, keyrecord_t *record); +bool process_typo_layer(uint16_t keycode, keyrecord_t *record); #ifdef __cplusplus } 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 c9091707..c6eedd95 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/features_conf.c @@ -69,7 +69,7 @@ bool caps_word_press_user(uint16_t keycode) { case FG_H: return true; case FG_U: - case FG_T: + case FG_D: case FG_G: case FG_B: case FG_F: diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c index 698d130b..e2053084 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.c @@ -98,7 +98,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (!process_custom_tap_hold(keycode, record)) { return false; } // Custom behaviour of the typo dead-key - if (!process_typo(keycode, record)) { return false; } + if (!process_typo_layer(keycode, record)) { return false; } // Macros if (!process_macros(keycode, record)) { return false; } @@ -245,7 +245,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_TYPO] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, OU_GRV, _______, _______, FG_U, _______, _______, FG_J, FG_T, FG_AROB, _______, _______, + _______, OU_GRV, _______, _______, FG_U, _______, _______, FG_J, FG_D, FG_AROB, _______, _______, _______, _______, _______, _______, FG_F, _______, _______, _______, _______, _______, _______, FG_CCED, _______, FG_K, CNL_TYPO, _______, _______, _______, _______, _______, FG_O, _______, AGRV_SPC, _______, _______, _______ ), diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h index 53b06cdf..ab92dc2e 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/keymap.h @@ -58,7 +58,7 @@ enum custom_keycodes { O_CIRC, U_CIRC, I_TREM, */ - CA_CED, + //CA_CED, /* CIRC, TILDE, GRAVE, */ @@ -82,6 +82,7 @@ enum custom_keycodes { #define TG_APOD TG(_APOS_DR) #define MT_SLSH SFT_T(FG_SLSH) #define MT_1 SFT_T(KC_1) +//#define OS_TYPO OSL(_TYPO) // One shot mods #define L_OS4A LSFT_T(OS4A) diff --git a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/rules.mk b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/rules.mk index ea0b060a..6b5de1f1 100644 --- a/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/rules.mk +++ b/keyboards/splitkb/kyria/rev1/base/keymaps/Kawamashi/rules.mk @@ -11,6 +11,7 @@ RGBLIGHT_ENABLE = no # Disable keyboard RGB underglow #OLED_DRIVER = ssd1306 # Enables the use of OLED displays #OLED_DRIVER_ENABLE = yes # Enables the use of OLED displays +#CONSOLE_ENABLE = yes LTO_ENABLE = yes