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

Final merge fixes

Browse Source
This commit is contained in:
Willy-JL
2024-08-14 02:01:04 +02:00
parent 1a1b3f117a
commit 574304f715
12 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/services/power/power_service/power.c
View File

@@ -2,6 +2,7 @@
#include <furi.h>
#include <furi_hal.h>
#include <loader/loader.h>
#include <momentum/momentum.h>
#include <update_util/update_operation.h>
@@ -598,7 +599,6 @@ static Power* power_alloc(void) {
power->ascii_events_pubsub = furi_record_open(RECORD_ASCII_EVENTS);
power->auto_shutdown_timer =
furi_timer_alloc(power_auto_shutdown_timer_callback, FuriTimerTypeOnce, power);
power->app_running = loader_is_locked(loader);
power->view_holder = view_holder_alloc();
power->view_power_off = power_off_alloc();
@@ -634,10 +634,16 @@ int32_t power_srv(void* p) {
}
Power* power = power_alloc();
power_init_settings(power);
power_update_info(power);
furi_record_create(RECORD_POWER, power);
// Can't be done in alloc, other things in startup need power service and it would deadlock by waiting for loader
Loader* loader = furi_record_open(RECORD_LOADER);
power->app_running = loader_is_locked(loader);
furi_record_close(RECORD_LOADER);
power_init_settings(power);
furi_event_loop_run(power->event_loop);
return 0;

1
applications/services/power/power_service/power_i.h
View File

@@ -7,7 +7,6 @@
#include <toolbox/api_lock.h>
#include <assets_icons.h>
#include <loader/loader.h>
#include "views/power_off.h"
#include "views/power_unplug_usb.h"