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

Merge branch 'pr/404' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-11-04 17:20:34 -04:00
parent 2283ad12e8 f07424f66d
commit 5c7fe53714
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/settings/power_settings_app/scenes/power_settings_scene_shutdown_idle.c
View File

@@ -1,14 +1,14 @@
#include "../power_settings_app.h" #include "../power_settings_app.h"
#include <lib/toolbox/value_index.h> #include <lib/toolbox/value_index.h>
#define SHUTDOWN_IDLE_DELAY_COUNT 8 #define SHUTDOWN_IDLE_DELAY_COUNT 9
#define SCENE_EVENT_SELECT_SHUTDOWN_IDLE_DELAY 0 #define SCENE_EVENT_SELECT_SHUTDOWN_IDLE_DELAY 0
const char* const shutdown_idle_delay_text[SHUTDOWN_IDLE_DELAY_COUNT] = const char* const shutdown_idle_delay_text[SHUTDOWN_IDLE_DELAY_COUNT] =
{"OFF", "15min", "30min", "1h", "6h", "12h", "24h", "48h"}; {"OFF", "15min", "30min", "1h", "2h", "6h", "12h", "24h", "48h"};
const uint32_t shutdown_idle_delay_value[SHUTDOWN_IDLE_DELAY_COUNT] = const uint32_t shutdown_idle_delay_value[SHUTDOWN_IDLE_DELAY_COUNT] =
{0, 900000, 1800000, 3600000, 21600000, 43200000, 86400000, 172800000}; {0, 900000, 1800000, 3600000, 7200000, 21600000, 43200000, 86400000, 172800000};
static void power_settings_scene_shutodwn_idle_callback(void* context, uint32_t index) { static void power_settings_scene_shutodwn_idle_callback(void* context, uint32_t index) {
PowerSettingsApp* app = context; PowerSettingsApp* app = context;

2
firmware/targets/f7/api_symbols.csv
View File

@@ -1,5 +1,5 @@
entry,status,name,type,params entry,status,name,type,params
Version,+,8.42,, Version,+,8.41,,
Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,, Header,+,applications/services/cli/cli_vcp.h,,
1 entry status name type params
2 Version + 8.42 8.41
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h

1
lib/scons Submodule

Submodule lib/scons added at c2d1f09f61