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/bm60rgb | |
| parent | c0628c2820b436550f62af5f6b7fae1f66b0bf8b (diff) | |
| parent | 26ea090190b815862f108903e5f41f20c6d16d66 (diff) | |
| download | qmk_firmware-7bec943043b8d03482e9f4ffc69cc63b9fc4a18a.tar.gz qmk_firmware-7bec943043b8d03482e9f4ffc69cc63b9fc4a18a.zip | |
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/bm60rgb')
| -rw-r--r-- | keyboards/bm60rgb/config.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/keyboards/bm60rgb/config.h b/keyboards/bm60rgb/config.h index 3eee00e51e..bbb38e24fd 100644 --- a/keyboards/bm60rgb/config.h +++ b/keyboards/bm60rgb/config.h @@ -50,8 +50,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_DI_PIN E2 #define DRIVER_LED_TOTAL 69 #ifdef RGB_DI_PIN - #define RGBLED_NUM 69 - #define RGB_MATRIX_KEYPRESSES +# define RGBLED_NUM 69 +# define RGB_MATRIX_KEYPRESSES +# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value +#endif +#ifdef RGB_MATRIX_ENABLE +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value #endif // generated by KBFirmware JSON to QMK Parser |