mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-09-30 05:50:43 +02:00
Merge remote-tracking branch 'upstream/develop' into xap
This commit is contained in:
Nick Brassel
@@ -0,0 +1,35 @@
|
||||
# MechKeys ACR60 Layout Updates
|
||||
|
||||
This PR removed and changed some of the layouts that were configured for
|
||||
the ACR60. If you use one of the following layouts, you will need to
|
||||
update your keymap:
|
||||
|
||||
- [`LAYOUT_hhkb`](#layout-hhkb)
|
||||
- [`LAYOUT_true_hhkb`](#layout-true-hhkb)
|
||||
- [`LAYOUT_directional`](#layout-directional)
|
||||
- [`LAYOUT_mitchsplit`](#layout-mitchsplit)
|
||||
|
||||
## `LAYOUT_hhkb` :id=layout-hhkb
|
||||
|
||||
1. Change your layout macro to `LAYOUT_60_hhkb`.
|
||||
2. Remove any keycodes for the key between Left Shift and QWERTY Z.
|
||||
|
||||
## `LAYOUT_true_hhkb` :id=layout-true-hhkb
|
||||
|
||||
1. Change your layout macro to `LAYOUT_60_true_hhkb`.
|
||||
2. Remove any keycodes for the key between Left Shift and QWERTY Z.
|
||||
|
||||
## `LAYOUT_directional` :id=layout-directional
|
||||
|
||||
1. Change your layout macro to `LAYOUT_60_ansi_arrow_split_bs`.
|
||||
2. Remove any keycodes for the key between Left Shift and QWERTY Z.
|
||||
3. Remove any keycodes for the keys immediately before *and* after the
|
||||
1.25u key of Split Spacebar.
|
||||
|
||||
If you need split spacebars, you may implement
|
||||
`LAYOUT_60_ansi_arrow_split_space_split_bs` and change your layout to
|
||||
it, removing the keycode between Left Shift and QWERTY Z.
|
||||
|
||||
## `LAYOUT_mitchsplit` :id=layout-mitchsplit
|
||||
|
||||
1. Use `LAYOUT_60_ansi_split_space_split_rshift`.
|
||||
@@ -237,7 +237,7 @@ If you define these options you will enable the associated feature, which may in
|
||||
* units to step when in/decreasing saturation
|
||||
* `#define RGBLIGHT_VAL_STEP 12`
|
||||
* units to step when in/decreasing value (brightness)
|
||||
* `#define RGBW`
|
||||
* `#define WS2812_RGBW`
|
||||
* Enables RGBW LED support
|
||||
|
||||
## Mouse Key Options
|
||||
@@ -446,7 +446,7 @@ Use these to enable or disable building certain features. The more you have enab
|
||||
* Allows replacing the standard matrix scanning routine with a custom one.
|
||||
* `DEBOUNCE_TYPE`
|
||||
* Allows replacing the standard key debouncing routine with an alternative or custom one.
|
||||
* `WAIT_FOR_USB`
|
||||
* `USB_WAIT_FOR_ENUMERATION`
|
||||
* Forces the keyboard to wait for a USB connection to be established before it starts up
|
||||
* `NO_USB_STARTUP_CHECK`
|
||||
* Disables usb suspend check after keyboard startup. Usually the keyboard waits for the host to wake it up before any tasks are performed. This is useful for split keyboards as one half will not get a wakeup call but must send commands to the master.
|
||||
|
||||
@@ -6,7 +6,7 @@ QMK has the ability to control RGB LEDs attached to your keyboard. This is commo
|
||||
|
||||
Some keyboards come with RGB LEDs preinstalled. Others must have them installed after the fact. See the [Hardware Modification](#hardware-modification) section for information on adding RGB lighting to your keyboard.
|
||||
|
||||
Currently QMK supports the following addressable LEDs (however, the white LED in RGBW variants is not supported):
|
||||
Currently QMK supports the following addressable LEDs:
|
||||
|
||||
* WS2811, WS2812, WS2812B, WS2812C, etc.
|
||||
* SK6812, SK6812MINI, SK6805
|
||||
|
||||
@@ -378,7 +378,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
|
||||
* 標準マトリックス走査ルーチンを独自のものに置き換えることができます。
|
||||
* `DEBOUNCE_TYPE`
|
||||
* 標準キーデバウンスルーチンを代替または独自のものに置き換えることができます。
|
||||
* `WAIT_FOR_USB`
|
||||
* `USB_WAIT_FOR_ENUMERATION`
|
||||
* キーボードが起動する前に、USB 接続が確立されるのをキーボードに待機させます
|
||||
* `NO_USB_STARTUP_CHECK`
|
||||
* キーボードの起動後の usb サスペンドチェックを無効にします。通常、キーボードはタスクが実行される前にホストがウェイク アップするのを待ちます。分割キーボードは半分はウェイクアップコールを取得できませんが、マスタにコマンドを送信する必要があるため、役に立ちます。
|
||||
|
||||
@@ -118,6 +118,8 @@ Configures the [Audio](feature_audio.md) feature.
|
||||
* `clicky`
|
||||
* The default audio clicky enabled state.
|
||||
* Default: `true`
|
||||
* `driver`
|
||||
* The driver to use. Must be one of `dac_additive`, `dac_basic`, `pwm_software`, `pwm_hardware`.
|
||||
* `macro_beep`
|
||||
* Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros.
|
||||
* Default: `false`
|
||||
@@ -586,9 +588,6 @@ Configures the [RGB Lighting](feature_rgblight.md) feature.
|
||||
* `max_brightness`
|
||||
* The maximum value which the HSV "V" component is scaled to, from 0 to 255.
|
||||
* Default: `255`
|
||||
* `rgbw`
|
||||
* Enable RGBW LEDs.
|
||||
* Default: `false`
|
||||
* `saturation_steps`
|
||||
* The number of saturation adjustment steps.
|
||||
* Default: `17`
|
||||
@@ -833,7 +832,7 @@ Configures the [Stenography](feature_stenography.md) feature.
|
||||
* `suspend_wakeup_delay`
|
||||
* The amount of time to wait after sending a wakeup packet, in milliseconds.
|
||||
* Default: `0` (disabled)
|
||||
* `wait_for`
|
||||
* `wait_for_enumeration`
|
||||
* Force the keyboard to wait for USB enumeration before starting up.
|
||||
* Default: `false`
|
||||
|
||||
@@ -853,3 +852,6 @@ Configures the [WS2812](ws2812_driver.md) driver.
|
||||
* `i2c_timeout`
|
||||
* The I²C timeout in milliseconds (`i2c` driver only).
|
||||
* Default: `100` (100 ms)
|
||||
* `rgbw`
|
||||
* Enable RGBW LEDs.
|
||||
* Default: `false`
|
||||
|
||||
@@ -23,6 +23,8 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q
|
||||
|Canadian Multilingual (CSA) |`keymap_canadian_multilingual.h` |`sendstring_canadian_multilingual.h`|
|
||||
|Croatian |`keymap_croatian.h` |`sendstring_croatian.h` |
|
||||
|Czech |`keymap_czech.h` |`sendstring_czech.h` |
|
||||
|Czech (macOS, ANSI) |`keymap_czech_mac_ansi.h` |`sendstring_czech_mac_ansi.h` |
|
||||
|Czech (macOS, ISO) |`keymap_czech_mac_iso.h` |`sendstring_czech_mac_iso.h` |
|
||||
|Danish |`keymap_danish.h` |`sendstring_danish.h` |
|
||||
|Dutch (Belgium) |`keymap_belgian.h` |`sendstring_belgian.h` |
|
||||
|English (Ireland) |`keymap_irish.h` | |
|
||||
|
||||
@@ -33,6 +33,7 @@ Add the following to your `config.h`:
|
||||
|`WS2812_T0H` |`350` |The length of a "0" bit's high phase in nanoseconds |
|
||||
|`WS2812_TRST_US` |`280` |The length of the reset phase in microseconds |
|
||||
|`WS2812_BYTE_ORDER`|`WS2812_BYTE_ORDER_GRB`|The byte order of the RGB data |
|
||||
|`WS2812_RGBW` |*Not defined* |Enables RGBW support (except `i2c` driver) |
|
||||
|
||||
### Timing Adjustment :id=timing-adjustment
|
||||
|
||||
@@ -58,6 +59,27 @@ Where the byte order may be one of:
|
||||
|`RGB` |WS2812B-2020 |
|
||||
|`BGR` |TM1812 |
|
||||
|
||||
### RGBW Support :id=rgbw-support
|
||||
|
||||
Rendering the color white with RGB LEDs is typically inconsistent due to inherent variations between each individual LED die. However, some WS2812 variants (such as SK6812RGBW) also possess a white LED along with the red, green, and blue channels, which allows for a more accurate white to be displayed.
|
||||
|
||||
QMK can automatically convert the RGB data to be sent to the LEDs to mix in the white channel:
|
||||
|
||||
```
|
||||
w = min(r, g, b)
|
||||
r -= w
|
||||
g -= w
|
||||
b -= w
|
||||
```
|
||||
|
||||
Thus, an RGB triplet of `255,255,255` will simply turn on the white LED fully (`0,0,0,255`).
|
||||
|
||||
To enable RGBW conversion, add the following to your `config.h`:
|
||||
|
||||
```c
|
||||
#define WS2812_RGBW
|
||||
```
|
||||
|
||||
## Driver Configuration :id=driver-configuration
|
||||
|
||||
Driver selection can be configured in `rules.mk` as `WS2812_DRIVER`, or in `info.json` as `ws2812.driver`. Valid values are `bitbang` (default), `i2c`, `spi`, `pwm`, `vendor`, or `custom`. See below for information on individual drivers.
|
||||
|
||||
Reference in New Issue
Block a user