Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-23 05:24:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic changes.

Browse Source
This commit is contained in:
Dmitry422
2025-03-05 22:47:28 +07:00
parent 82fd6b2130
commit bf50f0cd20
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
applications/services/notification/notification_app.c
View File

@@ -220,26 +220,31 @@ static void rgb_mod_rainbow_timer_callback(void* context) {
furi_assert(context); furi_assert(context);
NotificationApp* app = context; NotificationApp* app = context;
// УЧЕСТЬ СТЕП и его вероятность превысить 255
// При выключении радуги активировать настроенный в меню цвет // При выключении радуги активировать настроенный в меню цвет
app->rgb_mod_rainbow_color3++; if(app->rgb_mod_rainbow_red >= 255) {
app->rgb_mod_rainbow_red = 1;
if(app->rgb_mod_rainbow_color3 == 255) { app->rgb_mod_rainbow_green += app->settings.rgb_mod_rainbow_step;
app->rgb_mod_rainbow_color2++;
app->rgb_mod_rainbow_color3 = 1;
} }
if(app->rgb_mod_rainbow_color2 == 255) { if(app->rgb_mod_rainbow_green >= 255) {
app->rgb_mod_rainbow_color1++; app->rgb_mod_rainbow_green = 1;
app->rgb_mod_rainbow_color2 = 1; app->rgb_mod_rainbow_blue += app->settings.rgb_mod_rainbow_step;
} }
if(app->rgb_mod_rainbow_color1 == 255) {
app->rgb_mod_rainbow_color1 = 1; if(app->rgb_mod_rainbow_blue >= 255) {
app->rgb_mod_rainbow_blue = 1;
} }
FURI_LOG_I("RAINBOW", "Color3 %u", app->rgb_mod_rainbow_color3);
FURI_LOG_I("RAINBOW", "Color2 %u", app->rgb_mod_rainbow_color2); rgb_backlight_set_custom_color(app->rgb_mod_rainbow_red, 0);
FURI_LOG_I("RAINBOW", "Color1 %u", app->rgb_mod_rainbow_color1); rgb_backlight_set_custom_color(app->rgb_mod_rainbow_green, 1);
rgb_backlight_set_custom_color(app->rgb_mod_rainbow_blue, 2);
FURI_LOG_I("RAINBOW", "RED %u", app->rgb_mod_rainbow_red);
FURI_LOG_I("RAINBOW", "GREEN %u", app->rgb_mod_rainbow_green);
FURI_LOG_I("RAINBOW", "BLUE %u", app->rgb_mod_rainbow_blue);
app->rgb_mod_rainbow_red += app->settings.rgb_mod_rainbow_step;
} }
// END OF RGB MOD RAINBOW SECTION // END OF RGB MOD RAINBOW SECTION
@@ -274,7 +279,7 @@ static void notification_process_notification_message(
&app->display, &app->display,
notification_message->data.led.value * display_brightness_setting); notification_message->data.led.value * display_brightness_setting);
reset_mask |= reset_display_mask; reset_mask |= reset_display_mask;
//start rgb_mod_rainbow_timer when display backlight is ON //start rgb_mod_rainbow_timer when display backlight is ON and all corresponding settings is ON too
rgb_mod_rainbow_timer_control(app); rgb_mod_rainbow_timer_control(app);
} else { } else {
reset_mask &= ~reset_display_mask; reset_mask &= ~reset_display_mask;
@@ -621,9 +626,9 @@ static NotificationApp* notification_app_alloc(void) {
app->settings.rgb_mod_rainbow = false; app->settings.rgb_mod_rainbow = false;
app->settings.rgb_mod_rainbow_speed_ms = 1000; app->settings.rgb_mod_rainbow_speed_ms = 1000;
app->settings.rgb_mod_rainbow_step = 1; app->settings.rgb_mod_rainbow_step = 1;
app->rgb_mod_rainbow_color1 = 1; app->rgb_mod_rainbow_red = 1;
app->rgb_mod_rainbow_color2 = 1; app->rgb_mod_rainbow_green = 1;
app->rgb_mod_rainbow_color3 = 1; app->rgb_mod_rainbow_blue = 1;
//define rgb_mod_rainbow_timer and they callback //define rgb_mod_rainbow_timer and they callback
app->rgb_mod_rainbow_timer = app->rgb_mod_rainbow_timer =
@@ -699,7 +704,7 @@ int32_t notification_srv(void* p) {
case SaveSettingsMessage: case SaveSettingsMessage:
notification_save_settings(app); notification_save_settings(app);
rgb_backlight_save_settings(); rgb_backlight_save_settings();
//call rgb_mod_timer_control when we save settings //call rgb_mod_timer_control (start or stop) when we save settings
rgb_mod_rainbow_timer_control(app); rgb_mod_rainbow_timer_control(app);
break; break;
case LoadSettingsMessage: case LoadSettingsMessage:

9
applications/services/notification/notification_app.h
View File

@@ -48,7 +48,7 @@ typedef struct {
bool rgb_mod_installed; bool rgb_mod_installed;
bool rgb_mod_rainbow; bool rgb_mod_rainbow;
uint32_t rgb_mod_rainbow_speed_ms; uint32_t rgb_mod_rainbow_speed_ms;
uint32_t rgb_mod_rainbow_step; uint16_t rgb_mod_rainbow_step;
} NotificationSettings; } NotificationSettings;
@@ -63,10 +63,9 @@ struct NotificationApp {
// rainbow mode section // rainbow mode section
FuriTimer* rgb_mod_rainbow_timer; FuriTimer* rgb_mod_rainbow_timer;
uint8_t rgb_mod_rainbow_color1; uint16_t rgb_mod_rainbow_red;
uint8_t rgb_mod_rainbow_color2; uint16_t rgb_mod_rainbow_green;
uint8_t rgb_mod_rainbow_color3; uint16_t rgb_mod_rainbow_blue;
NotificationSettings settings; NotificationSettings settings;
}; };