aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-05-19 04:44:03 +0000
committerQMK Bot <[email protected]>2024-05-19 04:44:03 +0000
commita76a6580f887b80d6076305b96be8ed2f231bda4 (patch)
tree41acc7cd447e3210e3490c476d391eecf25cf000 /docs
parenta29f665769ab79a119f0f3670734ff743c42e1a1 (diff)
parentdd56bee9e13979a140b2e691bf7ab8a0ec9a066d (diff)
downloadqmk_firmware-a76a6580f887b80d6076305b96be8ed2f231bda4.tar.gz
qmk_firmware-a76a6580f887b80d6076305b96be8ed2f231bda4.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs')
-rw-r--r--docs/feature_combo.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index 61f8b2ee19..496e97bd3c 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -17,11 +17,12 @@ combo_t key_combos[] = {
This will send "Escape" if you hit the A and B keys, and Ctrl+Z when you hit the C and D keys.
-## Mod-Tap Support
-[Mod-Tap](mod_tap.md) feature is also supported together with combos. You will need to use the full Mod-Tap keycode in the combo definition, e.g.:
+## Advanced Keycodes Support
+Advanced keycodes, such as [Mod-Tap](mod_tap.md) and [Tap Dance](feature_tap_dance.md) are also supported together with combos. If you use these advanced keycodes in your keymap, you will need to place the full keycode in the combo definition, e.g.:
```c
const uint16_t PROGMEM test_combo1[] = {LSFT_T(KC_A), LT(1, KC_B), COMBO_END};
+const uint16_t PROGMEM test_combo2[] = {TD(TD_ESC_CAPS), KC_F1, COMBO_END};
```
## Overlapping Combos