mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-06-15 20:01:54 -07:00
Merge branch '420' of https://github.com/ESurge/flipperzero-firmware-wPlugins into 420
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -68,11 +68,6 @@ static void dice_render_callback(Canvas* const canvas, void* ctx) {
|
||||
}
|
||||
}
|
||||
if(state->letsRoll) {
|
||||
static bool rand_generator_inited = false;
|
||||
if(!rand_generator_inited) {
|
||||
srand(furi_get_tick());
|
||||
rand_generator_inited = true;
|
||||
}
|
||||
furi_hal_rtc_get_datetime(&state->datetime);
|
||||
uint8_t hour = state->datetime.hour;
|
||||
char strAMPM[3];
|
||||
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
#include "../power_settings_app.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
|
||||
|
||||
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] =
|
||||
{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) {
|
||||
PowerSettingsApp* app = context;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
entry,status,name,type,params
|
||||
Version,+,8.42,,
|
||||
Version,+,8.41,,
|
||||
Header,+,applications/services/bt/bt_service/bt.h,,
|
||||
Header,+,applications/services/cli/cli.h,,
|
||||
Header,+,applications/services/cli/cli_vcp.h,,
|
||||
|
||||
|
Reference in New Issue
Block a user