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

Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2024-03-20 01:48:10 +00:00
parent f723eb400e bcde0aefbd
commit 06aea09169
588 changed files with 3875 additions and 2957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/services/dolphin/helpers/dolphin_state.c
View File

@@ -18,7 +18,7 @@ const uint32_t DOLPHIN_LEVELS[] = {100, 200, 300, 450, 600, 750, 950, 115
5250, 5700, 6150, 6600, 7100, 7600, 8100, 8650, 9999};
const size_t DOLPHIN_LEVEL_COUNT = COUNT_OF(DOLPHIN_LEVELS);
DolphinState* dolphin_state_alloc() {
DolphinState* dolphin_state_alloc(void) {
return malloc(sizeof(DolphinState));
}
@@ -72,8 +72,10 @@ bool dolphin_state_load(DolphinState* dolphin_state) {
return success;
}
uint64_t dolphin_state_timestamp() {
return furi_hal_rtc_get_timestamp();
uint64_t dolphin_state_timestamp(void) {
DateTime datetime;
furi_hal_rtc_get_datetime(&datetime);
return datetime_datetime_to_timestamp(&datetime);
}
bool dolphin_state_is_levelup(uint32_t icounter) {

4
applications/services/dolphin/helpers/dolphin_state.h
View File

@@ -33,7 +33,7 @@ struct DolphinState {
bool dirty;
};
DolphinState* dolphin_state_alloc();
DolphinState* dolphin_state_alloc(void);
void dolphin_state_free(DolphinState* dolphin_state);
@@ -43,7 +43,7 @@ bool dolphin_state_load(DolphinState* dolphin_state);
void dolphin_state_clear_limits(DolphinState* dolphin_state);
uint64_t dolphin_state_timestamp();
uint64_t dolphin_state_timestamp(void);
void dolphin_state_on_deed(DolphinState* dolphin_state, DolphinDeed deed);