mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-13 05:06:30 +04:00
Code Issues Activity

refactor rgb_backlight

Browse Source
This commit is contained in:
Dmitry422
2025-03-17 23:56:39 +07:00
parent 05423d5cb3
commit c66b332a7d
4 changed files with 87 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
applications/services/rgb_backlight/rgb_backlight.c
View File

@@ -42,7 +42,7 @@ static const RGBBacklightColor colors[] = {
{"Pink", 255, 0, 127}, {"Pink", 255, 0, 127},
{"Red", 255, 0, 0}, {"Red", 255, 0, 0},
{"White", 254, 210, 200}, {"White", 254, 210, 200},
{"Custom", 255, 255, 255}, {"White1", 255, 255, 255},
}; };
uint8_t rgb_backlight_get_color_count(void) { uint8_t rgb_backlight_get_color_count(void) {
@@ -54,9 +54,17 @@ const char* rgb_backlight_get_color_text(uint8_t index) {
} }
// use RECORD for acces to rgb service instance and update current colors by static // use RECORD for acces to rgb service instance and update current colors by static
void rgb_backlight_set_static_color(uint8_t index) { void rgb_backlight_set_static_color(uint8_t index, uint8_t vd) {
RGBBacklightApp* app = furi_record_open(RECORD_RGB_BACKLIGHT); RGBBacklightApp* app = furi_record_open(RECORD_RGB_BACKLIGHT);
if(vd < SK6805_get_led_count()) {
uint8_t r = colors[index].red;
uint8_t g = colors[index].green;
uint8_t b = colors[index].blue;
SK6805_set_led_color(vd, r, g, b);
SK6805_update();
}
//if user select "custom" value then set current colors by custom values //if user select "custom" value then set current colors by custom values
if(index == 13) { if(index == 13) {
app->current_red = app->settings->custom_red; app->current_red = app->settings->custom_red;

2
applications/services/rgb_backlight/rgb_backlight_settings.c
View File

@@ -16,7 +16,7 @@
typedef struct { typedef struct {
//Common settings //Common settings
uint8_t version; uint8_t version;
uint8_t rgb_backlight_mode; bool rgb_backlight_installed;
float brightness; float brightness;
//static and custom colors mode settings //static and custom colors mode settings

8
applications/services/rgb_backlight/rgb_backlight_settings.h
View File

@@ -6,15 +6,9 @@
typedef struct { typedef struct {
//Common settings //Common settings
uint8_t version; uint8_t version;
uint8_t rgb_backlight_mode; uint8_t rgb_backlight_installed;
float brightness; float brightness;
//static and custom colors mode settings
uint8_t static_color_index;
uint8_t custom_red;
uint8_t custom_green;
uint8_t custom_blue;
// static gradient mode settings // static gradient mode settings
uint8_t static_vd1_index; uint8_t static_vd1_index;
uint8_t static_vd2_index; uint8_t static_vd2_index;

273
applications/settings/notification_settings/notification_settings_app.c
View File

@@ -111,28 +111,20 @@ const bool vibro_value[VIBRO_COUNT] = {false, true};
// --- RGB BACKLIGHT --- // --- RGB BACKLIGHT ---
// #define RGB_BACKLIGHT_INSTALLED_COUNT 2 #define RGB_BACKLIGHT_INSTALLED_COUNT 2
// const char* const rgb_backlight_installed_text[RGB_BACKLIGHT_INSTALLED_COUNT] = { const char* const rgb_backlight_installed_text[RGB_BACKLIGHT_INSTALLED_COUNT] = {
// "OFF", "OFF",
// "ON", "ON",
// };
// const bool rgb_backlight_installed_value[RGB_BACKLIGHT_INSTALLED_COUNT] = {false, true};
#define RGB_BACKLIGHT_MODE_COUNT 4
const char* const rgb_backlight_mode_text[RGB_BACKLIGHT_MODE_COUNT] = {
"OFF"
"OneColor",
'Gradient',
"Rainbow",
}; };
const uint32_t rgb_backlight_mode_value[RGB_BACKLIGHT_MODE_COUNT] = {0, 1, 3, 4}; const bool rgb_backlight_installed_value[RGB_BACKLIGHT_INSTALLED_COUNT] = {false, true};
#define RGB_BACKLIGHT_RAINBOW_MODE_COUNT 2 #define RGB_BACKLIGHT_RAINBOW_MODE_COUNT 3
const char* const rgb_backlight_rainbow_mode_text[RGB_BACKLIGHT_RAINBOW_MODE_COUNT] = { const char* const rgb_backlight_rainbow_mode_text[RGB_BACKLIGHT_RAINBOW_MODE_COUNT] = {
"OFF",
"Rainbow", "Rainbow",
"Wave", "Wave",
}; };
const uint32_t rgb_backlight_rainbow_mode_value[RGB_BACKLIGHT_RAINBOW_MODE_COUNT] = {1, 2}; const uint32_t rgb_backlight_rainbow_mode_value[RGB_BACKLIGHT_RAINBOW_MODE_COUNT] = {0, 1, 2};
#define RGB_BACKLIGHT_RAINBOW_SPEED_COUNT 20 #define RGB_BACKLIGHT_RAINBOW_SPEED_COUNT 20
const char* const rgb_backlight_rainbow_speed_text[RGB_BACKLIGHT_RAINBOW_SPEED_COUNT] = { const char* const rgb_backlight_rainbow_speed_text[RGB_BACKLIGHT_RAINBOW_SPEED_COUNT] = {
@@ -238,68 +230,25 @@ static void vibro_changed(VariableItem* item) {
//--- RGB BACKLIGHT --- //--- RGB BACKLIGHT ---
// static void rgb_backlight_installed_changed(VariableItem* item) { static void rgb_backlight_installed_changed(VariableItem* item) {
// NotificationAppSettings* app = variable_item_get_context(item);
// uint8_t index = variable_item_get_current_value_index(item);
// variable_item_set_current_value_text(item, rgb_backlight_installed_text[index]);
// app->notification->rgb_srv->settings->rgb_backlight_installed = rgb_backlight_installed_value[index];
// rgb_backlight_settings_save(app->notification->rgb_srv->settings);
// // Lock/Unlock all rgb settings depent from rgb_backlight_installed switch
// int slide = 0;
// if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
// slide = 1;
// }
// for(int i = slide; i < (slide + 7); i++) {
// VariableItem* t_item = variable_item_list_get(app->variable_item_list_rgb, i);
// if(index == 0) {
// variable_item_set_locked(t_item, true, "RGB\nOFF!");
// } else {
// variable_item_set_locked(t_item, false, "RGB\nOFF!");
// }
// }
//TODO по умолчанию все пункты ВЫКЛ, когда включаем РГБ установлен, то разблокируем только
// переключатель режима РГБ и в зависимости от его значения остальные пункты
// когда переключталь РГБ выключен, то выключаем все пункты меню.
// }
static void rgb_backlight_mode_changed(VariableItem* item) {
NotificationAppSettings* app = variable_item_get_context(item); NotificationAppSettings* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item); uint8_t index = variable_item_get_current_value_index(item);
variable_item_set_current_value_text(item, rgb_backlight_mode_text[index]); variable_item_set_current_value_text(item, rgb_backlight_installed_text[index]);
app->notification->rgb_srv->settings->rgb_backlight_mode = rgb_backlight_mode_value[index]; app->notification->rgb_srv->settings->rgb_backlight_installed = rgb_backlight_installed_value[index];
rgb_backlight_settings_save(app->notification->rgb_srv->settings); rgb_backlight_settings_save(app->notification->rgb_srv->settings);
// Lock/Unlock all rgb settings depent from rgb_backlight_installed switch
// Lock/Unlock rgb settings depent from selected mode
int slide = 0; int slide = 0;
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
slide = 1; slide = 1;
} }
for(int i = slide; i < (slide + 7); i++) {
VariableItem* t_item = variable_item_list_get(app->variable_item_list_rgb, i); VariableItem* t_item = variable_item_list_get(app->variable_item_list_rgb, i);
if(index == 0) {
switch(index) { variable_item_set_locked(t_item, true, "RGB\nOFF!");
// OneColor } else {
case 0: variable_item_set_locked(t_item, false, "RGB\nOFF!");
break; }
// Gradient
case 1:
break;
// Rainbow
case 2:
break;
default:
break;
} }
// for(int i = slide; i < (slide + 7); i++) {
// VariableItem* t_item = variable_item_list_get(app->variable_item_list_rgb, i);
// if(index == 0) {
// variable_item_set_locked(t_item, true, "RGB MOD\nOFF!");
// } else {
// variable_item_set_locked(t_item, false, "RGB MOD\nOFF!");
// }
// }
} }
static void rgb_backlight_rainbow_changed(VariableItem* item) { static void rgb_backlight_rainbow_changed(VariableItem* item) {
@@ -312,20 +261,6 @@ static void rgb_backlight_rainbow_changed(VariableItem* item) {
rainbow_timer_starter(app->notification->rgb_srv); rainbow_timer_starter(app->notification->rgb_srv);
rgb_backlight_settings_save(app->notification->rgb_srv->settings); rgb_backlight_settings_save(app->notification->rgb_srv->settings);
// Lock/Unlock color settings if rainbow mode Enabled/Disabled (0-3 index if debug off and 1-4 index if debug on)
int slide = 0;
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
slide = 1;
}
for(int i = slide; i < (slide + 4); i++) {
VariableItem* t_item = variable_item_list_get(app->variable_item_list_rgb, i);
if(index > 0) {
variable_item_set_locked(t_item, true, "Rainbow mode\nenabled!");
} else {
variable_item_set_locked(t_item, false, "Rainbow mode\nenabled!");
}
}
// restore saved rgb backlight settings if we switch_off rainbow mode // restore saved rgb backlight settings if we switch_off rainbow mode
if(app->notification->rgb_srv->settings->rainbow_mode == 0) { if(app->notification->rgb_srv->settings->rainbow_mode == 0) {
rgb_backlight_set_static_color(app->notification->rgb_srv->settings->static_color_index); rgb_backlight_set_static_color(app->notification->rgb_srv->settings->static_color_index);
@@ -356,9 +291,8 @@ static void rgb_backlight_rainbow_step_changed(VariableItem* item) {
rgb_backlight_settings_save(app->notification->rgb_srv->settings); rgb_backlight_settings_save(app->notification->rgb_srv->settings);
} }
// Set rgb_backlight colors static and custom
static void color_changed(VariableItem* item) { static void vd1_color_changed(VariableItem* item) {
NotificationAppSettings* app = variable_item_get_context(item); NotificationAppSettings* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item); uint8_t index = variable_item_get_current_value_index(item);
@@ -370,72 +304,26 @@ static void color_changed(VariableItem* item) {
rgb_backlight_settings_save(app->notification->rgb_srv->settings); rgb_backlight_settings_save(app->notification->rgb_srv->settings);
} }
static void color_set_custom_red(VariableItem* item) { static void vd2_color_changed(VariableItem* item) {
NotificationAppSettings* app = variable_item_get_context(item); NotificationAppSettings* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item); uint8_t index = variable_item_get_current_value_index(item);
// Update all current colors with selected customs and save changed custom color to settings variable_item_set_current_value_text(item, rgb_backlight_get_color_text(index));
app->notification->rgb_srv->current_red = index; app->notification->rgb_srv->settings->static_color_index = index;
app->notification->rgb_srv->current_green = app->notification->rgb_srv->settings->custom_green;
app->notification->rgb_srv->current_blue = app->notification->rgb_srv->settings->custom_blue;
app->notification->rgb_srv->settings->custom_red = index;
app->notification->rgb_srv->settings->static_color_index = 13;
char valtext[4] = {};
snprintf(valtext, sizeof(valtext), "%d", index);
variable_item_set_current_value_text(item, valtext);
// Set to custom color explicitly
variable_item_set_current_value_index(temp_item, 13);
variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
rgb_backlight_set_static_color(index);
rgb_backlight_update(app->notification->rgb_srv->settings->brightness); rgb_backlight_update(app->notification->rgb_srv->settings->brightness);
rgb_backlight_settings_save(app->notification->rgb_srv->settings); rgb_backlight_settings_save(app->notification->rgb_srv->settings);
} }
static void color_set_custom_green(VariableItem* item) {
static void vd3_color_changed(VariableItem* item) {
NotificationAppSettings* app = variable_item_get_context(item); NotificationAppSettings* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item); uint8_t index = variable_item_get_current_value_index(item);
// Update all current colors with selected customs and save changed custom color to settings variable_item_set_current_value_text(item, rgb_backlight_get_color_text(index));
app->notification->rgb_srv->current_red = app->notification->rgb_srv->settings->custom_red; app->notification->rgb_srv->settings->static_color_index = index;
app->notification->rgb_srv->current_green = index;
app->notification->rgb_srv->current_blue = app->notification->rgb_srv->settings->custom_blue;
app->notification->rgb_srv->settings->custom_green = index;
app->notification->rgb_srv->settings->static_color_index = 13;
char valtext[4] = {};
snprintf(valtext, sizeof(valtext), "%d", index);
variable_item_set_current_value_text(item, valtext);
// Set to custom color explicitly
variable_item_set_current_value_index(temp_item, 13);
variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
rgb_backlight_update(app->notification->rgb_srv->settings->brightness);
rgb_backlight_settings_save(app->notification->rgb_srv->settings);
}
static void color_set_custom_blue(VariableItem* item) {
NotificationAppSettings* app = variable_item_get_context(item);
uint8_t index = variable_item_get_current_value_index(item);
// Update all current colors with selected customs and save changed custom color to settings
app->notification->rgb_srv->current_red = app->notification->rgb_srv->settings->custom_red;
app->notification->rgb_srv->current_green = app->notification->rgb_srv->settings->custom_green;
app->notification->rgb_srv->current_blue = index;
app->notification->rgb_srv->settings->custom_blue = index;
app->notification->rgb_srv->settings->static_color_index = 13;
char valtext[4] = {};
snprintf(valtext, sizeof(valtext), "%d", index);
variable_item_set_current_value_text(item, valtext);
// Set to custom color explicitly
variable_item_set_current_value_index(temp_item, 13);
variable_item_set_current_value_text(temp_item, rgb_backlight_get_color_text(13));
rgb_backlight_set_static_color(index);
rgb_backlight_update(app->notification->rgb_srv->settings->brightness); rgb_backlight_update(app->notification->rgb_srv->settings->brightness);
rgb_backlight_settings_save(app->notification->rgb_srv->settings); rgb_backlight_settings_save(app->notification->rgb_srv->settings);
} }
@@ -547,106 +435,63 @@ static NotificationAppSettings* alloc_settings(void) {
} }
//--- RGB BACKLIGHT --- //--- RGB BACKLIGHT ---
app->variable_item_list_rgb = variable_item_list_alloc(); app->variable_item_list_rgb = variable_item_list_alloc();
View* view_rgb = variable_item_list_get_view(app->variable_item_list_rgb); View* view_rgb = variable_item_list_get_view(app->variable_item_list_rgb);
// set callback for OK pressed in rgb_settings_menu // set callback for exit from rgb_settings_menu
view_set_previous_callback(view_rgb, notification_app_rgb_settings_exit); view_set_previous_callback(view_rgb, notification_app_rgb_settings_exit);
// // Show rgb_backlight_Installed_Swith only in Debug mode // // Show rgb_backlight_Installed_Swith only in Debug mode
// if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) { if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
// item = variable_item_list_add(
// app->variable_item_list_rgb,
// "RGB mod installed",
// RGB_BACKLIGHT_INSTALLED_COUNT,
// rgb_backlight_installed_changed,
// app);
// value_index = value_index_bool(
// app->notification->rgb_srv->settings->rgb_backlight_installed,
// rgb_backlight_installed_value,
// RGB_BACKLIGHT_INSTALLED_COUNT);
// variable_item_set_current_value_index(item, value_index);
// variable_item_set_current_value_text(item, rgb_backlight_installed_text[value_index]);
// }
// Show rgb_backlight_mode_swith only in Debug mode or when rgb_mode is not OFF.
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug) ||
(app->notification->rgb_srv->settings->rgb_backlight_mode > 0)) {
item = variable_item_list_add( item = variable_item_list_add(
app->variable_item_list_rgb, app->variable_item_list_rgb,
"RGB MODE", "RGB backlight installed",
RGB_BACKLIGHT_MODE_COUNT, RGB_BACKLIGHT_INSTALLED_COUNT,
rgb_backlight_mode_changed, rgb_backlight_installed_changed,
app); app);
value_index = value_index_uint32( value_index = value_index_bool(
app->notification->rgb_srv->settings->rgb_backlight_mode, app->notification->rgb_srv->settings->rgb_backlight_installed,
rgb_backlight_mode_value, rgb_backlight_installed_value,
RGB_BACKLIGHT_MODE_COUNT); RGB_BACKLIGHT_INSTALLED_COUNT);
variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, rgb_backlight_mode_text[value_index]); variable_item_set_current_value_text(item, rgb_backlight_installed_text[value_index]);
} }
// Static Colors settings // vd1 color
item = variable_item_list_add( item = variable_item_list_add(
app->variable_item_list_rgb, app->variable_item_list_rgb,
"LCD Color", "VD1 Color",
rgb_backlight_get_color_count(), rgb_backlight_get_color_count(),
color_changed, vd1_color_changed,
app); app);
value_index = app->notification->rgb_srv->settings->static_color_index; value_index = app->notification->rgb_srv->settings->static_color_index;
variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_index(item, value_index);
variable_item_set_current_value_text(item, rgb_backlight_get_color_text(value_index)); variable_item_set_current_value_text(item, rgb_backlight_get_color_text(value_index));
variable_item_set_locked(
item, (app->notification->rgb_srv->settings->rainbow_mode > 0), "Rainbow mode\nenabled!");
variable_item_set_locked(
item,
(app->notification->rgb_srv->settings->rgb_backlight_installed == 0),
"RGB MOD \nOFF!");
temp_item = item; // vd2 color
// Custom Color - REFACTOR THIS
item = variable_item_list_add( item = variable_item_list_add(
app->variable_item_list_rgb, "Custom Red", 255, color_set_custom_red, app); app->variable_item_list_rgb,
value_index = app->notification->rgb_srv->settings->custom_red; "VD2 Color",
rgb_backlight_get_color_count(),
vd2_color_changed,
app);
value_index = app->notification->rgb_srv->settings->static_color_index;
variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_index(item, value_index);
char valtext[4] = {}; variable_item_set_current_value_text(item, rgb_backlight_get_color_text(value_index));
snprintf(valtext, sizeof(valtext), "%d", value_index);
variable_item_set_current_value_text(item, valtext);
variable_item_set_locked(
item, (app->notification->rgb_srv->settings->rainbow_mode > 0), "Rainbow mode\nenabled!");
variable_item_set_locked(
item,
(app->notification->rgb_srv->settings->rgb_backlight_installed == 0),
"RGB MOD \nOFF!");
// vd 3 color
item = variable_item_list_add( item = variable_item_list_add(
app->variable_item_list_rgb, "Custom Green", 255, color_set_custom_green, app); app->variable_item_list_rgb,
value_index = app->notification->rgb_srv->settings->custom_green; "VD3 Color",
rgb_backlight_get_color_count(),
vd3_color_changed,
app);
value_index = app->notification->rgb_srv->settings->static_color_index;
variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_index(item, value_index);
snprintf(valtext, sizeof(valtext), "%d", value_index); variable_item_set_current_value_text(item, rgb_backlight_get_color_text(value_index));
variable_item_set_current_value_text(item, valtext);
variable_item_set_locked(
item, (app->notification->rgb_srv->settings->rainbow_mode > 0), "Rainbow mode\nenabled!");
variable_item_set_locked(
item,
(app->notification->rgb_srv->settings->rgb_backlight_installed == 0),
"RGB MOD \nOFF!");
item = variable_item_list_add( // Rainbow mode
app->variable_item_list_rgb, "Custom Blue", 255, color_set_custom_blue, app);
value_index = app->notification->rgb_srv->settings->custom_blue;
variable_item_set_current_value_index(item, value_index);
snprintf(valtext, sizeof(valtext), "%d", value_index);
variable_item_set_current_value_text(item, valtext);
variable_item_set_locked(
item, (app->notification->rgb_srv->settings->rainbow_mode > 0), "Rainbow mode\nenabled!");
variable_item_set_locked(
item,
(app->notification->rgb_srv->settings->rgb_backlight_installed == 0),
"RGB MOD \nOFF!");
// Rainbow (based on Willy-JL idea) settings
item = variable_item_list_add( item = variable_item_list_add(
app->variable_item_list_rgb, app->variable_item_list_rgb,
"Rainbow mode", "Rainbow mode",