Merge branch 'ofw-dev' into dev

2026-05-16 04:24:45 -07:00 · 2023-08-11 18:08:12 +03:00
parent f069cdb7e6 3a36d5ea6d
commit 4b81046b6f
78 changed files with 398 additions and 118 deletions
--- a/applications/services/desktop/desktop_i.h
+++ b/applications/services/desktop/desktop_i.h
@@ -78,6 +78,10 @@ struct Desktop {
    uint8_t minute;
    bool clock_type : 1; // true - 24h false - 12h

+    uint8_t time_hour;
+    uint8_t time_minute;
+    bool time_format_12 : 1; // 1 - 12 hour, 0 - 24H
+
    bool in_transition : 1;
 };