qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-29 13:30:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot
2024-01-09 11:07:41 +00:00
parent f5fa2cdafb 1f6dfd19cf
commit 8b3243708a
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quantum/process_keycode/process_caps_word.c
+4
View File
@@ -14,6 +14,7 @@
#include "process_caps_word.h"
#include "process_auto_shift.h"
#include "process_space_cadet.h"
#include "caps_word.h"
#include "keycodes.h"
#include "quantum_keycodes.h"
@@ -110,6 +111,9 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
# endif // COMMAND_ENABLE
) {
caps_word_on();
# ifdef SPACE_CADET_ENABLE
reset_space_cadet();
# endif // SPACE_CADET_ENABLE
}
# endif // defined(COMMAND_ENABLE) && !defined(IS_COMMAND)
#endif // BOTH_SHIFTS_TURNS_ON_CAPS_WORD
quantum/process_keycode/process_space_cadet.c
+5 -1
View File
@@ -157,10 +157,14 @@ bool process_space_cadet(uint16_t keycode, keyrecord_t *record) {
}
default: {
if (record->event.pressed) {
sc_last = 0;
reset_space_cadet();
}
break;
}
}
return true;
}
void reset_space_cadet() {
sc_last = 0;
}
quantum/process_keycode/process_space_cadet.h
+1
View File
@@ -21,3 +21,4 @@
void perform_space_cadet(keyrecord_t *record, uint16_t sc_keycode, uint8_t holdMod, uint8_t tapMod, uint8_t keycode);
bool process_space_cadet(uint16_t keycode, keyrecord_t *record);
void reset_space_cadet(void);