summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-12-25 01:13:07 +0000
committerQMK Bot <hello@qmk.fm>2021-12-25 01:13:07 +0000
commite0490a24f28697ad3c6405792ab95e4b6c0275c6 (patch)
tree668906d4cf673116249a0f990f861fb969824f9e
parent53472a4e7b7373f1a733e7264d023c4b1b6a9893 (diff)
parent1e28667ef8bf26a56faf26bf9af2542a18597721 (diff)
downloadqmk_firmware-e0490a24f28697ad3c6405792ab95e4b6c0275c6.tar.gz
qmk_firmware-e0490a24f28697ad3c6405792ab95e4b6c0275c6.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/feature_rgb_matrix.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index d07c02e184..8ba39b476b 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -415,7 +415,7 @@ All RGB keycodes are currently shared with the RGBLIGHT system:
* `RGB_MODE_*` keycodes will generally work, but not all of the modes are currently mapped to the correct effects for the RGB Matrix system.
-`RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MATRIX_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped.
+`RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MODE_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped.
!> By default, if you have both the [RGB Light](feature_rgblight.md) and the RGB Matrix feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.