From a4d1d8b7450e409d007f6e795ffb1cee42a8e511 Mon Sep 17 00:00:00 2001 From: Joshua Diamond Date: Tue, 6 Sep 2022 17:42:43 -0400 Subject: Resolve conflict merging master to develop (#18297) * Discourage use of ENCODER_MAP at keyboard level (#18286) * Discourage use of ENCODER_MAP at keyboard level * Update docs/feature_encoders.md Co-authored-by: Ryan Co-authored-by: Ryan * Fungo rev1: fix QMK Configurator key sequence (#18293) * info.json: correct JSON syntax; friendly formatting * info.json: fix key sequence Co-authored-by: Joel Challis Co-authored-by: Ryan Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- docs/feature_encoders.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/feature_encoders.md') diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md index f93ab9fd2d..60b613d6a5 100644 --- a/docs/feature_encoders.md +++ b/docs/feature_encoders.md @@ -69,7 +69,7 @@ Additionally, if one side does not have an encoder, you can specify `{}` for the ## Encoder map :id=encoder-map -Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your `rules.mk`: +Encoder mapping may be added to your `keymap.c`, which replicates the normal keyswitch layer handling functionality, but with encoders. Add this to your keymap's `rules.mk`: ```make ENCODER_MAP_ENABLE = yes @@ -88,6 +88,8 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { #endif ``` +?> This should only be enabled at the keymap level. + Using encoder mapping pumps events through the normal QMK keycode processing pipeline, resulting in a _keydown/keyup_ combination pushed through `process_record_xxxxx()`. To configure the amount of time between the encoder "keyup" and "keydown", you can add the following to your `config.h`: ```c -- cgit v1.2.3