Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Keymap] develop updates for Drashna Keymaps #18472

Merged
merged 1 commit into from
Sep 25, 2022
Merged

[Keymap] develop updates for Drashna Keymaps #18472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ MOUSEKEY_ENABLE = yes
NKRO_ENABLE = yes
CONSOLE_ENABLE = yes

AUTOCORRECTION_ENABLE = yes
AUTOCORRECT_ENABLE = yes

DEBOUNCE_TYPE = asym_eager_defer_pk
2 changes: 1 addition & 1 deletion keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SERIAL_DRIVER = usart
AUDIO_DRIVER = pwm_hardware
BACKLIGHT_DRIVER = pwm

AUTOCORRECTION_ENABLE = yes
AUTOCORRECT_ENABLE = yes
CAPS_WORD_ENABLE = yes
SWAP_HANDS_ENABLE = yes
TAP_DANCE_ENABLE = yes
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/keymaps/drashna/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SWAP_HANDS_ENABLE = no
AUTOCORRECTION_ENABLE = yes
AUTOCORRECT_ENABLE = yes
CAPS_WORD_ENABLE = yes
CONSOLE_ENABLE = yes
KEYLOGGER_ENABLE = no
Expand Down
6 changes: 3 additions & 3 deletions keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ OLED_ENABLE = yes
WPM_ENABLE = yes
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
AUTOCORRECTION_ENABLE = yes
AUTOCORRECT_ENABLE = yes
CAPS_WORD_ENABLE = yes
DEFERRED_EXEC_ENABLE = yes

Expand All @@ -20,7 +20,7 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
OLED_ENABLE = no
WPM_ENABLE = no
ENCODER_ENABLE = no
AUTOCORRECTION_ENABLE = no
AUTOCORRECT_ENABLE = no
LTO_SUPPORTED = yes
SWAP_HANDS_ENABLE = no
CUSTOM_UNICODE_ENABLE = no
Expand All @@ -29,7 +29,7 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
BOOTLOADER_SIZE = 512
endif
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
AUTOCORRECTION_ENABLE = no
AUTOCORRECT_ENABLE = no
CAPS_WORD_ENABLE = yes
endif
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
Expand Down
2 changes: 1 addition & 1 deletion keyboards/moonlander/keymaps/drashna/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ TAP_DANCE_ENABLE = yes
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
UNICODE_ENABLE = yes
UNICODEMAP_ENABLE = no
AUTOCORRECTION_ENABLE = yes
AUTOCORRECT_ENABLE = yes
CAPS_WORD_ENABLE = yes
2 changes: 1 addition & 1 deletion keyboards/splitkb/kyria/keymaps/drashna/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ifeq ($(strip $(KEYBOARD)), splitkb/kyria/rev1/proton_c)
SWAP_HANDS_ENABLE = yes
LTO_ENABLE = no
ENCODER_MAP_ENABLE = yes
AUTOCORRECTION_ENABLE = yes
AUTOCORRECT_ENABLE = yes
CAPS_WORD_ENABLE = yes
OLED_DRIVER = custom
else
Expand Down
2 changes: 1 addition & 1 deletion keyboards/work_louder/work_board/keymaps/drashna/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ NKRO_ENABLE = yes
RGBLIGHT_STARTUP_ANIMATION = yes
ENCODER_MAP_ENABLE = yes

AUTOCORRECTION_ENABLE = no
AUTOCORRECT_ENABLE = no
CUSTOM_UNICODE_ENABLE = no
2 changes: 1 addition & 1 deletion users/drashna/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void keyboard_post_init_user(void) {
keyboard_post_init_transport_sync();
#endif
#ifdef I2C_SCANNER_ENABLE
matrix_scan_i2c();
keyboard_post_init_i2c();
#endif

keyboard_post_init_keymap();
Expand Down
12 changes: 12 additions & 0 deletions users/drashna/drashna.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,15 @@ void keyboard_post_init_i2c(void) {
scan_timer = timer_read();
}
#endif

#if defined(AUTOCORRECT_ENABLE) && defined(AUDIO_ENABLE)
# ifdef USER_SONG_LIST
float autocorrect_song[][2] = SONG(MARIO_GAMEOVER);
# else
float autocorrect_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
# endif
bool apply_autocorrect(uint8_t backspaces, const char *str) {
PLAY_SONG(autocorrect_song);
return true;
}
#endif
Loading