merge fixes [ci skip]

parsers will be fixed after

applications/main/clock_app/clock_app.c

@@ -24,9 +24,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];
@@ -191,9 +191,9 @@ int32_t clock_app(void* p) {
                 case InputKeyOk:;
                     // START/STOP TIMER
 
-                    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);
 
                     if(plugin_state->timer_running) {
                         // Update stopped seconds

applications/main/clock_app/clock_app.h

@@ -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;

applications/main/subghz/scenes/subghz_scene_save_name.c

@@ -23,7 +23,7 @@ void subghz_scene_save_name_on_enter(void* context) {
     FuriString* dir_name = furi_string_alloc();
 
     char file_name_buf[SUBGHZ_MAX_LEN_NAME] = {0};
-    FuriHalRtcDateTime* datetime = subghz->save_datetime_set ? &subghz->save_datetime : NULL;
+    DateTime* datetime = subghz->save_datetime_set ? &subghz->save_datetime : NULL;
     subghz->save_datetime_set = false;
     if(!subghz_path_is_file(subghz->file_path)) {
         SubGhzProtocolDecoderBase* decoder_result = subghz_txrx_get_decoder(subghz->txrx);

applications/main/subghz/subghz_history.c

@@ -12,7 +12,7 @@ typedef struct {
     FlipperFormat* flipper_string;
     uint8_t type;
     SubGhzRadioPreset* preset;
-    FuriHalRtcDateTime datetime;
+    DateTime datetime;
 } SubGhzHistoryItem;
 
 ARRAY_DEF(SubGhzHistoryItemArray, SubGhzHistoryItem, M_POD_OPLIST)
@@ -131,13 +131,13 @@ const char* subghz_history_get_protocol_name(SubGhzHistory* instance, uint16_t i
     return furi_string_get_cstr(instance->tmp_string);
 }
 
-FuriHalRtcDateTime subghz_history_get_datetime(SubGhzHistory* instance, uint16_t idx) {
+DateTime subghz_history_get_datetime(SubGhzHistory* instance, uint16_t idx) {
     furi_assert(instance);
     SubGhzHistoryItem* item = SubGhzHistoryItemArray_get(instance->history->data, idx);
     if(item) {
         return item->datetime;
     } else {
-        return (FuriHalRtcDateTime){};
+        return (DateTime){};
     }
 }
 
@@ -175,7 +175,7 @@ void subghz_history_get_text_item_menu(SubGhzHistory* instance, FuriString* outp
 
 void subghz_history_get_time_item_menu(SubGhzHistory* instance, FuriString* output, uint16_t idx) {
     SubGhzHistoryItem* item = SubGhzHistoryItemArray_get(instance->history->data, idx);
-    FuriHalRtcDateTime* t = &item->datetime;
+    DateTime* t = &item->datetime;
     furi_string_printf(output, "%.2d:%.2d:%.2d ", t->hour, t->minute, t->second);
 }
 

applications/main/subghz/subghz_history.h

@@ -74,9 +74,9 @@ const char* subghz_history_get_protocol_name(SubGhzHistory* instance, uint16_t i
  * 
  * @param instance  - SubGhzHistory instance
  * @param idx       - record index  
- * @return datetime - FuriHalRtcDateTime received timestamp  
+ * @return datetime - DateTime received timestamp  
  */
-FuriHalRtcDateTime subghz_history_get_datetime(SubGhzHistory* instance, uint16_t idx);
+DateTime subghz_history_get_datetime(SubGhzHistory* instance, uint16_t idx);
 
 /** Get string item menu to history[idx]
  * 

applications/main/subghz/subghz_i.h

@@ -80,7 +80,7 @@ struct SubGhz {
     bool raw_send_only;
 
     bool save_datetime_set;
-    FuriHalRtcDateTime save_datetime;
+    DateTime save_datetime;
 
     SubGhzLastSettings* last_settings;
 

lib/toolbox/name_generator.c

@@ -48,7 +48,7 @@ void name_generator_make_auto_datetime(
     char* name,
     size_t max_name_size,
     const char* prefix,
-    FuriHalRtcDateTime* custom_time) {
+    DateTime* custom_time) {
     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDetailedFilename)) {
         name_generator_make_detailed_datetime(name, max_name_size, prefix, custom_time);
     } else {
@@ -88,12 +88,12 @@ void name_generator_make_detailed_datetime(
     char* name,
     size_t max_name_size,
     const char* prefix,
-    FuriHalRtcDateTime* custom_time) {
+    DateTime* custom_time) {
     furi_assert(name);
     furi_assert(max_name_size);
     furi_assert(prefix);
 
-    FuriHalRtcDateTime dateTime;
+    DateTime dateTime;
     if(custom_time) {
         dateTime = *custom_time;
     } else {

lib/toolbox/name_generator.h

@@ -19,7 +19,7 @@ void name_generator_make_auto_datetime(
     char* name,
     size_t max_name_size,
     const char* prefix,
-    FuriHalRtcDateTime* custom_time);
+    DateTime* custom_time);
 
 /** Generates random name
  *
@@ -41,7 +41,7 @@ void name_generator_make_detailed_datetime(
     char* name,
     size_t max_name_size,
     const char* prefix,
-    FuriHalRtcDateTime* custom_time);
+    DateTime* custom_time);
 
 #ifdef __cplusplus
 }

targets/f7/api_symbols.csv

@@ -2604,9 +2604,9 @@ Function,-,music_worker_set_volume,void,"MusicWorker*, float"
 Function,-,music_worker_start,void,MusicWorker*
 Function,-,music_worker_stop,void,MusicWorker*
 Function,+,name_generator_make_auto,void,"char*, size_t, const char*"
-Function,+,name_generator_make_auto_datetime,void,"char*, size_t, const char*, FuriHalRtcDateTime*"
+Function,+,name_generator_make_auto_datetime,void,"char*, size_t, const char*, DateTime*"
 Function,+,name_generator_make_detailed,void,"char*, size_t, const char*"
-Function,+,name_generator_make_detailed_datetime,void,"char*, size_t, const char*, FuriHalRtcDateTime*"
+Function,+,name_generator_make_detailed_datetime,void,"char*, size_t, const char*, DateTime*"
 Function,+,name_generator_make_random,void,"char*, size_t"
 Function,+,name_generator_make_random_prefixed,void,"char*, size_t, const char*"
 Function,-,nan,double,const char*