Skip to content

Commit

Permalink
Merge branch 'master' of github.com:kareltucek/firmware
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
kareltucek committed Dec 31, 2018
2 parents a0b3d4a + e2d8a68 commit 52d7003
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ The following grammar is supported:
- `holdLayerMax <layer> <timeout in ms>` will timeout after <timeout> ms if no action is performed in that time.
- `switchKeymap` will toggle the keymap by its abbreviation. Last will toggle the last keymap toggled via this command.
- `suppressMods` will supress any modifiers except those applied via macro engine. Can be used to remap shift and nonShift characters independently.
- `suppressKeys` will supress postpone all new key activations. Can be used to mess with timing - e.g., to postpone activation of other keys.
- `suppressKeys` will postpone all new key activations for as long as any instance of this modifier is active. If such key is released prior to its postponed activation, it is effectively ignored. Can be used to mess with timing of other keys, e.g., for resolution of secondary roles.
- `delayUntil <timeout>` sleeps the macro until timeout (in ms) is reached.
- `delayUntilRelease` sleeps the macro until its activation key is released. Can be used to set action on key release.
- `delayUntilReleaseMax <timeout>` same as `delayUntilRelease`, but is also broken when timeout (in ms) is reached.
Expand Down

0 comments on commit 52d7003

Please sign in to comment.