diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-09 12:14:22 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-09 12:14:22 -0700 |
| commit | 7bec943043b8d03482e9f4ffc69cc63b9fc4a18a (patch) | |
| tree | e138b4d121f2196d3983e1643cab4381ee729c9b /keyboards/bm60poker | |
| parent | c0628c2820b436550f62af5f6b7fae1f66b0bf8b (diff) | |
| parent | 26ea090190b815862f108903e5f41f20c6d16d66 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:
- keyboards/bm40hsrgb/config.h
- Conflict from PR 13132:
- RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
- updated file with changes from master branch
- keyboards/keebio/iris/keymaps/nstickney/keymap.c
- Conflict from PR 11456:
- layer_state_set_user() updated in develop branch, removed in master branch
- updated file with changes from master branch
Diffstat (limited to 'keyboards/bm60poker')
| -rw-r--r-- | keyboards/bm60poker/config.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/keyboards/bm60poker/config.h b/keyboards/bm60poker/config.h index 4fbec4f9bd..831a1a1b8c 100644 --- a/keyboards/bm60poker/config.h +++ b/keyboards/bm60poker/config.h @@ -53,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_LIMIT_VAL 5 /* The maximum brightness level */ + #define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== all animations enable ==*/ #define RGBLIGHT_ANIMATIONS @@ -68,3 +68,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING #endif +#ifdef RGB_MATRIX_ENABLE +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value +#endif |