diff options
| author | Drashna Jaelre <drashna@live.com> | 2020-03-22 06:29:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 00:29:05 +1100 |
| commit | 5117dff6a26aec4eca04fb9787b4f428884739bc (patch) | |
| tree | ecc94acb888c3ed330c11008fa6324b1d73b12cc /tmk_core | |
| parent | e5d34fd084a7bdde0867749470b27c50e8144eb8 (diff) | |
| download | qmk_firmware-5117dff6a26aec4eca04fb9787b4f428884739bc.tar.gz qmk_firmware-5117dff6a26aec4eca04fb9787b4f428884739bc.zip | |
Add Post Processing to process_record (#4892)
* Improve process_record system
Code based on @colinta's
* Rename and better handle functions
* Fix incorrect function call to process_record_user
* Add documentation for post_process_record
* Add both get_event_keycode and get_record_keycode functions
And add some comments about these functions
* Update code format
* Cleanup merge artifacts
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/action.c | 8 | ||||
| -rw-r--r-- | tmk_core/common/action.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 174faf856..19c3569d5 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c | |||
| @@ -151,6 +151,8 @@ void process_record_nocache(keyrecord_t *record) { process_record(record); } | |||
| 151 | 151 | ||
| 152 | __attribute__((weak)) bool process_record_quantum(keyrecord_t *record) { return true; } | 152 | __attribute__((weak)) bool process_record_quantum(keyrecord_t *record) { return true; } |
| 153 | 153 | ||
| 154 | __attribute__((weak)) void post_process_record_quantum(keyrecord_t *record) {} | ||
| 155 | |||
| 154 | #ifndef NO_ACTION_TAPPING | 156 | #ifndef NO_ACTION_TAPPING |
| 155 | /** \brief Allows for handling tap-hold actions immediately instead of waiting for TAPPING_TERM or another keypress. | 157 | /** \brief Allows for handling tap-hold actions immediately instead of waiting for TAPPING_TERM or another keypress. |
| 156 | * | 158 | * |
| @@ -185,6 +187,11 @@ void process_record(keyrecord_t *record) { | |||
| 185 | 187 | ||
| 186 | if (!process_record_quantum(record)) return; | 188 | if (!process_record_quantum(record)) return; |
| 187 | 189 | ||
| 190 | process_record_handler(record); | ||
| 191 | post_process_record_quantum(record); | ||
| 192 | } | ||
| 193 | |||
| 194 | void process_record_handler(keyrecord_t *record) { | ||
| 188 | action_t action = store_or_get_action(record->event.pressed, record->event.key); | 195 | action_t action = store_or_get_action(record->event.pressed, record->event.key); |
| 189 | dprint("ACTION: "); | 196 | dprint("ACTION: "); |
| 190 | debug_action(action); | 197 | debug_action(action); |
| @@ -988,7 +995,6 @@ bool is_tap_action(action_t action) { | |||
| 988 | * FIXME: Needs documentation. | 995 | * FIXME: Needs documentation. |
| 989 | */ | 996 | */ |
| 990 | void debug_event(keyevent_t event) { dprintf("%04X%c(%u)", (event.key.row << 8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time); } | 997 | void debug_event(keyevent_t event) { dprintf("%04X%c(%u)", (event.key.row << 8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time); } |
| 991 | |||
| 992 | /** \brief Debug print (FIXME: Needs better description) | 998 | /** \brief Debug print (FIXME: Needs better description) |
| 993 | * | 999 | * |
| 994 | * FIXME: Needs documentation. | 1000 | * FIXME: Needs documentation. |
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h index 15f4ce15c..dd22023f9 100644 --- a/tmk_core/common/action.h +++ b/tmk_core/common/action.h | |||
| @@ -84,6 +84,8 @@ void process_hand_swap(keyevent_t *record); | |||
| 84 | 84 | ||
| 85 | void process_record_nocache(keyrecord_t *record); | 85 | void process_record_nocache(keyrecord_t *record); |
| 86 | void process_record(keyrecord_t *record); | 86 | void process_record(keyrecord_t *record); |
| 87 | void process_record_handler(keyrecord_t *record); | ||
| 88 | void post_process_record_quantum(keyrecord_t *record); | ||
| 87 | void process_action(keyrecord_t *record, action_t action); | 89 | void process_action(keyrecord_t *record, action_t action); |
| 88 | void register_code(uint8_t code); | 90 | void register_code(uint8_t code); |
| 89 | void unregister_code(uint8_t code); | 91 | void unregister_code(uint8_t code); |
