diff options
author | Joel Challis <git@zvecr.com> | 2021-07-28 12:01:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 12:01:49 +0100 |
commit | 4ef8ff458d7dcf49a288bb484323ab2098a21ef9 (patch) | |
tree | e0b8e423300a2375ce0f66f301c57d25e01e6c02 /quantum/process_keycode | |
parent | 50964ae82160921f2c442e18c1ffc15316c29815 (diff) | |
download | qmk_firmware-4ef8ff458d7dcf49a288bb484323ab2098a21ef9.tar.gz qmk_firmware-4ef8ff458d7dcf49a288bb484323ab2098a21ef9.zip |
Minor tidy up of key overrides (#13747)
* Minor tidy up of key overrides
* Update quantum/quantum.c
* Update quantum/quantum.c
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r-- | quantum/process_keycode/process_key_override.c | 2 | ||||
-rw-r--r-- | quantum/process_keycode/process_key_override.h | 14 | ||||
-rw-r--r-- | quantum/process_keycode/process_key_override_private.h | 24 |
3 files changed, 11 insertions, 29 deletions
diff --git a/quantum/process_keycode/process_key_override.c b/quantum/process_keycode/process_key_override.c index fe43eacc4..8b45a9404 100644 --- a/quantum/process_keycode/process_key_override.c +++ b/quantum/process_keycode/process_key_override.c | |||
@@ -380,7 +380,7 @@ static bool try_activating_override(const uint16_t keycode, const uint8_t layer, | |||
380 | return true; | 380 | return true; |
381 | } | 381 | } |
382 | 382 | ||
383 | void matrix_scan_key_override(void) { | 383 | void key_override_task(void) { |
384 | if (deferred_register == 0) { | 384 | if (deferred_register == 0) { |
385 | return; | 385 | return; |
386 | } | 386 | } |
diff --git a/quantum/process_keycode/process_key_override.h b/quantum/process_keycode/process_key_override.h index 9ba59e4e9..fd76f297a 100644 --- a/quantum/process_keycode/process_key_override.h +++ b/quantum/process_keycode/process_key_override.h | |||
@@ -92,16 +92,22 @@ typedef struct { | |||
92 | extern const key_override_t **key_overrides; | 92 | extern const key_override_t **key_overrides; |
93 | 93 | ||
94 | /** Turns key overrides on */ | 94 | /** Turns key overrides on */ |
95 | extern void key_override_on(void); | 95 | void key_override_on(void); |
96 | 96 | ||
97 | /** Turns key overrides off */ | 97 | /** Turns key overrides off */ |
98 | extern void key_override_off(void); | 98 | void key_override_off(void); |
99 | 99 | ||
100 | /** Toggles key overrides on */ | 100 | /** Toggles key overrides on */ |
101 | extern void key_override_toggle(void); | 101 | void key_override_toggle(void); |
102 | 102 | ||
103 | /** Returns whether key overrides are enabled */ | 103 | /** Returns whether key overrides are enabled */ |
104 | extern bool key_override_is_enabled(void); | 104 | bool key_override_is_enabled(void); |
105 | |||
106 | /** Handling of key overrides and its implemented keycodes */ | ||
107 | bool process_key_override(const uint16_t keycode, const keyrecord_t *const record); | ||
108 | |||
109 | /** Perform any deferred keys */ | ||
110 | void key_override_task(void); | ||
105 | 111 | ||
106 | /** | 112 | /** |
107 | * Preferrably use these macros to create key overrides. They fix many of the options to a standard setting that should satisfy most basic use-cases. Only directly create a key_override_t struct when you really need to. | 113 | * Preferrably use these macros to create key overrides. They fix many of the options to a standard setting that should satisfy most basic use-cases. Only directly create a key_override_t struct when you really need to. |
diff --git a/quantum/process_keycode/process_key_override_private.h b/quantum/process_keycode/process_key_override_private.h deleted file mode 100644 index 1d0e134a1..000000000 --- a/quantum/process_keycode/process_key_override_private.h +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2021 Jonas Gessner | ||
3 | * | ||
4 | * This program is free software: you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation, either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | */ | ||
17 | |||
18 | #pragma once | ||
19 | |||
20 | #include <stdint.h> | ||
21 | #include "action.h" | ||
22 | |||
23 | bool process_key_override(const uint16_t keycode, const keyrecord_t *const record); | ||
24 | void matrix_scan_key_override(void); | ||