diff options
| author | Steve Purcell <steve@sanityinc.com> | 2019-10-30 12:39:38 +1300 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2019-10-30 10:39:38 +1100 |
| commit | 606813b72dc8645d59afb51775e6554b6c97769d (patch) | |
| tree | 3ce4efcf0686f12adf3fc6ec68395d45fee67198 | |
| parent | 64b7cfe735339193ae78fe0f13029b0e027af7a7 (diff) | |
Remove obsolete note about media keys in MacOS (#6631)
* Remove obsolete note about media keys in MacOS
KC_MNXT and KC_MPRV work fine on MacOS, so this note is obsolete.
* Document behaviour of MEDIA_FAST_FORWARD/MEDIA_REWIND codes on MacOS
* Small typo fix, and make OS-dependent keycode claim less absolute
* Update docs/keycodes_basic.md
Co-Authored-By: fauxpark <fauxpark@gmail.com>
| -rw-r--r-- | docs/faq_keymap.md | 7 | ||||
| -rw-r--r-- | docs/keycodes.md | 4 | ||||
| -rw-r--r-- | docs/keycodes_basic.md | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/docs/faq_keymap.md b/docs/faq_keymap.md index 0a627469e7..84d8548d46 100644 --- a/docs/faq_keymap.md +++ b/docs/faq_keymap.md @@ -95,13 +95,6 @@ Even worse, it is not recognized unless the keyboard's VID and PID match that of See [this issue](https://github.com/qmk/qmk_firmware/issues/2179) for detailed information. - -## Media Control Keys in Mac OSX -#### KC_MNXT and KC_MPRV Does Not Work on Mac -Use `KC_MFFD`(`KC_MEDIA_FAST_FORWARD`) and `KC_MRWD`(`KC_MEDIA_REWIND`) instead of `KC_MNXT` and `KC_MPRV`. -See https://github.com/tmk/tmk_keyboard/issues/195 - - ## Keys Supported in Mac OSX? You can know which keycodes are supported in OSX from this source code. diff --git a/docs/keycodes.md b/docs/keycodes.md index 60f14844c2..7dcff03fd5 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -185,8 +185,8 @@ This is a reference only. Each group of keys links to the page documenting their |`KC_AUDIO_MUTE` |`KC_MUTE` |Mute | |`KC_AUDIO_VOL_UP` |`KC_VOLU` |Volume Up | |`KC_AUDIO_VOL_DOWN` |`KC_VOLD` |Volume Down | -|`KC_MEDIA_NEXT_TRACK` |`KC_MNXT` |Next Track (Windows) | -|`KC_MEDIA_PREV_TRACK` |`KC_MPRV` |Previous Track (Windows) | +|`KC_MEDIA_NEXT_TRACK` |`KC_MNXT` |Next Track | +|`KC_MEDIA_PREV_TRACK` |`KC_MPRV` |Previous Track | |`KC_MEDIA_STOP` |`KC_MSTP` |Stop Track (Windows) | |`KC_MEDIA_PLAY_PAUSE` |`KC_MPLY` |Play/Pause Track | |`KC_MEDIA_SELECT` |`KC_MSEL` |Launch Media Player (Windows) | diff --git a/docs/keycodes_basic.md b/docs/keycodes_basic.md index 8b1b52e190..75d58c1f1b 100644 --- a/docs/keycodes_basic.md +++ b/docs/keycodes_basic.md @@ -191,7 +191,7 @@ The basic set of keycodes are based on the [HID Keyboard/Keypad Usage Page (0x07 These keycodes are not part of the Keyboard/Keypad usage page. The `SYSTEM_` keycodes are found in the Generic Desktop page, and the rest are located in the Consumer page. -Windows and macOS use different keycodes for "next track" and "previous track". Make sure you choose the keycode that corresponds to your OS. +?> Some of these keycodes may behave differently depending on the OS. For example, on macOS, the keycodes `KC_MEDIA_FAST_FORWARD`, `KC_MEDIA_REWIND`, `KC_MEDIA_NEXT_TRACK` and `KC_MEDIA_PREV_TRACK` skip within the current track when held, but skip the entire track when tapped. |Key |Aliases |Description | |-----------------------|---------|-----------------------------| @@ -201,8 +201,8 @@ Windows and macOS use different keycodes for "next track" and "previous track". |`KC_AUDIO_MUTE` |`KC_MUTE`|Mute | |`KC_AUDIO_VOL_UP` |`KC_VOLU`|Volume Up | |`KC_AUDIO_VOL_DOWN` |`KC_VOLD`|Volume Down | -|`KC_MEDIA_NEXT_TRACK` |`KC_MNXT`|Next Track (Windows) | -|`KC_MEDIA_PREV_TRACK` |`KC_MPRV`|Previous Track (Windows) | +|`KC_MEDIA_NEXT_TRACK` |`KC_MNXT`|Next Track | +|`KC_MEDIA_PREV_TRACK` |`KC_MPRV`|Previous Track | |`KC_MEDIA_STOP` |`KC_MSTP`|Stop Track (Windows) | |`KC_MEDIA_PLAY_PAUSE` |`KC_MPLY`|Play/Pause Track | |`KC_MEDIA_SELECT` |`KC_MSEL`|Launch Media Player (Windows)| |