ficd/zmk
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename COMBO_ADD_ON to COMBO_HOOK

Browse source
This commit is contained in:
urob 2022-08-09 20:40:32 -04:00
parent 2c4a96c22c
commit 936464e948
4 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
zmk-nodefree-config/README.md
View file

@ -147,9 +147,12 @@ ZMK_KEYMAP(default_layer,
two layers). If set to `ALL` the combo is active on all layers.
By default, the timeout for combos created with `ZMK_COMBO` is 30ms. If `COMBO_TERM` is
reset prior to calling `ZMK_COMBO`, the new value of `COMBO_TERM` is used instead. Note: while
it is possible to set different timeouts for different combos, this is known to cause
[issues](https://github.com/zmkfirmware/zmk/issues/905) with overlapping combos and should be avoided.
reset prior to calling `ZMK_COMBO`, the new value of `COMBO_TERM` is used instead.
Alternatively, one can use `ZMK_COMBO_ADV` which allows to specify the combo-timeout directly
as 5th argument.
Note: with older ZMK versions, using different combo-timeouts would result in keys
getting stuck. If this is an issue, try updating to the latest ZMK version.
#### Example: copy and paste combos
@ -369,8 +372,16 @@ ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs
## Changelog
* 7/31/2022: Switch unicode dependency from PR #1114 to
[#1412](https://github.com/zmkfirmware/zmk/pull/1412)
* **8/05/2022:** New combo macro `ZMK_COMBO_ADV` for "advanced" combo setups. Compared
to the regular `ZMK_COMBO` macro, it takes the combo-timeout as fifth argument.
Moreover, if `COMBO_HOOK` is defined, it includes its definition as additional
options. For example, to use the new global-quick-tap for combos option introduced in
[PR #1387](https://github.com/andrewjrae/zmk/tree/min-prior-ms), one would set
`#define COMBO_HOOK global-quick-tap-ms = <125>;` before calling `ZMK_COMBO_ADV`.
See [my personal combo
setup](https://github.com/urob/zmk-config/blob/main/config/combos.dtsi) for examples.
* **7/31/2022:** Switch unicode dependency from PR #1114 to
[PR #1412](https://github.com/zmkfirmware/zmk/pull/1412)
[^1]: The default for Windows is `OS_UNICODE_LEAD` set to tap <kbd>Right Alt</kbd>

6
zmk-nodefree-config/helper.h
View file

@ -62,8 +62,8 @@
}; \
};
#if !defined COMBO_ADD_ON
#define COMBO_ADD_ON
#if !defined COMBO_HOOK
#define COMBO_HOOK
#endif
#define ZMK_COMBO_ADV(name, combo_bindings, keypos, combo_layers, combo_timeout) \
/ { \
@ -74,7 +74,7 @@
bindings = <combo_bindings>; \
key-positions = <keypos>; \
layers = <combo_layers>; \
COMBO_ADD_ON \
COMBO_HOOK \
}; \
}; \
};