still fucking ))

This commit is contained in:
Dmitry422
2025-03-13 18:06:39 +07:00
parent e589cf7246
commit c9313c6f52
6 changed files with 56 additions and 67 deletions

View File

@@ -25,11 +25,11 @@
#include "rgb_backlight.h"
#define PREDEFINED_COLOR_COUNT (sizeof(colors) / sizeof(RGBBacklightPredefinedColor))
#define COLOR_COUNT (sizeof(colors) / sizeof(RGBBacklightColor))
#define TAG "RGB_BACKLIGHT_SRV"
static const RGBBacklightPredefinedColor colors[] = {
static const RGBBacklightColor colors[] = {
{"Orange", 255, 60, 0},
{"Yellow", 255, 144, 0},
{"Spring", 167, 255, 0},
@@ -47,43 +47,32 @@ static const RGBBacklightPredefinedColor colors[] = {
};
uint8_t rgb_backlight_get_color_count(void) {
return PREDEFINED_COLOR_COUNT;
return COLOR_COUNT;
}
const char* rgb_backlight_get_color_text(uint8_t index) {
return colors[index].name;
}
void rgb_backlight_set_static_color(uint8_t index, float brightness) {
// use RECORD for acces to rgb service instance and use current_* colors and static colors
// use RECORD for acces to rgb service instance and update current colors by static
void rgb_backlight_set_static_color(uint8_t index) {
RGBBacklightApp* app = furi_record_open(RECORD_RGB_BACKLIGHT);
for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
app->current_red = colors[index].red;
app->current_green = colors[index].green;
app->current_blue = colors[index].blue;
uint8_t r = app->current_red * brightness;
uint8_t g = app->current_green * brightness;
uint8_t b = app->current_blue * brightness;
SK6805_set_led_color(i, r, g, b);
}
SK6805_update();
app->current_red = colors[index].red;
app->current_green = colors[index].green;
app->current_blue = colors[index].blue;
furi_record_close(RECORD_RGB_BACKLIGHT);
}
// void rgb_backlight_set_custom_color(uint8_t red, uint8_t green, uint8_t blue, float brightness) {
// for(uint8_t i = 0; i < SK6805_get_led_count(); i++) {
// uint8_t r = red * (brightness);
// uint8_t g = green * (brightness);
// uint8_t b = blue * (brightness);
// SK6805_set_led_color(i, r, g, b);
// }
// SK6805_update();
// }
// use RECORD for acces to rgb service instance and update current colors by custom
void rgb_backlight_set_custom_color(uint8_t red, uint8_t green, uint8_t blue) {
RGBBacklightApp* app = furi_record_open(RECORD_RGB_BACKLIGHT);
app->current_red = red;
app->current_green = green;
app->current_blue = blue;
furi_record_close(RECORD_RGB_BACKLIGHT);
}
// apply new brightness to current display color set
void rgb_backlight_update (float brightness) {
@@ -96,10 +85,10 @@ void rgb_backlight_update (float brightness) {
uint8_t b = app->current_blue * brightness;
SK6805_set_led_color(i, r, g, b);
}
furi_record_close(RECORD_RGB_BACKLIGHT);
SK6805_update();
furi_record_close(RECORD_RGB_BACKLIGHT);
}
//start furi timer for rainbow
void rainbow_timer_start(RGBBacklightApp* app) {
furi_timer_start(
@@ -115,11 +104,6 @@ void rainbow_timer_stop(RGBBacklightApp* app) {
void rainbow_timer_starter(RGBBacklightApp* app) {
if(app->settings->rgb_mod_installed) {
if(app->settings->rainbow_mode > 0) {
// rgb_backlight_set_custom_color(
// app->rainbow_red,
// app->rainbow_green,
// app->rainbow_blue,
// app->settings->brightness);
rainbow_timer_start(app);
} else {
if(furi_timer_is_running(app->rainbow_timer)) {
@@ -133,7 +117,7 @@ static void rainbow_timer_callback(void* context) {
furi_assert(context);
RGBBacklightApp* app = context;
// if rgb_mode_rainbow_mode is rainbow do rainbow effect
// if rainbow_mode is rainbow do rainbow effect
if(app->settings->rainbow_mode == 1) {
switch(app->rainbow_stage) {
// from red to yellow (255,0,0) - (255,255,0)
@@ -187,18 +171,12 @@ static void rainbow_timer_callback(void* context) {
default:
break;
}
// rgb_backlight_set_custom_color(
// app->current_red,
// app->current_green,
// app->current_blue,
// app->settings->brightness);
}
}
//rgb_backlight_set_custom_color(app->current_red,app->current_green,app->current_blue);
rgb_backlight_update (app->settings->brightness);
// if rgb_mode_rainbow_mode is ..... do another effect
// if(app->settings.rainbow_mode == 2) {
// if rainbow_mode is ..... do another effect
// if(app->settings.rainbow_mode == ...) {
// }
}
@@ -206,7 +184,7 @@ int32_t rgb_backlight_srv (void* p) {
UNUSED(p);
// Define object app (full app with settings and running variables),
// allocate memory and create record for access to app structure from outside
// allocate memory and create RECORD for access to app structure from outside
RGBBacklightApp* app = malloc(sizeof(RGBBacklightApp));
furi_record_create(RECORD_RGB_BACKLIGHT, app);
@@ -220,22 +198,28 @@ int32_t rgb_backlight_srv (void* p) {
rgb_backlight_settings_load (app->settings);
// Init app variables
app->current_red = 255;
app->current_green = 60;
app->current_blue = 0;
app->rainbow_stage = 1;
// app->current_red = 255;
// app->current_green = 60;
// app->current_blue = 0;
// а нужно ли это все при старте сервиса, если мы получим сигнал на подсветку от Нотификейшена. Может вынести в ИНИТ и при старте нотиф дернуть его 1 раз
// if rgb_mod_installed start rainbow or set static color from settings (default index = 0)
if(app->settings->rgb_mod_installed) {
if(app->settings->rainbow_mode > 0 ) {
// app->current_red = 255;
// app->current_green = 0;
// app->current_blue = 0;
rainbow_timer_starter(app);
} else {
rgb_backlight_set_static_color(app->settings->static_color_index, app->settings->brightness);
rgb_backlight_set_static_color(app->settings->static_color_index);
rgb_backlight_update (app->settings->brightness);
}
// if not rgb_mod_installed set default static orange color (index=0)
} else {
rgb_backlight_set_static_color(0, app->settings->brightness);
rgb_backlight_set_static_color(0);
rgb_backlight_update (app->settings->brightness);
}
while(1) {