Still in progress

This commit is contained in:
Dmitry422
2025-03-12 18:15:38 +07:00
parent 4045628ac6
commit 7a19c9e549
14 changed files with 361 additions and 543 deletions

View File

@@ -9,7 +9,7 @@
#include "notification.h"
#include "notification_messages.h"
#include "notification_app.h"
#include "applications/settings/notification_settings/rgb_backlight.h"
#include "applications/services/rgb_backlight/rgb_backlight.h"
#define TAG "NotificationSrv"
@@ -189,110 +189,110 @@ static void notification_display_timer(void* ctx) {
notification_message(app, &sequence_display_backlight_off);
}
// --- RGB MOD RAINBOW SECTION ---
// // --- RGB MOD RAINBOW SECTION ---
//start furi timer for rgb_mod_rainbow
static void rgb_mod_rainbow_timer_start(NotificationApp* app) {
furi_timer_start(
app->rgb_mod_rainbow_timer, furi_ms_to_ticks(app->settings.rgb_mod_rainbow_speed_ms));
}
// //start furi timer for rgb_mod_rainbow
// static void rgb_mod_rainbow_timer_start(NotificationApp* app) {
// furi_timer_start(
// app->rgb_mod_rainbow_timer, furi_ms_to_ticks(app->settings.rgb_mod_rainbow_speed_ms));
// }
//stop furi timer for rgb_mod_rainbow
static void rgb_mod_rainbow_timer_stop(NotificationApp* app) {
furi_timer_stop(app->rgb_mod_rainbow_timer);
}
// //stop furi timer for rgb_mod_rainbow
// static void rgb_mod_rainbow_timer_stop(NotificationApp* app) {
// furi_timer_stop(app->rgb_mod_rainbow_timer);
// }
// start/restart/stop rgb_mod_rainbow_timer only if rgb_mod_installed and apply rainbow colors to backlight
static void rgb_mod_rainbow_timer_starter(NotificationApp* app) {
if(app->settings.rgb_mod_installed) {
if(app->settings.rgb_mod_rainbow_mode > 0) {
rgb_mod_rainbow_update(
app->rgb_mod_rainbow_red,
app->rgb_mod_rainbow_green,
app->rgb_mod_rainbow_blue,
app->settings.display_brightness);
rgb_mod_rainbow_timer_start(app);
} else {
if(furi_timer_is_running(app->rgb_mod_rainbow_timer)) {
rgb_mod_rainbow_timer_stop(app);
}
}
}
}
// // start/restart/stop rgb_mod_rainbow_timer only if rgb_mod_installed and apply rainbow colors to backlight
// static void rgb_mod_rainbow_timer_starter(NotificationApp* app) {
// if(app->settings.rgb_mod_installed) {
// if(app->settings.rgb_mod_rainbow_mode > 0) {
// rgb_mod_rainbow_update(
// app->rgb_mod_rainbow_red,
// app->rgb_mod_rainbow_green,
// app->rgb_mod_rainbow_blue,
// app->settings.display_brightness);
// rgb_mod_rainbow_timer_start(app);
// } else {
// if(furi_timer_is_running(app->rgb_mod_rainbow_timer)) {
// rgb_mod_rainbow_timer_stop(app);
// }
// }
// }
// }
// callback for rgb_mod_rainbow_timer (what we do when timer end)
static void rgb_mod_rainbow_timer_callback(void* context) {
furi_assert(context);
NotificationApp* app = context;
// // callback for rgb_mod_rainbow_timer (what we do when timer end)
// static void rgb_mod_rainbow_timer_callback(void* context) {
// furi_assert(context);
// NotificationApp* app = context;
// if rgb_mode_rainbow_mode is rainbow do rainbow effect
if(app->settings.rgb_mod_rainbow_mode == 1) {
switch(app->rgb_mod_rainbow_stage) {
// from red to yellow
case 1:
app->rgb_mod_rainbow_green += app->settings.rgb_mod_rainbow_step;
if(app->rgb_mod_rainbow_green >= 255) {
app->rgb_mod_rainbow_green = 255;
app->rgb_mod_rainbow_stage++;
}
break;
// yellow red to green
case 2:
app->rgb_mod_rainbow_red -= app->settings.rgb_mod_rainbow_step;
if(app->rgb_mod_rainbow_red <= 0) {
app->rgb_mod_rainbow_red = 0;
app->rgb_mod_rainbow_stage++;
}
break;
// from green to light blue
case 3:
app->rgb_mod_rainbow_blue += app->settings.rgb_mod_rainbow_step;
if(app->rgb_mod_rainbow_blue >= 255) {
app->rgb_mod_rainbow_blue = 255;
app->rgb_mod_rainbow_stage++;
}
break;
//from light blue to blue
case 4:
app->rgb_mod_rainbow_green -= app->settings.rgb_mod_rainbow_step;
if(app->rgb_mod_rainbow_green <= 0) {
app->rgb_mod_rainbow_green = 0;
app->rgb_mod_rainbow_stage++;
}
break;
//from blue to violet
case 5:
app->rgb_mod_rainbow_red += app->settings.rgb_mod_rainbow_step;
if(app->rgb_mod_rainbow_red >= 255) {
app->rgb_mod_rainbow_red = 255;
app->rgb_mod_rainbow_stage++;
}
break;
//from violet to red
case 6:
app->rgb_mod_rainbow_blue -= app->settings.rgb_mod_rainbow_step;
if(app->rgb_mod_rainbow_blue <= 0) {
app->rgb_mod_rainbow_blue = 0;
app->rgb_mod_rainbow_stage = 1;
}
break;
default:
break;
}
// // if rgb_mode_rainbow_mode is rainbow do rainbow effect
// if(app->settings.rgb_mod_rainbow_mode == 1) {
// switch(app->rgb_mod_rainbow_stage) {
// // from red to yellow
// case 1:
// app->rgb_mod_rainbow_green += app->settings.rgb_mod_rainbow_step;
// if(app->rgb_mod_rainbow_green >= 255) {
// app->rgb_mod_rainbow_green = 255;
// app->rgb_mod_rainbow_stage++;
// }
// break;
// // yellow red to green
// case 2:
// app->rgb_mod_rainbow_red -= app->settings.rgb_mod_rainbow_step;
// if(app->rgb_mod_rainbow_red <= 0) {
// app->rgb_mod_rainbow_red = 0;
// app->rgb_mod_rainbow_stage++;
// }
// break;
// // from green to light blue
// case 3:
// app->rgb_mod_rainbow_blue += app->settings.rgb_mod_rainbow_step;
// if(app->rgb_mod_rainbow_blue >= 255) {
// app->rgb_mod_rainbow_blue = 255;
// app->rgb_mod_rainbow_stage++;
// }
// break;
// //from light blue to blue
// case 4:
// app->rgb_mod_rainbow_green -= app->settings.rgb_mod_rainbow_step;
// if(app->rgb_mod_rainbow_green <= 0) {
// app->rgb_mod_rainbow_green = 0;
// app->rgb_mod_rainbow_stage++;
// }
// break;
// //from blue to violet
// case 5:
// app->rgb_mod_rainbow_red += app->settings.rgb_mod_rainbow_step;
// if(app->rgb_mod_rainbow_red >= 255) {
// app->rgb_mod_rainbow_red = 255;
// app->rgb_mod_rainbow_stage++;
// }
// break;
// //from violet to red
// case 6:
// app->rgb_mod_rainbow_blue -= app->settings.rgb_mod_rainbow_step;
// if(app->rgb_mod_rainbow_blue <= 0) {
// app->rgb_mod_rainbow_blue = 0;
// app->rgb_mod_rainbow_stage = 1;
// }
// break;
// default:
// break;
// }
rgb_mod_rainbow_update(
app->rgb_mod_rainbow_red,
app->rgb_mod_rainbow_green,
app->rgb_mod_rainbow_blue,
app->settings.display_brightness);
}
// rgb_mod_rainbow_update(
// app->rgb_mod_rainbow_red,
// app->rgb_mod_rainbow_green,
// app->rgb_mod_rainbow_blue,
// app->settings.display_brightness);
// }
// if rgb_mode_rainbow_mode is ..... do another effect
// if(app->settings.rgb_mod_rainbow_mode == 2) {
// }
}
// // if rgb_mode_rainbow_mode is ..... do another effect
// // if(app->settings.rgb_mod_rainbow_mode == 2) {
// // }
// }
// --- END OF RGB MOD RAINBOW SECTION ---
// // --- END OF RGB MOD RAINBOW SECTION ---
// message processing
static void notification_process_notification_message(
@@ -326,7 +326,7 @@ static void notification_process_notification_message(
reset_mask |= reset_display_mask;
//start rgb_mod_rainbow_timer when display backlight is ON and all corresponding settings is ON too
rgb_mod_rainbow_timer_starter(app);
rainbow_timer_starter(app->rgb_srv);
} else {
reset_mask &= ~reset_display_mask;
@@ -335,8 +335,8 @@ static void notification_process_notification_message(
furi_timer_stop(app->display_timer);
}
//stop rgb_mod_rainbow_timer when display backlight is OFF
if(furi_timer_is_running(app->rgb_mod_rainbow_timer)) {
rgb_mod_rainbow_timer_stop(app);
if(furi_timer_is_running(app->rgb_srv->rainbow_timer)) {
rainbow_timer_stop(app->rgb_srv);
}
}
break;
@@ -664,25 +664,26 @@ static NotificationApp* notification_app_alloc(void) {
furi_pubsub_subscribe(app->event_record, input_event_callback, app);
notification_message(app, &sequence_display_backlight_on);
// --- RGB MOD INIT SETTINGS SECTION ---
// // --- RGB MOD INIT SETTINGS SECTION ---
app->settings.rgb_mod_installed = false;
app->settings.rgb_mod_rainbow_mode = 0;
app->settings.rgb_mod_rainbow_speed_ms = 100;
app->settings.rgb_mod_rainbow_step = 5;
app->rgb_mod_rainbow_red = 255;
app->rgb_mod_rainbow_green = 0;
app->rgb_mod_rainbow_blue = 0;
app->rgb_mod_rainbow_stage = 1;
// app->settings.rgb_mod_installed = false;
// app->settings.rgb_mod_rainbow_mode = 0;
// app->settings.rgb_mod_rainbow_speed_ms = 100;
// app->settings.rgb_mod_rainbow_step = 5;
// app->rgb_mod_rainbow_red = 255;
// app->rgb_mod_rainbow_green = 0;
// app->rgb_mod_rainbow_blue = 0;
// app->rgb_mod_rainbow_stage = 1;
// //define rgb_mod_rainbow_timer and they callback
// app->rgb_mod_rainbow_timer =
// furi_timer_alloc(rgb_mod_rainbow_timer_callback, FuriTimerTypePeriodic, app);
// // --- END OF RGB MOD INIT SETTINGS SECTION ---
//define rgb_mod_rainbow_timer and they callback
app->rgb_mod_rainbow_timer =
furi_timer_alloc(rgb_mod_rainbow_timer_callback, FuriTimerTypePeriodic, app);
return app;
// --- END OF RGB MOD INIT SETTINGS SECTION ---
}
static void notification_storage_callback(const void* message, void* context) {
furi_assert(context);
NotificationApp* app = context;
@@ -703,8 +704,8 @@ static void notification_apply_settings(NotificationApp* app) {
}
notification_apply_lcd_contrast(app);
//start rgb_mod_rainbow_timer on system init if they ON in config
rgb_mod_rainbow_timer_starter(app);
// //start rgb_mod_rainbow_timer on system init if they ON in config
// rgb_mod_rainbow_timer_starter(app);
}
static void notification_init_settings(NotificationApp* app) {
@@ -723,7 +724,7 @@ static void notification_init_settings(NotificationApp* app) {
int32_t notification_srv(void* p) {
UNUSED(p);
NotificationApp* app = notification_app_alloc();
app->rgb_srv = furi_record_open (RECORD_RGB_BACKLIGHT);
notification_init_settings(app);
notification_vibro_off();
@@ -748,8 +749,8 @@ int32_t notification_srv(void* p) {
break;
case SaveSettingsMessage:
//call rgb_mod_timer_control (start or stop) when we save settings
rgb_mod_rainbow_timer_starter(app);
rgb_backlight_save_settings();
rainbow_timer_starter(app->rgb_srv);
rgb_backlight_settings_save(app->rgb_srv->settings);
notification_save_settings(app);
break;
case LoadSettingsMessage: