summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-12-27 03:07:03 +0000
committerQMK Bot <hello@qmk.fm>2021-12-27 03:07:03 +0000
commitca5bd0aa2cde3854914286e343c551b922c3caee (patch)
treef5a848e12370f94073fdbd498a614766f816b98b
parenta1dd4f3c0fe64850a27d1bed38059a5a6c2438ac (diff)
parentb384599663bc45b3aa27c5f83e70bbf6be42d9ea (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/feature_combo.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index 0e7ebd6c3b..47128c431b 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -100,7 +100,7 @@ void process_combo_event(uint16_t combo_index, bool pressed) {
This will send "john.doe@example.com" if you chord E and M together, and clear the current line with Backspace and Left-Shift. You could change this to do stuff like play sounds or change settings.
-It is worth noting that `COMBO_ACTION`s are not needed anymore. As of [PR#8591](https://github.com/qmk/qmk_firmware/pull/8591/), it is possible to run your own custom keycodes from combos. Just define the custom keycode, program its functionality in `process_record_user`, and define a combo with `COMBO(<key_array>, <your_custom_keycode>)`.
+It is worth noting that `COMBO_ACTION`s are not needed anymore. As of [PR#8591](https://github.com/qmk/qmk_firmware/pull/8591/), it is possible to run your own custom keycodes from combos. Just define the custom keycode, program its functionality in `process_record_user`, and define a combo with `COMBO(<key_array>, <your_custom_keycode>)`. See the first example in [Macros](feature_macros.md).
## Keycodes
You can enable, disable and toggle the Combo feature on the fly. This is useful if you need to disable them temporarily, such as for a game. The following keycodes are available for use in your `keymap.c`