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

prevent from extra ticking when key pressed with rgb_mod_installed

Browse Source
This commit is contained in:
Dmitry422
2026-02-03 01:33:13 +07:00
parent e4aac3dbc6
commit 8676e8a7b0
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,12 @@ static uint8_t notification_settings_get_display_brightness(NotificationApp* app
static uint8_t notification_settings_get_rgb_led_brightness(NotificationApp* app, uint8_t value);
static uint32_t notification_settings_display_off_delay_ticks(NotificationApp* app);
// --- RGB BACKLIGHT ---
// status of lcd backlight
// used to ignore backlight_on event if backlight active now
// prevent from extra ticking when key pressed with rgb_mod_installed
static bool lcd_backligth_is_on = false;
// --- RGB BACKLIGHT ---
// local variable for local use
uint8_t rgb_backlight_installed_variable = 0;
@@ -330,6 +334,11 @@ static void notification_apply_notification_led_layer(
layer->index = LayerNotification;
// set layer
layer->value[LayerNotification] = layer_value;
// if layer.light = LightBacklight and backlight active now then just exit.
// prevent from extra ticking when key pressed with rgb_mod_installed
if((layer->light == LightBacklight) & lcd_backligth_is_on) return;
// apply
furi_hal_light_set(layer->light, layer->value[LayerNotification]);
}
@@ -371,11 +380,9 @@ static void notification_reset_notification_layer(
}
if(reset_mask & reset_display_mask) {
if(!float_is_equal(display_brightness_set, app->settings.display_brightness)) {
// --- NIGHT SHIFT ---
furi_hal_light_set(
LightBacklight,
app->settings.display_brightness * 0xFF * app->current_night_shift * 1.0f);
// --- NIGHT SHIFT END---
}
if(app->settings.display_off_delay_ms > 0) {
furi_timer_start(
@@ -460,26 +467,31 @@ static void notification_process_notification_message(
while(notification_message != NULL) {
switch(notification_message->type) {
case NotificationMessageTypeLedDisplayBacklight:
// if on - switch on and start timer
// if off - switch off and stop timer
// on timer - switch off
// --- NIGHT SHIFT ---
// if on (data.led.value =0xFF) - switch on and start timer
// if off (data.led.value =0x0) - switch off and stop timer
if(notification_message->data.led.value > 0x00) {
// Backlight ON
notification_apply_notification_led_layer(
&app->display,
notification_message->data.led.value * display_brightness_setting *
app->current_night_shift * 1.0f);
reset_mask |= reset_display_mask;
lcd_backligth_is_on = true;
//start rgb_mod_rainbow_timer when display backlight is ON and all corresponding settings is ON too
rainbow_timer_starter(app);
// --- NIGHT SHIFT END ---
} else {
// Backlight OFF
reset_mask &= ~reset_display_mask;
notification_reset_notification_led_layer(&app->display);
lcd_backligth_is_on = false;
if(furi_timer_is_running(app->display_timer)) {
furi_timer_stop(app->display_timer);
}
//stop rgb_mod_rainbow_timer when display backlight is OFF
if(furi_timer_is_running(app->rainbow_timer)) {
rainbow_timer_stop(app);
@@ -487,13 +499,13 @@ static void notification_process_notification_message(
}
break;
case NotificationMessageTypeLedDisplayBacklightEnforceOn:
// --- NIGHT SHIFT ---
if(!app->display_led_lock) {
app->display_led_lock = true;
notification_apply_internal_led_layer(
&app->display,
notification_message->data.led.value * display_brightness_setting *
app->current_night_shift * 1.0f);
lcd_backligth_is_on = true;
}
break;
case NotificationMessageTypeLedDisplayBacklightEnforceAuto:
@@ -505,7 +517,7 @@ static void notification_process_notification_message(
app->current_night_shift * 1.0f);
// --- NIGHT SHIFT END ---
} else {
FURI_LOG_E(TAG, "Incorrect BacklightEnforce use");
FURI_LOG_E(TAG, "Incorrect BacklightEnforceAuto usage");
}
break;
case NotificationMessageTypeLedRed: