Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RGB Backlight: Dont update while screen is off and other improvements #1

Merged
merged 2 commits into from
Mar 3, 2024
Merged

RGB Backlight: Dont update while screen is off and other improvements #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adfcc3b
fixing always updating rainbow mode
HaxSam Mar 1, 2024
34e8a79
removed unnecessary wrapper for rainbow mode
HaxSam Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 53 additions & 29 deletions lib/drivers/rgb_backlight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,51 @@ uint8_t rgb_backlight_get_rainbow_saturation() {
return rainbow_saturation;
}

static void rainbow_timer(void* ctx) {
void rainbow_timer(void* ctx) {
if(!rgb_state.settings_loaded) return;
furi_check(furi_mutex_acquire(rgb_state.mutex, FuriWaitForever) == FuriStatusOk);

if(!rgb_state.enabled || rgb_settings.rainbow_mode == RGBBacklightRainbowModeOff ||
!rgb_state.last_brightness) {
furi_check(furi_mutex_release(rgb_state.mutex) == FuriStatusOk);
return;
}

rgb_state.rainbow_hsv.h += rgb_settings.rainbow_speed;

RgbColor rgb;
hsv2rgb(&rgb_state.rainbow_hsv, &rgb);

switch(rgb_settings.rainbow_mode) {
case RGBBacklightRainbowModeWave: {
HsvColor hsv = rgb_state.rainbow_hsv;
for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
if(i) {
hsv.h += (50 * i);
hsv2rgb(&hsv, &rgb);
}
SK6805_set_led_color(i, rgb.r, rgb.g, rgb.b);
}
break;
}

case RGBBacklightRainbowModeSolid:
for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
SK6805_set_led_color(i, rgb.r, rgb.g, rgb.b);
}
break;

default:
break;
}

SK6805_update();

if(rgb_state.enabled && rgb_settings.rainbow_mode == RGBBacklightRainbowModeOff)
SK6805_update();

furi_check(furi_mutex_release(rgb_state.mutex) == FuriStatusOk);
UNUSED(ctx);
rgb_backlight_update(rgb_state.last_brightness, true);
}

void rgb_backlight_reconfigure(bool enabled) {
Expand All @@ -226,19 +268,16 @@ void rgb_backlight_reconfigure(bool enabled) {
rgb_state.rainbow_timer = NULL;
}
rgb_state.rainbow_hsv.s = rgb_settings.rainbow_saturation;
rgb_backlight_update(rgb_state.last_brightness, false);

if(rgb_state.enabled && rgb_settings.rainbow_mode == RGBBacklightRainbowModeOff)
SK6805_update();
rgb_backlight_update(rgb_state.last_brightness, true);

furi_check(furi_mutex_release(rgb_state.mutex) == FuriStatusOk);
}

void rgb_backlight_update(uint8_t brightness, bool tick) {
void rgb_backlight_update(uint8_t brightness, bool forced) {
if(!rgb_state.settings_loaded) return;
furi_check(furi_mutex_acquire(rgb_state.mutex, FuriWaitForever) == FuriStatusOk);

if(!rgb_state.enabled) {
if(!rgb_state.enabled || (brightness == rgb_state.last_brightness && !forced)) {
furi_check(furi_mutex_release(rgb_state.mutex) == FuriStatusOk);
return;
}
Expand All @@ -258,29 +297,14 @@ void rgb_backlight_update(uint8_t brightness, bool tick) {

case RGBBacklightRainbowModeWave:
case RGBBacklightRainbowModeSolid: {
if(tick && brightness) {
rgb_state.rainbow_hsv.h += rgb_settings.rainbow_speed;
} else {
rgb_state.rainbow_hsv.v = brightness;
}

RgbColor rgb;
hsv2rgb(&rgb_state.rainbow_hsv, &rgb);

if(rgb_settings.rainbow_mode == RGBBacklightRainbowModeWave) {
HsvColor hsv = rgb_state.rainbow_hsv;
for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
if(i) {
hsv.h += (50 * i);
hsv2rgb(&hsv, &rgb);
}
SK6805_set_led_color(i, rgb.r, rgb.g, rgb.b);
}
} else {
if(!brightness) {
furi_timer_stop(rgb_state.rainbow_timer);
for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
SK6805_set_led_color(i, rgb.r, rgb.g, rgb.b);
SK6805_set_led_color(i, 0, 0, 0);
}
}
} else if(!rgb_state.last_brightness)
furi_timer_start(rgb_state.rainbow_timer, rgb_settings.rainbow_interval);
rgb_state.rainbow_hsv.v = brightness;
break;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/drivers/rgb_backlight.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ void rgb_backlight_reconfigure(bool enabled);
* @brief Apply current RGB lighting settings
*
* @param brightness Backlight intensity (0-255)
* @param tick Whether this update was a tick (for rainbow)
* @param forced force a update even brightness doesnt changed
*/
void rgb_backlight_update(uint8_t brightness, bool tick);
void rgb_backlight_update(uint8_t brightness, bool forced);

#ifdef __cplusplus
}
Expand Down