diff options
| author | QMK Bot <hello@qmk.fm> | 2023-01-16 09:33:19 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-01-16 09:33:19 +0000 |
| commit | 4c7f67f724f6e1c8809b912b932a71e5e14394fa (patch) | |
| tree | 4a7ce65b85421ad6651f0056620ea86a3424aeb8 | |
| parent | b6e42db64b487d02705c1adf525086ce9a0ce381 (diff) | |
| parent | 2bff00e1bad09a57b3a5af214f0d1f8243deaea5 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | docs/feature_layers.md | 4 | ||||
| -rw-r--r-- | docs/feature_rgb_matrix.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/feature_layers.md b/docs/feature_layers.md index 5ad4005f5d..8effb7125d 100644 --- a/docs/feature_layers.md +++ b/docs/feature_layers.md @@ -53,7 +53,7 @@ There are a number of functions (and variables) related to how you can use or ma |Function |Description | |----------------------------------------------|---------------------------------------------------------------------------------------------------------| -| `layer_state_set(layer_mask)` | Directly sets the layer state (recommended, do not use unless you know what you are doing). | +| `layer_state_set(layer_mask)` | Directly sets the layer state (avoid unless you know what you are doing). | | `layer_clear()` | Clears all layers (turns them all off). | | `layer_move(layer)` | Turns specified layer on, and all other layers off. | | `layer_on(layer)` | Turns specified layer on, leaves all other layers in existing state. | @@ -63,7 +63,7 @@ There are a number of functions (and variables) related to how you can use or ma | `layer_and(layer_mask)` | Turns on layers based on matching enabled bits between specifed layer and existing layer state. | | `layer_xor(layer_mask)` | Turns on layers based on non-matching bits between specifed layer and existing layer state. | | `layer_debug(layer_mask)` | Prints out the current bit mask and highest active layer to debugger console. | -| `default_layer_set(layer_mask)` | Directly sets the default layer state (recommended, do not use unless you know what you are doing). | +| `default_layer_set(layer_mask)` | Directly sets the default layer state (avoid unless you know what you are doing). | | `default_layer_or(layer_mask)` | Turns on layers based on matching bits between specifed layer and existing default layer state. | | `default_layer_and(layer_mask)` | Turns on layers based on matching enabled bits between specifed layer and existing default layer state. | | `default_layer_xor(layer_mask)` | Turns on layers based on non-matching bits between specifed layer and existing default layer state. | diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md index bc51b63c71..f9ba3c4d29 100644 --- a/docs/feature_rgb_matrix.md +++ b/docs/feature_rgb_matrix.md @@ -576,7 +576,7 @@ enum rgb_matrix_effects { RGB_MATRIX_PIXEL_FRACTAL, // Single hue fractal filled keys pulsing horizontally out to edges RGB_MATRIX_PIXEL_FLOW, // Pulsing RGB flow along LED wiring with random hues RGB_MATRIX_PIXEL_RAIN, // Randomly light keys with random hues -#if define(RGB_MATRIX_FRAMEBUFFER_EFFECTS) +#if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) RGB_MATRIX_TYPING_HEATMAP, // How hot is your WPM! RGB_MATRIX_DIGITAL_RAIN, // That famous computer simulation #endif |