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

applications/main/nfc/plugins/supported_cards/clipper.c

@@ -25,7 +25,7 @@
 
 #include <bit_lib.h>
 #include <applications/services/locale/locale.h>
-#include <furi_hal_rtc.h>
+#include <datetime/datetime.h>
 #include <inttypes.h>
 
 //
@@ -173,7 +173,7 @@ static void furi_string_cat_timestamp(
     const char* date_hdr,
     const char* time_hdr,
     uint32_t tmst_1900);
-static void epoch_1900_datetime_to_furi(uint32_t seconds, FuriHalRtcDateTime* out);
+static void epoch_1900_datetime_to_furi(uint32_t seconds, DateTime* out);
 static bool get_file_contents(
     const MfDesfireApplication* app,
     const MfDesfireFileId* id,
@@ -528,7 +528,7 @@ static void furi_string_cat_timestamp(
     const char* date_hdr,
     const char* time_hdr,
     uint32_t tmst_1900) {
-    FuriHalRtcDateTime tm;
+    DateTime tm;
 
     epoch_1900_datetime_to_furi(tmst_1900, &tm);
 
@@ -551,7 +551,7 @@ static void furi_string_cat_timestamp(
 }
 
 // Convert a "1900"-based timestamp to Furi time, assuming a UTC/GMT timezone.
-static void epoch_1900_datetime_to_furi(uint32_t seconds, FuriHalRtcDateTime* out) {
+static void epoch_1900_datetime_to_furi(uint32_t seconds, DateTime* out) {
     uint16_t year, month, day, hour, minute, second;
 
     // Calculate absolute number of days elapsed since the 1900 epoch
@@ -569,17 +569,17 @@ static void epoch_1900_datetime_to_furi(uint32_t seconds, FuriHalRtcDateTime* ou
     //
 
     for(year = 1900;; year++) {
-        uint16_t year_days = furi_hal_rtc_get_days_per_year(year);
+        uint16_t year_days = datetime_get_days_per_year(year);
         if(absolute_days >= year_days)
             absolute_days -= year_days;
         else
             break;
     }
 
-    bool is_leap = furi_hal_rtc_is_leap_year(year);
+    bool is_leap = datetime_is_leap_year(year);
 
     for(month = 1;; month++) {
-        uint8_t days_in_month = furi_hal_rtc_get_days_per_month(is_leap, month);
+        uint8_t days_in_month = datetime_get_days_per_month(is_leap, month);
         if(absolute_days >= days_in_month)
             absolute_days -= days_in_month;
         else

applications/main/nfc/plugins/supported_cards/itso.c

@@ -5,7 +5,7 @@
 #include <lib/nfc/protocols/mf_desfire/mf_desfire.h>
 
 #include <applications/services/locale/locale.h>
-#include <furi_hal_rtc.h>
+#include <datetime/datetime.h>
 
 static const MfDesfireApplicationId itso_app_id = {.data = {0x16, 0x02, 0xa0}};
 static const MfDesfireFileId itso_file_id = 0x0f;
@@ -87,8 +87,8 @@ static bool itso_parse(const NfcDevice* device, FuriString* parsed_data) {
             furi_string_push_back(parsed_data, ' ');
         }
 
-        FuriHalRtcDateTime timestamp = {0};
-        furi_hal_rtc_timestamp_to_datetime(unixTimestamp, &timestamp);
+        DateTime timestamp = {0};
+        datetime_timestamp_to_datetime(unixTimestamp, &timestamp);
         FuriString* timestamp_str = furi_string_alloc();
         locale_format_date(timestamp_str, &timestamp, locale_get_date_format(), "-");
 

applications/main/nfc/plugins/supported_cards/opal.c

@@ -34,7 +34,7 @@
 #include <lib/nfc/protocols/mf_desfire/mf_desfire.h>
 
 #include <applications/services/locale/locale.h>
-#include <furi_hal_rtc.h>
+#include <datetime/datetime.h>
 
 static const MfDesfireApplicationId opal_app_id = {.data = {0x31, 0x45, 0x53}};
 
@@ -78,11 +78,11 @@ typedef struct __attribute__((__packed__)) {
 
 static_assert(sizeof(OpalFile) == 16, "OpalFile");
 
-// Converts an Opal timestamp to FuriHalRtcDateTime.
+// Converts an Opal timestamp to DateTime.
 //
 // Opal measures days since 1980-01-01 and minutes since midnight, and presumes
 // all days are 1440 minutes.
-static void opal_date_time_to_furi(uint16_t days, uint16_t minutes, FuriHalRtcDateTime* out) {
+static void opal_date_time_to_furi(uint16_t days, uint16_t minutes, DateTime* out) {
     out->year = 1980;
     out->month = 1;
     // 1980-01-01 is a Tuesday
@@ -93,7 +93,7 @@ static void opal_date_time_to_furi(uint16_t days, uint16_t minutes, FuriHalRtcDa
 
     // What year is it?
     for(;;) {
-        const uint16_t num_days_in_year = furi_hal_rtc_get_days_per_year(out->year);
+        const uint16_t num_days_in_year = datetime_get_days_per_year(out->year);
         if(days < num_days_in_year) break;
         days -= num_days_in_year;
         out->year++;
@@ -104,8 +104,8 @@ static void opal_date_time_to_furi(uint16_t days, uint16_t minutes, FuriHalRtcDa
 
     for(;;) {
         // What month is it?
-        const bool is_leap = furi_hal_rtc_is_leap_year(out->year);
-        const uint8_t num_days_in_month = furi_hal_rtc_get_days_per_month(is_leap, out->month);
+        const bool is_leap = datetime_is_leap_year(out->year);
+        const uint8_t num_days_in_month = datetime_get_days_per_month(is_leap, out->month);
         if(days <= num_days_in_month) break;
         days -= num_days_in_month;
         out->month++;
@@ -154,7 +154,7 @@ static bool opal_parse(const NfcDevice* device, FuriString* parsed_data) {
         const uint8_t balance_cents = balance % 100;
         const int32_t balance_dollars = balance / 100;
 
-        FuriHalRtcDateTime timestamp;
+        DateTime timestamp;
         opal_date_time_to_furi(opal_file->days, opal_file->minutes, &timestamp);
 
         // Usages 4..6 associated with the Manly Ferry, which correspond to

applications/main/nfc/plugins/supported_cards/umarsh.c

@@ -29,11 +29,11 @@
 #include "protocols/mf_classic/mf_classic.h"
 
 #include <bit_lib.h>
-#include <furi_hal_rtc.h>
+#include <datetime/datetime.h>
 
 #define TAG "Umarsh"
 
-bool parse_datetime(uint16_t date, FuriHalRtcDateTime* result) {
+bool parse_datetime(uint16_t date, DateTime* result) {
     result->year = 2000 + (date >> 9);
     result->month = date >> 5 & 0x0F;
     result->day = date & 0x1F;
@@ -81,13 +81,13 @@ static bool umarsh_parse(const NfcDevice* device, FuriString* parsed_data) {
         const uint16_t balance_rub = (bit_lib_bytes_to_num_be(block_start_ptr + 8, 2)) & 0x7FFF;
         const uint8_t balance_kop = bit_lib_bytes_to_num_be(block_start_ptr + 10, 1) & 0x7F;
 
-        FuriHalRtcDateTime expiry_datetime;
+        DateTime expiry_datetime;
         bool is_expiry_datetime_valid = parse_datetime(expiry_date, &expiry_datetime);
 
-        FuriHalRtcDateTime valid_to_datetime;
+        DateTime valid_to_datetime;
         bool is_valid_to_datetime_valid = parse_datetime(valid_to, &valid_to_datetime);
 
-        FuriHalRtcDateTime last_refill_datetime;
+        DateTime last_refill_datetime;
         bool is_last_refill_datetime_valid =
             parse_datetime(last_refill_date, &last_refill_datetime);