Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-07-28 11:01:28 +00:00
commit 50964ae821

View File

@ -19,7 +19,7 @@ You can control the behavior of one shot keys by defining these in `config.h`:
* `OSL(layer)` - momentary switch to *layer*. * `OSL(layer)` - momentary switch to *layer*.
* `OS_ON` - Turns on One Shot keys. * `OS_ON` - Turns on One Shot keys.
* `OS_OFF` - Turns off One Shot keys. OSM act as regular mod keys, OSL act like `MO`. * `OS_OFF` - Turns off One Shot keys. OSM act as regular mod keys, OSL act like `MO`.
* `ON_TOGG` - Toggles the one shot key status. * `OS_TOGG` - Toggles the one shot key status.
Sometimes, you want to activate a one-shot key as part of a macro or tap dance routine. Sometimes, you want to activate a one-shot key as part of a macro or tap dance routine.