diff options
| author | Drashna Jael're <drashna@live.com> | 2022-05-29 15:38:33 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-05-29 15:38:33 -0700 |
| commit | 30aac80d5a6d8c6f7c06efb49189d748e70edc4a (patch) | |
| tree | ceb11968ae41228e4b110c07467cdca7cc9cff22 /quantum/keymap.h | |
| parent | 67f4e5f34489abf986dedb4984b256692086c615 (diff) | |
| parent | e22a183329fd05d39f88bb9dfebe98cfa7cd8402 (diff) | |
Merge remote-tracking branch 'qmk 0.17.0' into firmware21
Diffstat (limited to 'quantum/keymap.h')
| -rw-r--r-- | quantum/keymap.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index 2ee2e1b576..d64b271efb 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -32,6 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #include "print.h" #include "debug.h" #include "keycode_config.h" +#include "gpio.h" // for pin_t // ChibiOS uses RESET in its FlagStatus enumeration // Therefore define it as QK_BOOTLOADER here, to avoid name collision @@ -49,3 +50,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; + +#ifdef ENCODER_MAP_ENABLE +// Ensure we have a forward declaration for the encoder map +# include "encoder.h" +#endif |