WS: Update API (#161)

RogueMaster · Mar 5, 2024 · cd9c4e5 · cd9c4e5
1 parent ad36dbd
commit cd9c4e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/weather_station/.catalog/changelog.md b/weather_station/.catalog/changelog.md
@@ -1,3 +1,5 @@
+## 1.5
+ - Update API
 ## 1.4
  - Add protocol EMOS E601x
 ## 1.3

diff --git a/weather_station/application.fam b/weather_station/application.fam
@@ -7,7 +7,7 @@ App(
     requires=["gui"],
     stack_size=4 * 1024,
     fap_description="Receive weather data from a wide range of supported Sub-1GHz remote sensor",
-    fap_version="1.4",
+    fap_version="1.5",
     fap_icon="weather_station_10px.png",
     fap_category="Sub-GHz",
     fap_icon_assets="images",

diff --git a/weather_station/protocols/ws_generic.c b/weather_station/protocols/ws_generic.c
@@ -111,9 +111,7 @@ SubGhzProtocolStatus ws_block_generic_serialize(
         }
 
         //DATE AGE set
-        FuriHalRtcDateTime 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 = furi_hal_rtc_get_timestamp();
 
         temp_data = curr_ts;
         if(!flipper_format_write_uint32(flipper_format, "Ts", &temp_data, 1)) {

diff --git a/weather_station/views/weather_station_receiver_info.c b/weather_station/views/weather_station_receiver_info.c
@@ -30,9 +30,7 @@ void ws_view_receiver_info_update(WSReceiverInfo* ws_receiver_info, FlipperForma
 
             ws_block_generic_deserialize(model->generic, fff);
 
-            FuriHalRtcDateTime curr_dt;
-            furi_hal_rtc_get_datetime(&curr_dt);
-            model->curr_ts = furi_hal_rtc_datetime_to_timestamp(&curr_dt);
+            model->curr_ts = furi_hal_rtc_get_timestamp();
         },
         true);
 }
@@ -185,11 +183,7 @@ static void ws_view_receiver_info_timer(void* context) {
     with_view_model(
         ws_receiver_info->view,
         WSReceiverInfoModel * model,
-        {
-            FuriHalRtcDateTime curr_dt;
-            furi_hal_rtc_get_datetime(&curr_dt);
-            model->curr_ts = furi_hal_rtc_datetime_to_timestamp(&curr_dt);
-        },
+        { model->curr_ts = furi_hal_rtc_get_timestamp(); },
         true);
 }