diff options
| author | Drashna Jael're <drashna@live.com> | 2022-10-24 23:28:56 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-10-24 23:28:56 -0700 |
| commit | eeb3f9c04346da4f387f1beb439f558a82fcb95c (patch) | |
| tree | 7b997f5a62d862dac576bb04eb49a1023ef5af0c /docs | |
| parent | e3594135012aa8c8bc309bf43aaa958f3135a30a (diff) | |
| parent | f100de88e524633d4f7b35602b37ad6a76044f1d (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/feature_key_lock.md | 2 | ||||
| -rw-r--r-- | docs/ja/feature_key_lock.md | 2 | ||||
| -rw-r--r-- | docs/serial_driver.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/feature_key_lock.md b/docs/feature_key_lock.md index d5ad1708c7..1acee524da 100644 --- a/docs/feature_key_lock.md +++ b/docs/feature_key_lock.md @@ -16,7 +16,7 @@ First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Th ## Caveats -Key Lock is only able to hold standard action keys and [One Shot modifier](one_shot_keys.md) keys (for example, if you have your Shift defined as `OSM(KC_LSFT)`). +Key Lock is only able to hold standard action keys and [One Shot modifier](one_shot_keys.md) keys (for example, if you have your Shift defined as `OSM(MOD_LSFT)`). This does not include any of the QMK special functions (except One Shot modifiers), or shifted versions of keys such as `KC_LPRN`. If it's in the [Basic Keycodes](keycodes_basic.md) list, it can be held. Switching layers will not cancel the Key Lock. The Key Lock can be cancelled by calling the `cancel_key_lock()` function. diff --git a/docs/ja/feature_key_lock.md b/docs/ja/feature_key_lock.md index b786fbb048..22cd9fb810 100644 --- a/docs/ja/feature_key_lock.md +++ b/docs/ja/feature_key_lock.md @@ -21,7 +21,7 @@ ## 注意事項 -キーロックは、標準アクションキーと[ワンショットモディファイア](ja/one_shot_keys.md)キー (例えば、Shift を `OSM(KC_LSFT)` と定義した場合)のみを押し続けることができます。 +キーロックは、標準アクションキーと[ワンショットモディファイア](ja/one_shot_keys.md)キー (例えば、Shift を `OSM(MOD_LSFT)` と定義した場合)のみを押し続けることができます。 これは、QMK の特殊機能(ワンショットモディファイアを除く)、または `KC_LPRN` のような shift を押されたキーのバージョンは含みません。[基本的なキーコード](ja/keycodes_basic.md)リストにある場合、押したままにすることができます。 レイヤーの切り替えは、キーロックを解除しません。 diff --git a/docs/serial_driver.md b/docs/serial_driver.md index fff63109a1..7fad23911a 100644 --- a/docs/serial_driver.md +++ b/docs/serial_driver.md @@ -1,6 +1,6 @@ # 'serial' Driver -The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available, depending on the platform of your split keyboard. Note that none of the drivers support split keyboards with more then two halves. +The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available, depending on the platform of your split keyboard. Note that none of the drivers support split keyboards with more than two halves. | Driver | AVR | ARM | Connection between halves | | --------------------------------------- | ------------------ | ------------------ | --------------------------------------------------------------------------------------------- | |