diff options
| author | Joel Challis <[email protected]> | 2021-07-28 12:01:49 +0100 | 
|---|---|---|
| committer | GitHub <[email protected]> | 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 fe43eacc40..8b45a94043 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,      return true;  } -void matrix_scan_key_override(void) { +void key_override_task(void) {      if (deferred_register == 0) {          return;      } diff --git a/quantum/process_keycode/process_key_override.h b/quantum/process_keycode/process_key_override.h index 9ba59e4e9b..fd76f297a8 100644 --- a/quantum/process_keycode/process_key_override.h +++ b/quantum/process_keycode/process_key_override.h @@ -92,16 +92,22 @@ typedef struct {  extern const key_override_t **key_overrides;  /** Turns key overrides on */ -extern void key_override_on(void); +void key_override_on(void);  /** Turns key overrides off */ -extern void key_override_off(void); +void key_override_off(void);  /** Toggles key overrides on */ -extern void key_override_toggle(void); +void key_override_toggle(void);  /** Returns whether key overrides are enabled */ -extern bool key_override_is_enabled(void); +bool key_override_is_enabled(void); + +/** Handling of key overrides and its implemented keycodes */ +bool process_key_override(const uint16_t keycode, const keyrecord_t *const record); + +/** Perform any deferred keys */ +void key_override_task(void);  /**   *  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 1d0e134a19..0000000000 --- a/quantum/process_keycode/process_key_override_private.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2021 Jonas Gessner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program.  If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include <stdint.h> -#include "action.h" - -bool process_key_override(const uint16_t keycode, const keyrecord_t *const record); -void matrix_scan_key_override(void); | 
