mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-11 06:09:08 -07:00
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev
This commit is contained in:
@@ -131,9 +131,9 @@ static void clock_render_callback(Canvas* const canvas, void* ctx) {
|
||||
return;
|
||||
}
|
||||
|
||||
FuriHalRtcDateTime curr_dt;
|
||||
DateTime curr_dt;
|
||||
furi_hal_rtc_get_datetime(&curr_dt);
|
||||
uint32_t curr_ts = furi_hal_rtc_datetime_to_timestamp(&curr_dt);
|
||||
uint32_t curr_ts = datetime_datetime_to_timestamp(&curr_dt);
|
||||
|
||||
char time_string[TIME_LEN];
|
||||
char date_string[DATE_LEN];
|
||||
|
||||
@@ -30,7 +30,7 @@ typedef struct {
|
||||
typedef struct {
|
||||
LocaleDateFormat date_format;
|
||||
LocaleTimeFormat time_format;
|
||||
FuriHalRtcDateTime datetime;
|
||||
DateTime datetime;
|
||||
FuriMutex* mutex;
|
||||
FuriMessageQueue* event_queue;
|
||||
uint32_t timer_start_timestamp;
|
||||
|
||||
Reference in New Issue
Block a user