summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Diamond <josh@windowoffire.com>2021-01-02 16:42:48 -0500
committerGitHub <noreply@github.com>2021-01-02 13:42:48 -0800
commitb3de903a3dfe5f75312b6b8a7555ccabe01a5e6e (patch)
tree561211e8c17960269b2f2628ecd6aa4f5562d162
parentc07543133a092039c7eae0cead6c9ee3badcc7dc (diff)
Fix broken Lighting Layers when RGBLIGHT_MAX_LAYERS > 16 (#11406)
* fix incorrect bit math when RGBLIGHT_MAX_LAYERS > 16 * with 1UL cast is not needed * ...but just casting works and is even more efficient * cformat
-rw-r--r--quantum/rgblight.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index db725301cb..beeef65689 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -628,7 +628,7 @@ void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_set
#ifdef RGBLIGHT_LAYERS
void rgblight_set_layer_state(uint8_t layer, bool enabled) {
- rgblight_layer_mask_t mask = 1 << layer;
+ rgblight_layer_mask_t mask = (rgblight_layer_mask_t)1 << layer;
if (enabled) {
rgblight_status.enabled_layer_mask |= mask;
} else {
@@ -649,7 +649,7 @@ void rgblight_set_layer_state(uint8_t layer, bool enabled) {
}
bool rgblight_get_layer_state(uint8_t layer) {
- rgblight_layer_mask_t mask = 1 << layer;
+ rgblight_layer_mask_t mask = (rgblight_layer_mask_t)1 << layer;
return (rgblight_status.enabled_layer_mask & mask) != 0;
}
@@ -689,7 +689,7 @@ static uint16_t _blink_timer;
void rgblight_blink_layer(uint8_t layer, uint16_t duration_ms) {
rgblight_set_layer_state(layer, true);
- _blinked_layer_mask |= 1 << layer;
+ _blinked_layer_mask |= (rgblight_layer_mask_t)1 << layer;
_blink_timer = timer_read();
_blink_duration = duration_ms;
}
@@ -697,7 +697,7 @@ void rgblight_blink_layer(uint8_t layer, uint16_t duration_ms) {
void rgblight_unblink_layers(void) {
if (_blinked_layer_mask != 0 && timer_elapsed(_blink_timer) > _blink_duration) {
for (uint8_t layer = 0; layer < RGBLIGHT_MAX_LAYERS; layer++) {
- if ((_blinked_layer_mask & 1 << layer) != 0) {
+ if ((_blinked_layer_mask & (rgblight_layer_mask_t)1 << layer) != 0) {
rgblight_set_layer_state(layer, false);
}
}