From 57005ac57132ca50199a309d70182856f1041919 Mon Sep 17 00:00:00 2001 From: garobcsi Date: Fri, 22 Dec 2023 12:55:16 +0100 Subject: [PATCH] made new time calculation --- Firmware/ATC_Paper.bin | Bin 92648 -> 92604 bytes Firmware/src/epd.c | 6 ---- Firmware/src/etime.c | 77 +++++++++++++++++++++++++++++------------ Firmware/src/etime.h | 3 +- 4 files changed, 56 insertions(+), 30 deletions(-) diff --git a/Firmware/ATC_Paper.bin b/Firmware/ATC_Paper.bin index 7edd7c7f1e984d3a8317a9a11b788cf09cdb290e..2f48f98b6a782f8f71bd283926f524fd3b839aec 100755 GIT binary patch delta 9952 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 delta 9992 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 one_second_trimmed) @@ -30,26 +74,7 @@ _attribute_ram_code_ void handler_time(void) last_clock_increase += one_second_trimmed; current_unix_time++; - current_date.tm_min = (current_unix_time / 60) % 60; - current_date.tm_hour = ((current_unix_time / 60) / 60) % 24; - current_date.tm_sec = current_unix_time % 60; - - if (current_unix_time % 86400 == 0) { - current_date.tm_month = current_date.tm_month % 12; - if (current_date.tm_day + 1 > map[current_date.tm_month - 1]) { - current_date.tm_day = 1; - if (current_date.tm_month + 1 > 12) { - current_date.tm_month = 1; - current_date.tm_year += 1; - } else { - current_date.tm_month += 1; - } - } else { - current_date.tm_day = current_date.tm_day + 1; - } - - current_date.tm_week = (current_date.tm_week + 1) % 7; - } + unixTimeToDateTime(current_unix_time); } } @@ -77,6 +102,12 @@ _attribute_ram_code_ void set_time(uint32_t time_now, uint16_t time_year, uint8_ current_date.tm_week = time_week; } -_attribute_ram_code_ struct date_time get_time(void) { +_attribute_ram_code_ struct date_time get_time(void) +{ return current_date; +} + +_attribute_ram_code_ uint32_t get_unix_time(void) +{ + return current_unix_time; } \ No newline at end of file diff --git a/Firmware/src/etime.h b/Firmware/src/etime.h index 601623f..0ac02e4 100644 --- a/Firmware/src/etime.h +++ b/Firmware/src/etime.h @@ -29,4 +29,5 @@ void init_time(void); void handler_time(void); uint8_t time_reached_period(timer_channel ch, uint32_t seconds); void set_time(uint32_t time_now, uint16_t time_year, uint8_t time_month, uint8_t time_day, uint8_t time_week); -struct date_time get_time(void); \ No newline at end of file +struct date_time get_time(void); +uint32_t get_unix_time(void); \ No newline at end of file