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

[Core] Add Caps Word feature to core #16588

Merged
merged 14 commits into from
May 14, 2022
Merged

[Core] Add Caps Word feature to core #16588

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
98d6dc7
Add Caps Word feature to core
getreuer Mar 8, 2022
2efa493
Fix formatting
getreuer Mar 8, 2022
373d6ef
Check for conflict between Caps Word and Command.
getreuer Mar 9, 2022
b0f3069
Revise command conflict check.
getreuer Mar 10, 2022
eb7ce9d
Fix formatting
getreuer Mar 10, 2022
3f202f9
Add Caps Word unit test, fix bug with Space Cadet.
getreuer Mar 19, 2022
6268535
Format test_caps_word.cpp
getreuer Mar 19, 2022
3bb4062
Merge branch 'develop' into core/caps_word
drashna Mar 20, 2022
b3e8573
Fix formatting
getreuer Mar 21, 2022
8b1b345
Use dynamic tapping term if it is enabled.
getreuer Apr 13, 2022
1bf988b
Merge branch 'develop' into core/caps_word
drashna Apr 17, 2022
da8840e
Use GET_TAPPING_TERM, following #16681
getreuer Apr 17, 2022
9fb9177
Remove redundant keycode comment
getreuer Apr 17, 2022
8437439
Add info.json support
getreuer Apr 19, 2022
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
4 changes: 4 additions & 0 deletions quantum/keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,10 @@ void quantum_task(void) {
#ifdef CAPS_WORD_ENABLE
caps_word_task();
#endif

#ifdef SECURE_ENABLE
secure_task();
#endif
}

/** \brief Keyboard task: Do keyboard routine jobs
Expand Down
8 changes: 6 additions & 2 deletions quantum/quantum_keycodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,13 @@ enum quantum_keycodes {

QK_MAKE,

// Caps Word
CAPS_WORD,
SECURE_LOCK,
SECURE_UNLOCK,
SECURE_TOGGLE,

// Caps Word
CAPS_WORD,
getreuer marked this conversation as resolved.
Show resolved Hide resolved

// Start of custom keycode range for keyboards and keymaps - always leave at the end
SAFE_RANGE
};
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.