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

Auto_poweroff option moved from desktop to power.

Browse Source 
Add settings for power service (load|save).
This commit is contained in:
Dmitry422
2025-01-14 02:01:54 +07:00
parent 1a95757a75
commit c73495767c
16 changed files with 375 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
applications/services/desktop/desktop.c
View File

@@ -19,12 +19,6 @@ static void desktop_auto_lock_arm(Desktop*);
static void desktop_auto_lock_inhibit(Desktop*);
static void desktop_start_auto_lock_timer(Desktop*);
static void desktop_apply_settings(Desktop*);
//--- auto_power_off_timer
#include <power/power_service/power.h>
static void desktop_start_auto_poweroff_timer(Desktop*);
static void desktop_auto_poweroff_arm(Desktop*);
static void desktop_auto_poweroff_inhibit(Desktop*);
//---
static void desktop_loader_callback(const void* message, void* context) {
furi_assert(context);
@@ -137,9 +131,7 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
}
desktop_auto_lock_inhibit(desktop);
//--- auto_power_off_timer
desktop_auto_poweroff_inhibit(desktop);
//--
desktop->app_running = true;
furi_semaphore_release(desktop->animation_semaphore);
@@ -147,20 +139,12 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
} else if(event == DesktopGlobalAfterAppFinished) {
animation_manager_load_and_continue_animation(desktop->animation_manager);
desktop_auto_lock_arm(desktop);
//--- auto_power_off_timer
desktop_auto_poweroff_arm(desktop);
//---
desktop->app_running = false;
} else if(event == DesktopGlobalAutoLock) {
if(!desktop->app_running && !desktop->locked) {
desktop_lock(desktop);
}
} else if(event == DesktopGlobalAutoPowerOff) {
if(!desktop->app_running) {
Power* power = furi_record_open(RECORD_POWER);
power_off(power);
}
} else if(event == DesktopGlobalSaveSettings) {
desktop_settings_save(&desktop->settings);
desktop_apply_settings(desktop);
@@ -195,9 +179,6 @@ static void desktop_input_event_callback(const void* value, void* context) {
Desktop* desktop = context;
if(event->type == InputTypePress) {
desktop_start_auto_lock_timer(desktop);
//--- auto_power_off_timer
desktop_start_auto_poweroff_timer(desktop);
//---
}
}
@@ -234,41 +215,6 @@ static void desktop_auto_lock_inhibit(Desktop* desktop) {
}
}
//--- auto_power_off_timer
static void desktop_auto_poweroff_timer_callback(void* context) {
furi_assert(context);
Desktop* desktop = context;
view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalAutoPowerOff);
}
static void desktop_start_auto_poweroff_timer(Desktop* desktop) {
furi_timer_start(
desktop->auto_poweroff_timer, furi_ms_to_ticks(desktop->settings.auto_poweroff_delay_ms));
}
static void desktop_stop_auto_poweroff_timer(Desktop* desktop) {
furi_timer_stop(desktop->auto_poweroff_timer);
}
static void desktop_auto_poweroff_arm(Desktop* desktop) {
if(desktop->settings.auto_poweroff_delay_ms) {
if(!desktop->input_events_subscription) {
desktop->input_events_subscription = furi_pubsub_subscribe(
desktop->input_events_pubsub, desktop_input_event_callback, desktop);
}
desktop_start_auto_poweroff_timer(desktop);
}
}
static void desktop_auto_poweroff_inhibit(Desktop* desktop) {
desktop_stop_auto_poweroff_timer(desktop);
if(desktop->input_events_subscription) {
furi_pubsub_unsubscribe(desktop->input_events_pubsub, desktop->input_events_subscription);
desktop->input_events_subscription = NULL;
}
}
//---
static void desktop_clock_timer_callback(void* context) {
furi_assert(context);
Desktop* desktop = context;
@@ -294,9 +240,6 @@ static void desktop_apply_settings(Desktop* desktop) {
if(!desktop->app_running && !desktop->locked) {
desktop_auto_lock_arm(desktop);
//--- auto_power_off_timer
desktop_auto_poweroff_arm(desktop);
//---
}
desktop->in_transition = false;
@@ -432,10 +375,6 @@ static Desktop* desktop_alloc(void) {
desktop->auto_lock_timer =
furi_timer_alloc(desktop_auto_lock_timer_callback, FuriTimerTypeOnce, desktop);
//--- auto_power_off_timer
desktop->auto_poweroff_timer =
furi_timer_alloc(desktop_auto_poweroff_timer_callback, FuriTimerTypeOnce, desktop);
//---
desktop->status_pubsub = furi_pubsub_alloc();

3
applications/services/desktop/desktop_i.h
View File

@@ -75,9 +75,6 @@ struct Desktop {
FuriTimer* auto_lock_timer;
FuriTimer* update_clock_timer;
//--- auto_power_off_timer
FuriTimer* auto_poweroff_timer;
//---
AnimationManager* animation_manager;
FuriSemaphore* animation_semaphore;

31
applications/services/desktop/desktop_settings.c
View File

@@ -6,8 +6,8 @@
#define TAG "DesktopSettings"
#define DESKTOP_SETTINGS_VER_14 (14)
#define DESKTOP_SETTINGS_VER (15)
#define DESKTOP_SETTINGS_VER_15 (15)
#define DESKTOP_SETTINGS_VER (16)
#define DESKTOP_SETTINGS_PATH INT_PATH(DESKTOP_SETTINGS_FILE_NAME)
#define DESKTOP_SETTINGS_MAGIC (0x17)
@@ -19,7 +19,7 @@ typedef struct {
uint8_t display_clock;
FavoriteApp favorite_apps[FavoriteAppNumber];
FavoriteApp dummy_apps[DummyAppNumber];
} DesktopSettingsV14;
} DesktopSettingsV15;
// Actual size of DesktopSettings v13
//static_assert(sizeof(DesktopSettingsV13) == 1234);
@@ -41,31 +41,30 @@ void desktop_settings_load(DesktopSettings* settings) {
DESKTOP_SETTINGS_MAGIC,
DESKTOP_SETTINGS_VER);
} else if(version == DESKTOP_SETTINGS_VER_14) {
DesktopSettingsV14* settings_v14 = malloc(sizeof(DesktopSettingsV14));
} else if(version == DESKTOP_SETTINGS_VER_15) {
DesktopSettingsV15* settings_v15 = malloc(sizeof(DesktopSettingsV15));
success = saved_struct_load(
DESKTOP_SETTINGS_PATH,
settings_v14,
sizeof(DesktopSettingsV14),
settings_v15,
sizeof(DesktopSettingsV15),
DESKTOP_SETTINGS_MAGIC,
DESKTOP_SETTINGS_VER_14);
DESKTOP_SETTINGS_VER_15);
if(success) {
settings->auto_lock_delay_ms = settings_v14->auto_lock_delay_ms;
settings->auto_poweroff_delay_ms = 0;
settings->displayBatteryPercentage = settings_v14->displayBatteryPercentage;
settings->dummy_mode = settings_v14->dummy_mode;
settings->display_clock = settings_v14->display_clock;
settings->auto_lock_delay_ms = settings_v15->auto_lock_delay_ms;
settings->displayBatteryPercentage = settings_v15->displayBatteryPercentage;
settings->dummy_mode = settings_v15->dummy_mode;
settings->display_clock = settings_v15->display_clock;
memcpy(
settings->favorite_apps,
settings_v14->favorite_apps,
settings_v15->favorite_apps,
sizeof(settings->favorite_apps));
memcpy(
settings->dummy_apps, settings_v14->dummy_apps, sizeof(settings->dummy_apps));
settings->dummy_apps, settings_v15->dummy_apps, sizeof(settings->dummy_apps));
}
free(settings_v14);
free(settings_v15);
}
} while(false);

3
applications/services/desktop/desktop_settings.h
View File

@@ -38,9 +38,6 @@ typedef struct {
typedef struct {
uint32_t auto_lock_delay_ms;
//--- auto_power_off_timer
uint32_t auto_poweroff_delay_ms;
//---
uint8_t displayBatteryPercentage;
uint8_t dummy_mode;
uint8_t display_clock;

1
applications/services/desktop/views/desktop_events.h
View File

@@ -62,5 +62,4 @@ typedef enum {
DesktopGlobalApiUnlock,
DesktopGlobalSaveSettings,
DesktopGlobalReloadSettings,
DesktopGlobalAutoPowerOff,
} DesktopEvent;