From f2c84e0510390380b540b81dff6ca5f63f152133 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:14:41 +0300
Subject: [PATCH 01/13] docker image source

---
 .ci_files/imgs/fztools/Dockerfile    | 13 +++++++++++++
 .ci_files/imgs/fztools/entrypoint.sh | 10 ++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 .ci_files/imgs/fztools/Dockerfile
 create mode 100644 .ci_files/imgs/fztools/entrypoint.sh

diff --git a/.ci_files/imgs/fztools/Dockerfile b/.ci_files/imgs/fztools/Dockerfile
new file mode 100644
index 000000000..c14096416
--- /dev/null
+++ b/.ci_files/imgs/fztools/Dockerfile
@@ -0,0 +1,13 @@
+FROM ubuntu:hirsute
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        ca-certificates \
+        git \
+        wget \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY entrypoint.sh /
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.ci_files/imgs/fztools/entrypoint.sh b/.ci_files/imgs/fztools/entrypoint.sh
new file mode 100644
index 000000000..13dec493b
--- /dev/null
+++ b/.ci_files/imgs/fztools/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+    bash
+else
+    echo "Running $1"
+    set -ex
+    bash -c "$1"
+fi
+

From c73495767cc3e11e8d0dc6a8a5fdb5d8197ad638 Mon Sep 17 00:00:00 2001
From: Dmitry422 <yakovlev.kem@gmail.com>
Date: Tue, 14 Jan 2025 02:01:54 +0700
Subject: [PATCH 02/13] Auto_poweroff option moved from desktop to power. Add
 settings for power service (load|save).

---
 applications/services/desktop/desktop.c       |  63 +------
 applications/services/desktop/desktop_i.h     |   3 -
 .../services/desktop/desktop_settings.c       |  31 ++-
 .../services/desktop/desktop_settings.h       |   3 -
 .../services/desktop/views/desktop_events.h   |   1 -
 .../services/power/power_service/power.c      | 178 ++++++++++++++++++
 .../services/power/power_service/power.h      |   8 +-
 .../services/power/power_service/power_i.h    |  10 +
 .../power/power_service/power_settings.c      |  75 ++++++++
 .../power/power_service/power_settings.h      |  16 ++
 .../power_service/power_settings_filename.h   |   3 +
 .../scenes/desktop_settings_scene_start.c     |  35 ----
 .../power_settings_app/power_settings_app.c   |  13 ++
 .../power_settings_app/power_settings_app.h   |   5 +
 .../scenes/power_settings_scene_start.c       |  69 ++++---
 targets/f7/api_symbols.csv                    |   8 +-
 16 files changed, 375 insertions(+), 146 deletions(-)
 create mode 100644 applications/services/power/power_service/power_settings.c
 create mode 100644 applications/services/power/power_service/power_settings.h
 create mode 100644 applications/services/power/power_service/power_settings_filename.h

diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 59c5290f4..66c4ca174 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -19,12 +19,6 @@ static void desktop_auto_lock_arm(Desktop*);
 static void desktop_auto_lock_inhibit(Desktop*);
 static void desktop_start_auto_lock_timer(Desktop*);
 static void desktop_apply_settings(Desktop*);
-//--- auto_power_off_timer
-#include <power/power_service/power.h>
-static void desktop_start_auto_poweroff_timer(Desktop*);
-static void desktop_auto_poweroff_arm(Desktop*);
-static void desktop_auto_poweroff_inhibit(Desktop*);
-//---
 
 static void desktop_loader_callback(const void* message, void* context) {
     furi_assert(context);
@@ -137,9 +131,7 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
         }
 
         desktop_auto_lock_inhibit(desktop);
-        //--- auto_power_off_timer
-        desktop_auto_poweroff_inhibit(desktop);
-        //--
+
         desktop->app_running = true;
 
         furi_semaphore_release(desktop->animation_semaphore);
@@ -147,20 +139,12 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
     } else if(event == DesktopGlobalAfterAppFinished) {
         animation_manager_load_and_continue_animation(desktop->animation_manager);
         desktop_auto_lock_arm(desktop);
-        //--- auto_power_off_timer
-        desktop_auto_poweroff_arm(desktop);
-        //---
         desktop->app_running = false;
 
     } else if(event == DesktopGlobalAutoLock) {
         if(!desktop->app_running && !desktop->locked) {
             desktop_lock(desktop);
         }
-    } else if(event == DesktopGlobalAutoPowerOff) {
-        if(!desktop->app_running) {
-            Power* power = furi_record_open(RECORD_POWER);
-            power_off(power);
-        }
     } else if(event == DesktopGlobalSaveSettings) {
         desktop_settings_save(&desktop->settings);
         desktop_apply_settings(desktop);
@@ -195,9 +179,6 @@ static void desktop_input_event_callback(const void* value, void* context) {
     Desktop* desktop = context;
     if(event->type == InputTypePress) {
         desktop_start_auto_lock_timer(desktop);
-        //--- auto_power_off_timer
-        desktop_start_auto_poweroff_timer(desktop);
-        //---
     }
 }
 
@@ -234,41 +215,6 @@ static void desktop_auto_lock_inhibit(Desktop* desktop) {
     }
 }
 
-//--- auto_power_off_timer
-static void desktop_auto_poweroff_timer_callback(void* context) {
-    furi_assert(context);
-    Desktop* desktop = context;
-    view_dispatcher_send_custom_event(desktop->view_dispatcher, DesktopGlobalAutoPowerOff);
-}
-
-static void desktop_start_auto_poweroff_timer(Desktop* desktop) {
-    furi_timer_start(
-        desktop->auto_poweroff_timer, furi_ms_to_ticks(desktop->settings.auto_poweroff_delay_ms));
-}
-
-static void desktop_stop_auto_poweroff_timer(Desktop* desktop) {
-    furi_timer_stop(desktop->auto_poweroff_timer);
-}
-
-static void desktop_auto_poweroff_arm(Desktop* desktop) {
-    if(desktop->settings.auto_poweroff_delay_ms) {
-        if(!desktop->input_events_subscription) {
-            desktop->input_events_subscription = furi_pubsub_subscribe(
-                desktop->input_events_pubsub, desktop_input_event_callback, desktop);
-        }
-        desktop_start_auto_poweroff_timer(desktop);
-    }
-}
-
-static void desktop_auto_poweroff_inhibit(Desktop* desktop) {
-    desktop_stop_auto_poweroff_timer(desktop);
-    if(desktop->input_events_subscription) {
-        furi_pubsub_unsubscribe(desktop->input_events_pubsub, desktop->input_events_subscription);
-        desktop->input_events_subscription = NULL;
-    }
-}
-//---
-
 static void desktop_clock_timer_callback(void* context) {
     furi_assert(context);
     Desktop* desktop = context;
@@ -294,9 +240,6 @@ static void desktop_apply_settings(Desktop* desktop) {
 
     if(!desktop->app_running && !desktop->locked) {
         desktop_auto_lock_arm(desktop);
-        //--- auto_power_off_timer
-        desktop_auto_poweroff_arm(desktop);
-        //---
     }
 
     desktop->in_transition = false;
@@ -432,10 +375,6 @@ static Desktop* desktop_alloc(void) {
 
     desktop->auto_lock_timer =
         furi_timer_alloc(desktop_auto_lock_timer_callback, FuriTimerTypeOnce, desktop);
-    //--- auto_power_off_timer
-    desktop->auto_poweroff_timer =
-        furi_timer_alloc(desktop_auto_poweroff_timer_callback, FuriTimerTypeOnce, desktop);
-    //---
 
     desktop->status_pubsub = furi_pubsub_alloc();
 
diff --git a/applications/services/desktop/desktop_i.h b/applications/services/desktop/desktop_i.h
index abf5cd579..1dc7c7d21 100644
--- a/applications/services/desktop/desktop_i.h
+++ b/applications/services/desktop/desktop_i.h
@@ -75,9 +75,6 @@ struct Desktop {
 
     FuriTimer* auto_lock_timer;
     FuriTimer* update_clock_timer;
-    //--- auto_power_off_timer
-    FuriTimer* auto_poweroff_timer;
-    //---
 
     AnimationManager* animation_manager;
     FuriSemaphore* animation_semaphore;
diff --git a/applications/services/desktop/desktop_settings.c b/applications/services/desktop/desktop_settings.c
index 7a99dd365..43b5cf412 100644
--- a/applications/services/desktop/desktop_settings.c
+++ b/applications/services/desktop/desktop_settings.c
@@ -6,8 +6,8 @@
 
 #define TAG "DesktopSettings"
 
-#define DESKTOP_SETTINGS_VER_14 (14)
-#define DESKTOP_SETTINGS_VER    (15)
+#define DESKTOP_SETTINGS_VER_15 (15)
+#define DESKTOP_SETTINGS_VER    (16)
 
 #define DESKTOP_SETTINGS_PATH  INT_PATH(DESKTOP_SETTINGS_FILE_NAME)
 #define DESKTOP_SETTINGS_MAGIC (0x17)
@@ -19,7 +19,7 @@ typedef struct {
     uint8_t display_clock;
     FavoriteApp favorite_apps[FavoriteAppNumber];
     FavoriteApp dummy_apps[DummyAppNumber];
-} DesktopSettingsV14;
+} DesktopSettingsV15;
 
 // Actual size of DesktopSettings v13
 //static_assert(sizeof(DesktopSettingsV13) == 1234);
@@ -41,31 +41,30 @@ void desktop_settings_load(DesktopSettings* settings) {
                 DESKTOP_SETTINGS_MAGIC,
                 DESKTOP_SETTINGS_VER);
 
-        } else if(version == DESKTOP_SETTINGS_VER_14) {
-            DesktopSettingsV14* settings_v14 = malloc(sizeof(DesktopSettingsV14));
+        } else if(version == DESKTOP_SETTINGS_VER_15) {
+            DesktopSettingsV15* settings_v15 = malloc(sizeof(DesktopSettingsV15));
 
             success = saved_struct_load(
                 DESKTOP_SETTINGS_PATH,
-                settings_v14,
-                sizeof(DesktopSettingsV14),
+                settings_v15,
+                sizeof(DesktopSettingsV15),
                 DESKTOP_SETTINGS_MAGIC,
-                DESKTOP_SETTINGS_VER_14);
+                DESKTOP_SETTINGS_VER_15);
 
             if(success) {
-                settings->auto_lock_delay_ms = settings_v14->auto_lock_delay_ms;
-                settings->auto_poweroff_delay_ms = 0;
-                settings->displayBatteryPercentage = settings_v14->displayBatteryPercentage;
-                settings->dummy_mode = settings_v14->dummy_mode;
-                settings->display_clock = settings_v14->display_clock;
+                settings->auto_lock_delay_ms = settings_v15->auto_lock_delay_ms;
+                settings->displayBatteryPercentage = settings_v15->displayBatteryPercentage;
+                settings->dummy_mode = settings_v15->dummy_mode;
+                settings->display_clock = settings_v15->display_clock;
                 memcpy(
                     settings->favorite_apps,
-                    settings_v14->favorite_apps,
+                    settings_v15->favorite_apps,
                     sizeof(settings->favorite_apps));
                 memcpy(
-                    settings->dummy_apps, settings_v14->dummy_apps, sizeof(settings->dummy_apps));
+                    settings->dummy_apps, settings_v15->dummy_apps, sizeof(settings->dummy_apps));
             }
 
-            free(settings_v14);
+            free(settings_v15);
         }
 
     } while(false);
diff --git a/applications/services/desktop/desktop_settings.h b/applications/services/desktop/desktop_settings.h
index e2e91d2dd..ba5a78840 100644
--- a/applications/services/desktop/desktop_settings.h
+++ b/applications/services/desktop/desktop_settings.h
@@ -38,9 +38,6 @@ typedef struct {
 
 typedef struct {
     uint32_t auto_lock_delay_ms;
-    //--- auto_power_off_timer
-    uint32_t auto_poweroff_delay_ms;
-    //---
     uint8_t displayBatteryPercentage;
     uint8_t dummy_mode;
     uint8_t display_clock;
diff --git a/applications/services/desktop/views/desktop_events.h b/applications/services/desktop/views/desktop_events.h
index 57cc0fdaa..ba91a30cc 100644
--- a/applications/services/desktop/views/desktop_events.h
+++ b/applications/services/desktop/views/desktop_events.h
@@ -62,5 +62,4 @@ typedef enum {
     DesktopGlobalApiUnlock,
     DesktopGlobalSaveSettings,
     DesktopGlobalReloadSettings,
-    DesktopGlobalAutoPowerOff,
 } DesktopEvent;
diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index 8d387612a..dea911834 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -7,6 +7,8 @@
 #include <update_util/update_operation.h>
 #include <notification/notification_messages.h>
 
+#include <loader/loader.h>
+
 #define TAG "Power"
 
 #define POWER_OFF_TIMEOUT_S  (90U)
@@ -379,7 +381,120 @@ static void power_handle_reboot(PowerBootMode mode) {
 
     furi_hal_power_reset();
 }
+// get settings from service to settings_app by send message to power queue
+void power_api_get_settings(Power* power, PowerSettings* settings) {
+    furi_assert(power);
+    furi_assert(settings);
 
+    PowerMessage msg = {
+        .type = PowerMessageTypeGetSettings,
+        .settings = settings,
+        .lock = api_lock_alloc_locked(),
+    };
+
+    furi_check(
+        furi_message_queue_put(power->message_queue, &msg, FuriWaitForever) == FuriStatusOk);
+    api_lock_wait_unlock_and_free(msg.lock);
+}
+
+// set settings from settings_app to service by send message to power queue
+void power_api_set_settings(Power* power, const PowerSettings* settings) {
+    furi_assert(power);
+    furi_assert(settings);
+
+    PowerMessage msg = {
+        .type = PowerMessageTypeSetSettings,
+        .csettings = settings,
+        .lock = api_lock_alloc_locked(),
+    };
+
+    furi_check(
+        furi_message_queue_put(power->message_queue, &msg, FuriWaitForever) == FuriStatusOk);
+    api_lock_wait_unlock_and_free(msg.lock);
+}
+
+//start furi timer for autopoweroff
+static void power_start_auto_poweroff_timer(Power* power) {
+    furi_timer_start(
+        power->p_auto_poweroff_timer, furi_ms_to_ticks(power->settings.p_auto_poweroff_delay_ms));
+}
+
+//stop furi timer for autopoweroff
+static void power_stop_auto_poweroff_timer(Power* power) {
+    furi_timer_stop(power->p_auto_poweroff_timer);
+}
+
+static uint32_t power_is_running_auto_poweroff_timer(Power* power) {
+    return furi_timer_is_running(power->p_auto_poweroff_timer);
+}
+
+// start|restart poweroff timer
+static void power_auto_poweroff_callback(const void* value, void* context) {
+    furi_assert(value);
+    furi_assert(context);
+    Power* power = context;
+    power_start_auto_poweroff_timer(power);
+}
+
+// callback for poweroff timer (what we do when timer end)
+static void power_auto_poweroff_timer_callback(void* context) {
+    furi_assert(context);
+    Power* power = context;
+    power_off(power);
+}
+
+//start|restart timer and events subscription and callbacks for input events (we restart timer when user press keys)
+static void power_auto_poweroff_arm(Power* power) {
+    if(power->settings.p_auto_poweroff_delay_ms) {
+        if(power->input_events_subscription == NULL) {
+            power->input_events_subscription = furi_pubsub_subscribe(
+                power->input_events_pubsub, power_auto_poweroff_callback, power);
+        }
+        power_start_auto_poweroff_timer(power);
+    }
+}
+
+// stop timer and event subscription 
+static void power_auto_poweroff_disarm(Power* power) {
+    power_stop_auto_poweroff_timer(power);
+    if(power->input_events_subscription) {
+        furi_pubsub_unsubscribe(power->input_events_pubsub, power->input_events_subscription);
+        power->input_events_subscription = NULL;
+    }
+}
+
+//check message queue from Loader - is some app started or not (if started we dont do auto poweroff)
+static void power_loader_callback(const void* message, void* context) {
+    furi_assert(context);
+    Power* power = context;
+    const LoaderEvent* event = message;
+
+    // disarm timer if some apps started
+    if(event->type == LoaderEventTypeApplicationBeforeLoad) {
+        power->app_running = true;
+        power_auto_poweroff_disarm(power);
+    // arm timer if some apps was not loaded or was stoped
+    } else if(
+        event->type == LoaderEventTypeApplicationLoadFailed ||
+        event->type == LoaderEventTypeApplicationStopped) {
+        power->app_running = false;
+        power_auto_poweroff_arm(power);
+    }
+}
+
+// apply power settings
+static void power_settings_apply(Power* power) {
+    //apply auto_poweroff settings
+    if(power->settings.p_auto_poweroff_delay_ms && !power->app_running) {
+        return;
+        power_auto_poweroff_arm(power);
+    } else if (power_is_running_auto_poweroff_timer(power)) {
+        power_auto_poweroff_disarm(power);
+    }
+    return;
+}
+
+// do something depend from power queue message
 static void power_message_callback(FuriEventLoopObject* object, void* context) {
     furi_assert(context);
     Power* power = context;
@@ -405,6 +520,20 @@ static void power_message_callback(FuriEventLoopObject* object, void* context) {
     case PowerMessageTypeShowBatteryLowWarning:
         power->show_battery_low_warning = *msg.bool_param;
         break;
+    case PowerMessageTypeGetSettings:
+        furi_assert(msg.lock);
+        *msg.settings = power->settings;
+        break;
+    case PowerMessageTypeSetSettings:
+        furi_assert(msg.lock);
+        power->settings = *msg.csettings;
+        power_settings_apply(power);
+        power_settings_save(&power->settings);
+        break;
+    case PowerMessageTypeReloadSettings:
+        power_settings_load(&power->settings);
+        power_settings_apply(power);
+        break;
     default:
         furi_crash();
     }
@@ -436,6 +565,36 @@ static void power_tick_callback(void* context) {
     }
 }
 
+static void power_storage_callback(const void* message, void* context) {
+    furi_assert(context);
+    Power* power = context;
+    const StorageEvent* event = message;
+
+    if(event->type == StorageEventTypeCardMount) {
+        PowerMessage msg = {
+            .type = PowerMessageTypeReloadSettings,
+        };
+
+        furi_check(
+            furi_message_queue_put(power->message_queue, &msg, FuriWaitForever) == FuriStatusOk);
+    }
+}
+
+// load inital settings from file for power service
+static void power_init_settings(Power* power) {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    furi_pubsub_subscribe(storage_get_pubsub(storage), power_storage_callback, power);
+
+    if(storage_sd_status(storage) != FSE_OK) {
+        FURI_LOG_D(TAG, "SD Card not ready, skipping settings");
+        return;
+    }
+
+    power_settings_load(&power->settings);
+    power_settings_apply(power);
+    furi_record_close(RECORD_STORAGE);
+}
+
 static Power* power_alloc(void) {
     Power* power = malloc(sizeof(Power));
     // Pubsub
@@ -449,6 +608,16 @@ static Power* power_alloc(void) {
     desktop_settings_load(settings);
     power->displayBatteryPercentage = settings->displayBatteryPercentage;
     free(settings);
+
+    // auto_poweroff
+    //---define subscription to loader events message (info about started apps) and defina callback for this
+    Loader* loader = furi_record_open(RECORD_LOADER);
+    furi_pubsub_subscribe(loader_get_pubsub(loader), power_loader_callback, power);
+    power->input_events_pubsub = furi_record_open(RECORD_INPUT_EVENTS);
+    //define autopoweroff timer and they callback 
+    power->p_auto_poweroff_timer =
+        furi_timer_alloc(power_auto_poweroff_timer_callback, FuriTimerTypeOnce, power);
+
     // Gui
     Gui* gui = furi_record_open(RECORD_GUI);
 
@@ -489,6 +658,15 @@ int32_t power_srv(void* p) {
     power_update_info(power);
 
     furi_record_create(RECORD_POWER, power);
+
+// Can't be done in alloc, other things in startup need power service and it would deadlock by waiting for loader
+    Loader* loader = furi_record_open(RECORD_LOADER);
+    power->app_running = loader_is_locked(loader);
+    furi_record_close(RECORD_LOADER);
+
+    // load inital settings for power service
+    power_init_settings(power);
+
     furi_event_loop_run(power->event_loop);
 
     return 0;
diff --git a/applications/services/power/power_service/power.h b/applications/services/power/power_service/power.h
index 34d58353a..59947fa52 100644
--- a/applications/services/power/power_service/power.h
+++ b/applications/services/power/power_service/power.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-
+#include <power/power_service/power_settings.h>
 #include <core/pubsub.h>
 
 #ifdef __cplusplus
@@ -102,6 +102,12 @@ void power_enable_low_battery_level_notification(Power* power, bool enable);
  */
 void power_trigger_ui_update(Power* power);
 
+// get settings from service to app
+void power_api_get_settings(Power* instance, PowerSettings* settings);
+
+// set settings from app to service
+void power_api_set_settings(Power* instance, const PowerSettings* settings);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/applications/services/power/power_service/power_i.h b/applications/services/power/power_service/power_i.h
index d75071f8f..1bb0fc3e8 100644
--- a/applications/services/power/power_service/power_i.h
+++ b/applications/services/power/power_service/power_i.h
@@ -36,6 +36,11 @@ struct Power {
     uint8_t displayBatteryPercentage;
     uint8_t battery_level;
     uint8_t power_off_timeout;
+    PowerSettings settings;
+    FuriTimer* p_auto_poweroff_timer;
+    bool app_running;
+    FuriPubSub* input_events_pubsub;
+    FuriPubSubSubscription* input_events_subscription;
 };
 
 typedef enum {
@@ -49,6 +54,9 @@ typedef enum {
     PowerMessageTypeGetInfo,
     PowerMessageTypeIsBatteryHealthy,
     PowerMessageTypeShowBatteryLowWarning,
+    PowerMessageTypeGetSettings,
+    PowerMessageTypeSetSettings,
+    PowerMessageTypeReloadSettings,
 } PowerMessageType;
 
 typedef struct {
@@ -57,6 +65,8 @@ typedef struct {
         PowerBootMode boot_mode;
         PowerInfo* power_info;
         bool* bool_param;
+        PowerSettings* settings;
+        const PowerSettings* csettings;
     };
     FuriApiLock lock;
 } PowerMessage;
diff --git a/applications/services/power/power_service/power_settings.c b/applications/services/power/power_service/power_settings.c
new file mode 100644
index 000000000..0cc18569b
--- /dev/null
+++ b/applications/services/power/power_service/power_settings.c
@@ -0,0 +1,75 @@
+#include "power_settings.h"
+#include "power_settings_filename.h"
+
+#include <saved_struct.h>
+#include <storage/storage.h>
+
+#define TAG "PowerSettings"
+
+#define POWER_SETTINGS_VER_0 (0) // OLD version number
+#define POWER_SETTINGS_VER   (1) // NEW actual version nnumber
+
+#define POWER_SETTINGS_PATH  INT_PATH(POWER_SETTINGS_FILE_NAME)
+#define POWER_SETTINGS_MAGIC (0x18)
+
+typedef struct {
+//inital set - empty
+} PowerSettingsV0;
+
+void power_settings_load(PowerSettings* settings) {
+    furi_assert(settings);
+
+    bool success = false;
+
+    do {
+        uint8_t version;
+        if(!saved_struct_get_metadata(POWER_SETTINGS_PATH, NULL, &version, NULL)) break;
+
+        if(version == POWER_SETTINGS_VER) { // if config actual version - load it directly
+            success = saved_struct_load(
+                POWER_SETTINGS_PATH,
+                settings,
+                sizeof(PowerSettings),
+                POWER_SETTINGS_MAGIC,
+                POWER_SETTINGS_VER);
+
+        } else if(version == POWER_SETTINGS_VER_0) { // if config previous version - load it and manual set new settings to inital value
+            PowerSettingsV0* settings_v0 = malloc(sizeof(PowerSettingsV0));
+
+            success = saved_struct_load(
+                POWER_SETTINGS_PATH,
+                settings_v0,
+                sizeof(PowerSettingsV0),
+                POWER_SETTINGS_MAGIC,
+                POWER_SETTINGS_VER_0);
+
+            if(success) {
+                settings->p_auto_poweroff_delay_ms = 0;
+            }
+
+            free(settings_v0);
+        }
+
+    } while(false);
+
+    if(!success) {
+        FURI_LOG_W(TAG, "Failed to load file, using defaults");
+        memset(settings, 0, sizeof(PowerSettings));
+        power_settings_save(settings);
+    }
+}
+
+void power_settings_save(const PowerSettings* settings) {
+    furi_assert(settings);
+
+    const bool success = saved_struct_save(
+        POWER_SETTINGS_PATH,
+        settings,
+        sizeof(PowerSettings),
+        POWER_SETTINGS_MAGIC,
+        POWER_SETTINGS_VER);
+
+    if(!success) {
+        FURI_LOG_E(TAG, "Failed to save file");
+    }
+}
diff --git a/applications/services/power/power_service/power_settings.h b/applications/services/power/power_service/power_settings.h
new file mode 100644
index 000000000..58c38ab3a
--- /dev/null
+++ b/applications/services/power/power_service/power_settings.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <stdint.h>
+
+typedef struct {
+    uint32_t p_auto_poweroff_delay_ms;
+} PowerSettings;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+void power_settings_load(PowerSettings* settings);
+void power_settings_save(const PowerSettings* settings);
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/applications/services/power/power_service/power_settings_filename.h b/applications/services/power/power_service/power_settings_filename.h
new file mode 100644
index 000000000..e8c6fbfce
--- /dev/null
+++ b/applications/services/power/power_service/power_settings_filename.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define POWER_SETTINGS_FILE_NAME ".power.settings"
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index f674380af..a9aa4145c 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -29,15 +29,6 @@ typedef enum {
     DesktopSettingsDummyOkLong,
 } DesktopSettingsEntry;
 
-// --- auto_power_off_timer
-#define AUTO_POWEROFF_DELAY_COUNT 8
-const char* const auto_poweroff_delay_text[AUTO_POWEROFF_DELAY_COUNT] =
-    {"OFF", "5min", "10min", "15min", "30min", "45min", "60min", "90min"};
-
-const uint32_t auto_poweroff_delay_value[AUTO_POWEROFF_DELAY_COUNT] =
-    {0, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
-// ---
-
 #define AUTO_LOCK_DELAY_COUNT 9
 const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = {
     "OFF",
@@ -96,16 +87,6 @@ static void desktop_settings_scene_start_clock_enable_changed(VariableItem* item
     app->settings.display_clock = index;
 }
 
-// --- auto_power_off_timer
-static void desktop_settings_scene_start_auto_poweroff_delay_changed(VariableItem* item) {
-    DesktopSettingsApp* app = variable_item_get_context(item);
-    uint8_t index = variable_item_get_current_value_index(item);
-
-    variable_item_set_current_value_text(item, auto_poweroff_delay_text[index]);
-    app->settings.auto_poweroff_delay_ms = auto_poweroff_delay_value[index];
-}
-// ---
-
 static void desktop_settings_scene_start_auto_lock_delay_changed(VariableItem* item) {
     DesktopSettingsApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -135,22 +116,6 @@ void desktop_settings_scene_start_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, auto_lock_delay_text[value_index]);
 
-    // --- auto_power_off_timer
-    item = variable_item_list_add(
-        variable_item_list,
-        "Auto PowerOff",
-        AUTO_POWEROFF_DELAY_COUNT,
-        desktop_settings_scene_start_auto_poweroff_delay_changed,
-        app);
-
-    value_index = value_index_uint32(
-        app->settings.auto_poweroff_delay_ms,
-        auto_poweroff_delay_value,
-        AUTO_POWEROFF_DELAY_COUNT);
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, auto_poweroff_delay_text[value_index]);
-    // ---
-
     item = variable_item_list_add(
         variable_item_list,
         "Battery View",
diff --git a/applications/settings/power_settings_app/power_settings_app.c b/applications/settings/power_settings_app/power_settings_app.c
index 57df1344f..8fa824252 100644
--- a/applications/settings/power_settings_app/power_settings_app.c
+++ b/applications/settings/power_settings_app/power_settings_app.c
@@ -46,10 +46,16 @@ PowerSettingsApp* power_settings_app_alloc(uint32_t first_scene) {
     app->submenu = submenu_alloc();
     view_dispatcher_add_view(
         app->view_dispatcher, PowerSettingsAppViewSubmenu, submenu_get_view(app->submenu));
+    app->variable_item_list = variable_item_list_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, PowerSettingsAppViewVariableItemList, variable_item_list_get_view(app->variable_item_list));
     app->dialog = dialog_ex_alloc();
     view_dispatcher_add_view(
         app->view_dispatcher, PowerSettingsAppViewDialog, dialog_ex_get_view(app->dialog));
 
+    // get settings from service to app
+    power_api_get_settings(app->power, &app->settings);
+
     // Set first scene
     scene_manager_next_scene(app->scene_manager, first_scene);
     return app;
@@ -57,16 +63,23 @@ PowerSettingsApp* power_settings_app_alloc(uint32_t first_scene) {
 
 void power_settings_app_free(PowerSettingsApp* app) {
     furi_assert(app);
+
+    // set settings from app to service
+    power_api_set_settings(app->power, &app->settings);
     // Views
     view_dispatcher_remove_view(app->view_dispatcher, PowerSettingsAppViewBatteryInfo);
     battery_info_free(app->battery_info);
     view_dispatcher_remove_view(app->view_dispatcher, PowerSettingsAppViewSubmenu);
     submenu_free(app->submenu);
+    view_dispatcher_remove_view(app->view_dispatcher, PowerSettingsAppViewVariableItemList);
+    variable_item_list_free(app->variable_item_list);
     view_dispatcher_remove_view(app->view_dispatcher, PowerSettingsAppViewDialog);
     dialog_ex_free(app->dialog);
+
     // View dispatcher
     view_dispatcher_free(app->view_dispatcher);
     scene_manager_free(app->scene_manager);
+
     // Records
     furi_record_close(RECORD_POWER);
     furi_record_close(RECORD_GUI);
diff --git a/applications/settings/power_settings_app/power_settings_app.h b/applications/settings/power_settings_app/power_settings_app.h
index bbbbacd61..f28e6a548 100644
--- a/applications/settings/power_settings_app/power_settings_app.h
+++ b/applications/settings/power_settings_app/power_settings_app.h
@@ -2,6 +2,7 @@
 
 #include <furi.h>
 #include <power/power_service/power.h>
+#include <power/power_service/power_settings.h>
 #include <gui/gui.h>
 #include <gui/view.h>
 #include <gui/view_dispatcher.h>
@@ -10,11 +11,13 @@
 
 #include "views/battery_info.h"
 #include <gui/modules/submenu.h>
+#include <gui/modules/variable_item_list.h>
 #include <gui/modules/dialog_ex.h>
 
 #include "scenes/power_settings_scene.h"
 
 typedef struct {
+    PowerSettings settings;
     Power* power;
     Gui* gui;
     SceneManager* scene_manager;
@@ -23,12 +26,14 @@ typedef struct {
     Submenu* submenu;
     DialogEx* dialog;
     PowerInfo info;
+    VariableItemList* variable_item_list;
 } PowerSettingsApp;
 
 typedef enum {
     PowerSettingsAppViewBatteryInfo,
     PowerSettingsAppViewSubmenu,
     PowerSettingsAppViewDialog,
+    PowerSettingsAppViewVariableItemList
 } PowerSettingsAppView;
 
 typedef enum {
diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
index 63f123d89..6d79ba0af 100644
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
@@ -1,12 +1,30 @@
 #include "../power_settings_app.h"
+#include <lib/toolbox/value_index.h>
 
 enum PowerSettingsSubmenuIndex {
+    PowerSettingsSubmenuIndexAutoPowerOff,
     PowerSettingsSubmenuIndexBatteryInfo,
     PowerSettingsSubmenuIndexReboot,
     PowerSettingsSubmenuIndexOff,
 };
 
-static void power_settings_scene_start_submenu_callback(void* context, uint32_t index) {
+#define P_AUTO_POWEROFF_DELAY_COUNT 9
+const char* const p_auto_poweroff_delay_text[P_AUTO_POWEROFF_DELAY_COUNT] =
+    {"OFF","5 sec" ,"5min", "10min", "15min", "30min", "45min", "60min", "90min"};
+
+const uint32_t p_auto_poweroff_delay_value[P_AUTO_POWEROFF_DELAY_COUNT] =
+    {0, 5000, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
+
+// change variable_item_list visible text and app_poweroff_delay_time_settings when user change item in variable_item_list
+static void power_settings_scene_start_auto_poweroff_delay_changed(VariableItem* item) {
+    PowerSettingsApp* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, p_auto_poweroff_delay_text[index]);
+    app->settings.p_auto_poweroff_delay_ms = p_auto_poweroff_delay_value[index];
+}
+
+static void power_settings_scene_start_submenu_callback(void* context, uint32_t index) { //show selected menu screen
     furi_assert(context);
     PowerSettingsApp* app = context;
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
@@ -14,30 +32,34 @@ static void power_settings_scene_start_submenu_callback(void* context, uint32_t
 
 void power_settings_scene_start_on_enter(void* context) {
     PowerSettingsApp* app = context;
-    Submenu* submenu = app->submenu;
+    VariableItemList* variable_item_list = app->variable_item_list;
 
-    submenu_add_item(
-        submenu,
-        "Battery Info",
-        PowerSettingsSubmenuIndexBatteryInfo,
-        power_settings_scene_start_submenu_callback,
+    VariableItem* item;
+    uint8_t value_index;
+    item = variable_item_list_add(
+        variable_item_list,
+        "Auto PowerOff Time",
+        P_AUTO_POWEROFF_DELAY_COUNT,
+        power_settings_scene_start_auto_poweroff_delay_changed, //function for change visible item list value and app settings
         app);
-    submenu_add_item(
-        submenu,
-        "Reboot",
-        PowerSettingsSubmenuIndexReboot,
-        power_settings_scene_start_submenu_callback,
-        app);
-    submenu_add_item(
-        submenu,
-        "Power OFF",
-        PowerSettingsSubmenuIndexOff,
-        power_settings_scene_start_submenu_callback,
-        app);
-    submenu_set_selected_item(
-        submenu, scene_manager_get_scene_state(app->scene_manager, PowerSettingsAppSceneStart));
 
-    view_dispatcher_switch_to_view(app->view_dispatcher, PowerSettingsAppViewSubmenu);
+    value_index = value_index_uint32(
+        app->settings.p_auto_poweroff_delay_ms,
+        p_auto_poweroff_delay_value,
+        P_AUTO_POWEROFF_DELAY_COUNT);
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, p_auto_poweroff_delay_text[value_index]);
+
+    variable_item_list_add(variable_item_list, "Battery Info", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "Reboot", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "Power OFF", 1, NULL, NULL);
+
+    variable_item_list_set_selected_item(
+        variable_item_list, scene_manager_get_scene_state(app->scene_manager, PowerSettingsAppSceneStart));
+    variable_item_list_set_enter_callback( //callback to show next mennu screen
+        variable_item_list, power_settings_scene_start_submenu_callback, app);
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, PowerSettingsAppViewVariableItemList);
 }
 
 bool power_settings_scene_start_on_event(void* context, SceneManagerEvent event) {
@@ -60,5 +82,6 @@ bool power_settings_scene_start_on_event(void* context, SceneManagerEvent event)
 
 void power_settings_scene_start_on_exit(void* context) {
     PowerSettingsApp* app = context;
-    submenu_reset(app->submenu);
+    variable_item_list_reset(app->variable_item_list);
+    power_settings_save(&app->settings); //actual need save every time when use ?
 }
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index 80effa9af..b649f1f99 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,79.2,,
+Version,+,79.3,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
@@ -2993,9 +2993,9 @@ Function,+,pipe_install_as_stdio,void,PipeSide*
 Function,+,pipe_receive,size_t,"PipeSide*, void*, size_t, FuriWait"
 Function,+,pipe_role,PipeRole,PipeSide*
 Function,+,pipe_send,size_t,"PipeSide*, const void*, size_t, FuriWait"
+Function,+,pipe_set_broken_callback,void,"PipeSide*, PipeSideBrokenCallback, FuriEventLoopEvent"
 Function,+,pipe_set_callback_context,void,"PipeSide*, void*"
 Function,+,pipe_set_data_arrived_callback,void,"PipeSide*, PipeSideDataArrivedCallback, FuriEventLoopEvent"
-Function,+,pipe_set_broken_callback,void,"PipeSide*, PipeSideBrokenCallback, FuriEventLoopEvent"
 Function,+,pipe_set_space_freed_callback,void,"PipeSide*, PipeSideSpaceFreedCallback, FuriEventLoopEvent"
 Function,+,pipe_spaces_available,size_t,PipeSide*
 Function,+,pipe_state,PipeState,PipeSide*
@@ -3023,12 +3023,16 @@ Function,-,posix_memalign,int,"void**, size_t, size_t"
 Function,-,pow,double,"double, double"
 Function,-,pow10,double,double
 Function,-,pow10f,float,float
+Function,+,power_api_get_settings,void,"Power*, PowerSettings*"
+Function,+,power_api_set_settings,void,"Power*, const PowerSettings*"
 Function,+,power_enable_low_battery_level_notification,void,"Power*, _Bool"
 Function,+,power_get_info,void,"Power*, PowerInfo*"
 Function,+,power_get_pubsub,FuriPubSub*,Power*
 Function,+,power_is_battery_healthy,_Bool,Power*
 Function,+,power_off,void,Power*
 Function,+,power_reboot,void,"Power*, PowerBootMode"
+Function,+,power_settings_load,void,PowerSettings*
+Function,+,power_settings_save,void,const PowerSettings*
 Function,-,power_trigger_ui_update,void,Power*
 Function,+,powf,float,"float, float"
 Function,-,powl,long double,"long double, long double"

From ec75de032052f20a6798408c38c05a6bb8c482c7 Mon Sep 17 00:00:00 2001
From: Dmitry422 <yakovlev.kem@gmail.com>
Date: Tue, 14 Jan 2025 02:08:35 +0700
Subject: [PATCH 03/13] Auto_poweroff_delay correction (removed test delay
 value)

---
 .../power_settings_app/scenes/power_settings_scene_start.c  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
index 6d79ba0af..681247668 100644
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
@@ -8,12 +8,12 @@ enum PowerSettingsSubmenuIndex {
     PowerSettingsSubmenuIndexOff,
 };
 
-#define P_AUTO_POWEROFF_DELAY_COUNT 9
+#define P_AUTO_POWEROFF_DELAY_COUNT 8
 const char* const p_auto_poweroff_delay_text[P_AUTO_POWEROFF_DELAY_COUNT] =
-    {"OFF","5 sec" ,"5min", "10min", "15min", "30min", "45min", "60min", "90min"};
+    {"OFF","5min", "10min", "15min", "30min", "45min", "60min", "90min"};
 
 const uint32_t p_auto_poweroff_delay_value[P_AUTO_POWEROFF_DELAY_COUNT] =
-    {0, 5000, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
+    {0, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
 
 // change variable_item_list visible text and app_poweroff_delay_time_settings when user change item in variable_item_list
 static void power_settings_scene_start_auto_poweroff_delay_changed(VariableItem* item) {

From cf50875c5cde3501ccf66ab3a36261dce488f476 Mon Sep 17 00:00:00 2001
From: Dmitry422 <yakovlev.kem@gmail.com>
Date: Wed, 15 Jan 2025 01:33:49 +0700
Subject: [PATCH 04/13] *POWER* - serice:     renamed function and variable -
 settings:     add test value 5 sec for auto_power_off timer

*DESKTOP*
- settings|service
    add USB_inhibit for desktop_auto_lock
    (dont autolock desktop with different condition)
    PS. RPC condition now working now.
---
 applications/services/desktop/desktop.c       | 15 +++++++
 .../services/desktop/desktop_settings.c       |  2 +
 .../services/desktop/desktop_settings.h       |  1 +
 .../services/power/power_service/power.c      | 21 ++++++----
 .../services/power/power_service/power_i.h    |  2 +-
 .../power/power_service/power_settings.c      |  2 +-
 .../power/power_service/power_settings.h      |  2 +-
 .../scenes/desktop_settings_scene_start.c     | 39 +++++++++++++++++++
 .../scenes/power_settings_scene_start.c       | 24 ++++++------
 9 files changed, 86 insertions(+), 22 deletions(-)

diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 66c4ca174..43356cf25 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -13,8 +13,15 @@
 #include "scenes/desktop_scene.h"
 #include "scenes/desktop_scene_locked.h"
 
+#include "furi_hal_power.h"
+
 #define TAG "Desktop"
 
+// dublicate constants from desktop_setting_scene_start.c
+#define USB_INHIBIT_AUTOLOCK_OFF    0
+#define USB_INHIBIT_AUTOLOCK_ON     1
+#define USB_INHIBIT_AUTOLOCK_RPC    2
+
 static void desktop_auto_lock_arm(Desktop*);
 static void desktop_auto_lock_inhibit(Desktop*);
 static void desktop_start_auto_lock_timer(Desktop*);
@@ -143,6 +150,14 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
 
     } else if(event == DesktopGlobalAutoLock) {
         if(!desktop->app_running && !desktop->locked) {
+            // if usb_inhibit_autolock enabled and device charging or device charged but still connected to USB then break desktop locking.
+            if ((desktop->settings.usb_inhibit_auto_lock == USB_INHIBIT_AUTOLOCK_ON) && ((furi_hal_power_is_charging()) || (furi_hal_power_is_charging_done()))){
+                return(0);
+                }
+            // if usb_inhibit_autolock set to RPC and we have F0 connected to phone or PC app then break desktop locking.
+            if (desktop->settings.usb_inhibit_auto_lock == USB_INHIBIT_AUTOLOCK_RPC){
+                return(0);
+                }
             desktop_lock(desktop);
         }
     } else if(event == DesktopGlobalSaveSettings) {
diff --git a/applications/services/desktop/desktop_settings.c b/applications/services/desktop/desktop_settings.c
index 43b5cf412..bf9215dd2 100644
--- a/applications/services/desktop/desktop_settings.c
+++ b/applications/services/desktop/desktop_settings.c
@@ -14,6 +14,7 @@
 
 typedef struct {
     uint32_t auto_lock_delay_ms;
+    uint32_t auto_poweroff_delay_ms;
     uint8_t displayBatteryPercentage;
     uint8_t dummy_mode;
     uint8_t display_clock;
@@ -53,6 +54,7 @@ void desktop_settings_load(DesktopSettings* settings) {
 
             if(success) {
                 settings->auto_lock_delay_ms = settings_v15->auto_lock_delay_ms;
+                settings->usb_inhibit_auto_lock = 0;
                 settings->displayBatteryPercentage = settings_v15->displayBatteryPercentage;
                 settings->dummy_mode = settings_v15->dummy_mode;
                 settings->display_clock = settings_v15->display_clock;
diff --git a/applications/services/desktop/desktop_settings.h b/applications/services/desktop/desktop_settings.h
index ba5a78840..784b1eeba 100644
--- a/applications/services/desktop/desktop_settings.h
+++ b/applications/services/desktop/desktop_settings.h
@@ -38,6 +38,7 @@ typedef struct {
 
 typedef struct {
     uint32_t auto_lock_delay_ms;
+    uint8_t usb_inhibit_auto_lock;
     uint8_t displayBatteryPercentage;
     uint8_t dummy_mode;
     uint8_t display_clock;
diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index dea911834..1814dbd4a 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -416,16 +416,16 @@ void power_api_set_settings(Power* power, const PowerSettings* settings) {
 //start furi timer for autopoweroff
 static void power_start_auto_poweroff_timer(Power* power) {
     furi_timer_start(
-        power->p_auto_poweroff_timer, furi_ms_to_ticks(power->settings.p_auto_poweroff_delay_ms));
+        power->auto_poweroff_timer, furi_ms_to_ticks(power->settings.auto_poweroff_delay_ms));
 }
 
 //stop furi timer for autopoweroff
 static void power_stop_auto_poweroff_timer(Power* power) {
-    furi_timer_stop(power->p_auto_poweroff_timer);
+    furi_timer_stop(power->auto_poweroff_timer);
 }
 
 static uint32_t power_is_running_auto_poweroff_timer(Power* power) {
-    return furi_timer_is_running(power->p_auto_poweroff_timer);
+    return furi_timer_is_running(power->auto_poweroff_timer);
 }
 
 // start|restart poweroff timer
@@ -440,12 +440,19 @@ static void power_auto_poweroff_callback(const void* value, void* context) {
 static void power_auto_poweroff_timer_callback(void* context) {
     furi_assert(context);
     Power* power = context;
-    power_off(power);
+    //check charging state and dont poweroff if battery not fully charged
+    power_check_charging_state(power);
+    if (power->state == PowerStateCharged) {
+        power_off(power);
+    }
+    else {
+        FURI_LOG_D(TAG, "We dont auto_power_off until battery is charging");
+    }
 }
 
 //start|restart timer and events subscription and callbacks for input events (we restart timer when user press keys)
 static void power_auto_poweroff_arm(Power* power) {
-    if(power->settings.p_auto_poweroff_delay_ms) {
+    if(power->settings.auto_poweroff_delay_ms) {
         if(power->input_events_subscription == NULL) {
             power->input_events_subscription = furi_pubsub_subscribe(
                 power->input_events_pubsub, power_auto_poweroff_callback, power);
@@ -485,7 +492,7 @@ static void power_loader_callback(const void* message, void* context) {
 // apply power settings
 static void power_settings_apply(Power* power) {
     //apply auto_poweroff settings
-    if(power->settings.p_auto_poweroff_delay_ms && !power->app_running) {
+    if(power->settings.auto_poweroff_delay_ms && !power->app_running) {
         return;
         power_auto_poweroff_arm(power);
     } else if (power_is_running_auto_poweroff_timer(power)) {
@@ -615,7 +622,7 @@ static Power* power_alloc(void) {
     furi_pubsub_subscribe(loader_get_pubsub(loader), power_loader_callback, power);
     power->input_events_pubsub = furi_record_open(RECORD_INPUT_EVENTS);
     //define autopoweroff timer and they callback 
-    power->p_auto_poweroff_timer =
+    power->auto_poweroff_timer =
         furi_timer_alloc(power_auto_poweroff_timer_callback, FuriTimerTypeOnce, power);
 
     // Gui
diff --git a/applications/services/power/power_service/power_i.h b/applications/services/power/power_service/power_i.h
index 1bb0fc3e8..40b4a1ef4 100644
--- a/applications/services/power/power_service/power_i.h
+++ b/applications/services/power/power_service/power_i.h
@@ -37,7 +37,7 @@ struct Power {
     uint8_t battery_level;
     uint8_t power_off_timeout;
     PowerSettings settings;
-    FuriTimer* p_auto_poweroff_timer;
+    FuriTimer* auto_poweroff_timer;
     bool app_running;
     FuriPubSub* input_events_pubsub;
     FuriPubSubSubscription* input_events_subscription;
diff --git a/applications/services/power/power_service/power_settings.c b/applications/services/power/power_service/power_settings.c
index 0cc18569b..9682a65e0 100644
--- a/applications/services/power/power_service/power_settings.c
+++ b/applications/services/power/power_service/power_settings.c
@@ -44,7 +44,7 @@ void power_settings_load(PowerSettings* settings) {
                 POWER_SETTINGS_VER_0);
 
             if(success) {
-                settings->p_auto_poweroff_delay_ms = 0;
+                settings->auto_poweroff_delay_ms = 0;
             }
 
             free(settings_v0);
diff --git a/applications/services/power/power_service/power_settings.h b/applications/services/power/power_service/power_settings.h
index 58c38ab3a..038531752 100644
--- a/applications/services/power/power_service/power_settings.h
+++ b/applications/services/power/power_service/power_settings.h
@@ -3,7 +3,7 @@
 #include <stdint.h>
 
 typedef struct {
-    uint32_t p_auto_poweroff_delay_ms;
+    uint32_t auto_poweroff_delay_ms;
 } PowerSettings;
 
 #ifdef __cplusplus
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index a9aa4145c..dee9d40be 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -45,6 +45,23 @@ const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = {
 const uint32_t auto_lock_delay_value[AUTO_LOCK_DELAY_COUNT] =
     {0, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000};
 
+#define USB_INHIBIT_AUTO_LOCK_DELAY_COUNT   3
+#define USB_INHIBIT_AUTOLOCK_OFF    0
+#define USB_INHIBIT_AUTOLOCK_ON     1
+#define USB_INHIBIT_AUTOLOCK_RPC    2
+
+const char* const usb_inhibit_auto_lock_delay_text[USB_INHIBIT_AUTO_LOCK_DELAY_COUNT] = {
+    "OFF",
+    "ON",
+    "RPC",
+};
+
+const uint32_t usb_inhibit_auto_lock_delay_value[USB_INHIBIT_AUTO_LOCK_DELAY_COUNT] = {
+    USB_INHIBIT_AUTOLOCK_OFF,
+    USB_INHIBIT_AUTOLOCK_ON,
+    USB_INHIBIT_AUTOLOCK_RPC,
+};
+
 #define CLOCK_ENABLE_COUNT 2
 const char* const clock_enable_text[CLOCK_ENABLE_COUNT] = {
     "OFF",
@@ -87,6 +104,7 @@ static void desktop_settings_scene_start_clock_enable_changed(VariableItem* item
     app->settings.display_clock = index;
 }
 
+
 static void desktop_settings_scene_start_auto_lock_delay_changed(VariableItem* item) {
     DesktopSettingsApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -95,6 +113,14 @@ static void desktop_settings_scene_start_auto_lock_delay_changed(VariableItem* i
     app->settings.auto_lock_delay_ms = auto_lock_delay_value[index];
 }
 
+static void desktop_settings_scene_start_usb_inhibit_auto_lock_delay_changed(VariableItem* item) {
+    DesktopSettingsApp* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, usb_inhibit_auto_lock_delay_text[index]);
+    app->settings.usb_inhibit_auto_lock = usb_inhibit_auto_lock_delay_value[index];
+}
+
 void desktop_settings_scene_start_on_enter(void* context) {
     DesktopSettingsApp* app = context;
     VariableItemList* variable_item_list = app->variable_item_list;
@@ -116,6 +142,19 @@ void desktop_settings_scene_start_on_enter(void* context) {
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, auto_lock_delay_text[value_index]);
 
+    // USB connection Inhibit autolock OFF|ON|with opened RPC session
+    item = variable_item_list_add(
+        variable_item_list,
+        "USB disarm Auto Lock",
+        USB_INHIBIT_AUTO_LOCK_DELAY_COUNT,
+        desktop_settings_scene_start_usb_inhibit_auto_lock_delay_changed,
+        app);
+
+    value_index = value_index_uint32(
+        app->settings.usb_inhibit_auto_lock, usb_inhibit_auto_lock_delay_value, USB_INHIBIT_AUTO_LOCK_DELAY_COUNT);
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, usb_inhibit_auto_lock_delay_text[value_index]);
+    
     item = variable_item_list_add(
         variable_item_list,
         "Battery View",
diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
index 681247668..6f9975114 100644
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
@@ -8,20 +8,20 @@ enum PowerSettingsSubmenuIndex {
     PowerSettingsSubmenuIndexOff,
 };
 
-#define P_AUTO_POWEROFF_DELAY_COUNT 8
-const char* const p_auto_poweroff_delay_text[P_AUTO_POWEROFF_DELAY_COUNT] =
-    {"OFF","5min", "10min", "15min", "30min", "45min", "60min", "90min"};
+#define AUTO_POWEROFF_DELAY_COUNT 9
+const char* const auto_poweroff_delay_text[AUTO_POWEROFF_DELAY_COUNT] =
+    {"OFF","5 sec","5min", "10min", "15min", "30min", "45min", "60min", "90min"};
 
-const uint32_t p_auto_poweroff_delay_value[P_AUTO_POWEROFF_DELAY_COUNT] =
-    {0, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
+const uint32_t auto_poweroff_delay_value[AUTO_POWEROFF_DELAY_COUNT] =
+    {0, 5000, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
 
 // change variable_item_list visible text and app_poweroff_delay_time_settings when user change item in variable_item_list
 static void power_settings_scene_start_auto_poweroff_delay_changed(VariableItem* item) {
     PowerSettingsApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
 
-    variable_item_set_current_value_text(item, p_auto_poweroff_delay_text[index]);
-    app->settings.p_auto_poweroff_delay_ms = p_auto_poweroff_delay_value[index];
+    variable_item_set_current_value_text(item, auto_poweroff_delay_text[index]);
+    app->settings.auto_poweroff_delay_ms = auto_poweroff_delay_value[index];
 }
 
 static void power_settings_scene_start_submenu_callback(void* context, uint32_t index) { //show selected menu screen
@@ -39,16 +39,16 @@ void power_settings_scene_start_on_enter(void* context) {
     item = variable_item_list_add(
         variable_item_list,
         "Auto PowerOff Time",
-        P_AUTO_POWEROFF_DELAY_COUNT,
+        AUTO_POWEROFF_DELAY_COUNT,
         power_settings_scene_start_auto_poweroff_delay_changed, //function for change visible item list value and app settings
         app);
 
     value_index = value_index_uint32(
-        app->settings.p_auto_poweroff_delay_ms,
-        p_auto_poweroff_delay_value,
-        P_AUTO_POWEROFF_DELAY_COUNT);
+        app->settings.auto_poweroff_delay_ms,
+        auto_poweroff_delay_value,
+        AUTO_POWEROFF_DELAY_COUNT);
     variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, p_auto_poweroff_delay_text[value_index]);
+    variable_item_set_current_value_text(item, auto_poweroff_delay_text[value_index]);
 
     variable_item_list_add(variable_item_list, "Battery Info", 1, NULL, NULL);
     variable_item_list_add(variable_item_list, "Reboot", 1, NULL, NULL);

From 1666c4d04fb138e4efc2f2f16e75e0fe306a0868 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 15 Jan 2025 00:42:43 +0300
Subject: [PATCH 05/13] upd settings to see release version only and current

---
 .../services/desktop/desktop_settings.c       | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/applications/services/desktop/desktop_settings.c b/applications/services/desktop/desktop_settings.c
index bf9215dd2..f5d0cf896 100644
--- a/applications/services/desktop/desktop_settings.c
+++ b/applications/services/desktop/desktop_settings.c
@@ -6,7 +6,7 @@
 
 #define TAG "DesktopSettings"
 
-#define DESKTOP_SETTINGS_VER_15 (15)
+#define DESKTOP_SETTINGS_VER_14 (14)
 #define DESKTOP_SETTINGS_VER    (16)
 
 #define DESKTOP_SETTINGS_PATH  INT_PATH(DESKTOP_SETTINGS_FILE_NAME)
@@ -14,13 +14,12 @@
 
 typedef struct {
     uint32_t auto_lock_delay_ms;
-    uint32_t auto_poweroff_delay_ms;
     uint8_t displayBatteryPercentage;
     uint8_t dummy_mode;
     uint8_t display_clock;
     FavoriteApp favorite_apps[FavoriteAppNumber];
     FavoriteApp dummy_apps[DummyAppNumber];
-} DesktopSettingsV15;
+} DesktopSettingsV14;
 
 // Actual size of DesktopSettings v13
 //static_assert(sizeof(DesktopSettingsV13) == 1234);
@@ -42,31 +41,31 @@ void desktop_settings_load(DesktopSettings* settings) {
                 DESKTOP_SETTINGS_MAGIC,
                 DESKTOP_SETTINGS_VER);
 
-        } else if(version == DESKTOP_SETTINGS_VER_15) {
-            DesktopSettingsV15* settings_v15 = malloc(sizeof(DesktopSettingsV15));
+        } else if(version == DESKTOP_SETTINGS_VER_14) {
+            DesktopSettingsV14* settings_v14 = malloc(sizeof(DesktopSettingsV14));
 
             success = saved_struct_load(
                 DESKTOP_SETTINGS_PATH,
-                settings_v15,
-                sizeof(DesktopSettingsV15),
+                settings_v14,
+                sizeof(DesktopSettingsV14),
                 DESKTOP_SETTINGS_MAGIC,
-                DESKTOP_SETTINGS_VER_15);
+                DESKTOP_SETTINGS_VER_14);
 
             if(success) {
-                settings->auto_lock_delay_ms = settings_v15->auto_lock_delay_ms;
+                settings->auto_lock_delay_ms = settings_v14->auto_lock_delay_ms;
                 settings->usb_inhibit_auto_lock = 0;
-                settings->displayBatteryPercentage = settings_v15->displayBatteryPercentage;
-                settings->dummy_mode = settings_v15->dummy_mode;
-                settings->display_clock = settings_v15->display_clock;
+                settings->displayBatteryPercentage = settings_v14->displayBatteryPercentage;
+                settings->dummy_mode = settings_v14->dummy_mode;
+                settings->display_clock = settings_v14->display_clock;
                 memcpy(
                     settings->favorite_apps,
-                    settings_v15->favorite_apps,
+                    settings_v14->favorite_apps,
                     sizeof(settings->favorite_apps));
                 memcpy(
-                    settings->dummy_apps, settings_v15->dummy_apps, sizeof(settings->dummy_apps));
+                    settings->dummy_apps, settings_v14->dummy_apps, sizeof(settings->dummy_apps));
             }
 
-            free(settings_v15);
+            free(settings_v14);
         }
 
     } while(false);

From d09bbd18fad01c969babab18257cd6e2eae7daaf Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 15 Jan 2025 00:53:47 +0300
Subject: [PATCH 06/13] upd changelog

---
 CHANGELOG.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 245ffe0de..6e7d0aa0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,18 @@
 ## Main changes
-- Current API: 79.2
+- Current API: 79.3
 * SubGHz: Jolly Motors support (with add manually) (Thanks @pkooiman !)
-* Desktop: Auto Power Off Timer (by @Dmitry422 with some fixes by @xMasterX)
+* Power: Auto Power Off Timer (by @Dmitry422 with some fixes by @xMasterX)
 * OFW: **Fix lost BadBLE keystrokes**
 * OFW: **Add the ability to send a signal once via RPC**
 * OFW PR 4025: Increase system stack's reserved memory size (Fix USB UART Bridge Crash) (by @Astrrra)
 * OFW: merged gsurkov/vcp_break_support branch for usb uart bridge (WIP!!!)
 * Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
 ## Other changes
-* Desktop: Add input events sub check & use event system for auto power off
+* Power & Desktop: Add input events sub check & use event system for auto power off
+* OFW: Rename FuriHalDebuging.md to FuriHalDebugging.md
+* OFW: nfc: Fix MIFARE Plus detection
+* OFW: u2f: Fix leaking message digest contexts
+* OFW: nfc: Fix MFUL PWD_AUTH command creation
 * OFW: Bump cross-spawn in /applications/system/js_app/packages/create-fz-app
 * OFW: **Pipe** (new api funcs)
 * OFW: Fix invalid path errors while deploying SDK by enforcing toolchain to use UTF-8 on initial SDK Extraction

From 818a47085e7d3504dd68ceffc312cf1153c9b57d Mon Sep 17 00:00:00 2001
From: Dmitry422 <yakovlev.kem@gmail.com>
Date: Wed, 15 Jan 2025 18:37:35 +0700
Subject: [PATCH 07/13] fix errors

---
 .../services/power/power_service/power.c       | 17 +++++++++--------
 .../scenes/power_settings_scene_start.c        | 18 +++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index 1814dbd4a..207764e99 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -440,13 +440,15 @@ static void power_auto_poweroff_callback(const void* value, void* context) {
 static void power_auto_poweroff_timer_callback(void* context) {
     furi_assert(context);
     Power* power = context;
-    //check charging state and dont poweroff if battery not fully charged
-    power_check_charging_state(power);
-    if (power->state == PowerStateCharged) {
+
+    //poweroff if not charging now or if connected to charger and charging done
+    if (((!furi_hal_power_is_charging())) || (furi_hal_power_is_charging_done())) {
         power_off(power);
     }
     else {
+        //else we dont poweroff device and restart timer
         FURI_LOG_D(TAG, "We dont auto_power_off until battery is charging");
+        power_start_auto_poweroff_timer(power);
     }
 }
 
@@ -493,12 +495,10 @@ static void power_loader_callback(const void* message, void* context) {
 static void power_settings_apply(Power* power) {
     //apply auto_poweroff settings
     if(power->settings.auto_poweroff_delay_ms && !power->app_running) {
-        return;
         power_auto_poweroff_arm(power);
     } else if (power_is_running_auto_poweroff_timer(power)) {
         power_auto_poweroff_disarm(power);
     }
-    return;
 }
 
 // do something depend from power queue message
@@ -662,6 +662,10 @@ int32_t power_srv(void* p) {
     }
 
     Power* power = power_alloc();
+
+    // load inital settings for power service
+    power_init_settings(power);
+
     power_update_info(power);
 
     furi_record_create(RECORD_POWER, power);
@@ -671,9 +675,6 @@ int32_t power_srv(void* p) {
     power->app_running = loader_is_locked(loader);
     furi_record_close(RECORD_LOADER);
 
-    // load inital settings for power service
-    power_init_settings(power);
-
     furi_event_loop_run(power->event_loop);
 
     return 0;
diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
index 6f9975114..9a12d65aa 100644
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
@@ -2,18 +2,18 @@
 #include <lib/toolbox/value_index.h>
 
 enum PowerSettingsSubmenuIndex {
-    PowerSettingsSubmenuIndexAutoPowerOff,
     PowerSettingsSubmenuIndexBatteryInfo,
     PowerSettingsSubmenuIndexReboot,
     PowerSettingsSubmenuIndexOff,
+    PowerSettingsSubmenuIndexAutoPowerOff,
 };
 
-#define AUTO_POWEROFF_DELAY_COUNT 9
+#define AUTO_POWEROFF_DELAY_COUNT 8
 const char* const auto_poweroff_delay_text[AUTO_POWEROFF_DELAY_COUNT] =
-    {"OFF","5 sec","5min", "10min", "15min", "30min", "45min", "60min", "90min"};
+    {"OFF","5min", "10min", "15min", "30min", "45min", "60min", "90min"};
 
 const uint32_t auto_poweroff_delay_value[AUTO_POWEROFF_DELAY_COUNT] =
-    {0, 5000, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
+    {0, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
 
 // change variable_item_list visible text and app_poweroff_delay_time_settings when user change item in variable_item_list
 static void power_settings_scene_start_auto_poweroff_delay_changed(VariableItem* item) {
@@ -34,6 +34,10 @@ void power_settings_scene_start_on_enter(void* context) {
     PowerSettingsApp* app = context;
     VariableItemList* variable_item_list = app->variable_item_list;
 
+    variable_item_list_add(variable_item_list, "Battery Info", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "Reboot", 1, NULL, NULL);
+    variable_item_list_add(variable_item_list, "Power OFF", 1, NULL, NULL);
+
     VariableItem* item;
     uint8_t value_index;
     item = variable_item_list_add(
@@ -49,11 +53,7 @@ void power_settings_scene_start_on_enter(void* context) {
         AUTO_POWEROFF_DELAY_COUNT);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, auto_poweroff_delay_text[value_index]);
-
-    variable_item_list_add(variable_item_list, "Battery Info", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "Reboot", 1, NULL, NULL);
-    variable_item_list_add(variable_item_list, "Power OFF", 1, NULL, NULL);
-
+    
     variable_item_list_set_selected_item(
         variable_item_list, scene_manager_get_scene_state(app->scene_manager, PowerSettingsAppSceneStart));
     variable_item_list_set_enter_callback( //callback to show next mennu screen

From 633f5d7c570f1aa7b552d791b35113a3788956a6 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 15 Jan 2025 17:23:38 +0300
Subject: [PATCH 08/13] fbt format and naming fix

---
 applications/services/desktop/desktop.c       | 19 ++++++++++---------
 .../services/power/power_service/power.c      | 15 +++++++--------
 .../power/power_service/power_settings.c      |  6 ++++--
 .../power/power_service/power_settings.h      |  2 +-
 .../scenes/desktop_settings_scene_start.c     | 15 ++++++++-------
 .../power_settings_app/power_settings_app.c   |  4 +++-
 .../scenes/power_settings_scene_start.c       | 17 +++++++++++------
 .../parsers/iso15693/iso15693_parser.c        |  2 +-
 lib/subghz/protocols/protocol_items.h         |  2 +-
 9 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 43356cf25..1c368338c 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -18,9 +18,9 @@
 #define TAG "Desktop"
 
 // dublicate constants from desktop_setting_scene_start.c
-#define USB_INHIBIT_AUTOLOCK_OFF    0
-#define USB_INHIBIT_AUTOLOCK_ON     1
-#define USB_INHIBIT_AUTOLOCK_RPC    2
+#define USB_INHIBIT_AUTOLOCK_OFF 0
+#define USB_INHIBIT_AUTOLOCK_ON  1
+#define USB_INHIBIT_AUTOLOCK_RPC 2
 
 static void desktop_auto_lock_arm(Desktop*);
 static void desktop_auto_lock_inhibit(Desktop*);
@@ -151,13 +151,14 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
     } else if(event == DesktopGlobalAutoLock) {
         if(!desktop->app_running && !desktop->locked) {
             // if usb_inhibit_autolock enabled and device charging or device charged but still connected to USB then break desktop locking.
-            if ((desktop->settings.usb_inhibit_auto_lock == USB_INHIBIT_AUTOLOCK_ON) && ((furi_hal_power_is_charging()) || (furi_hal_power_is_charging_done()))){
-                return(0);
-                }
+            if((desktop->settings.usb_inhibit_auto_lock == USB_INHIBIT_AUTOLOCK_ON) &&
+               ((furi_hal_power_is_charging()) || (furi_hal_power_is_charging_done()))) {
+                return (0);
+            }
             // if usb_inhibit_autolock set to RPC and we have F0 connected to phone or PC app then break desktop locking.
-            if (desktop->settings.usb_inhibit_auto_lock == USB_INHIBIT_AUTOLOCK_RPC){
-                return(0);
-                }
+            if(desktop->settings.usb_inhibit_auto_lock == USB_INHIBIT_AUTOLOCK_RPC) {
+                return (0);
+            }
             desktop_lock(desktop);
         }
     } else if(event == DesktopGlobalSaveSettings) {
diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index 207764e99..dcbac6717 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -442,10 +442,9 @@ static void power_auto_poweroff_timer_callback(void* context) {
     Power* power = context;
 
     //poweroff if not charging now or if connected to charger and charging done
-    if (((!furi_hal_power_is_charging())) || (furi_hal_power_is_charging_done())) {
+    if(((!furi_hal_power_is_charging())) || (furi_hal_power_is_charging_done())) {
         power_off(power);
-    }
-    else {
+    } else {
         //else we dont poweroff device and restart timer
         FURI_LOG_D(TAG, "We dont auto_power_off until battery is charging");
         power_start_auto_poweroff_timer(power);
@@ -463,7 +462,7 @@ static void power_auto_poweroff_arm(Power* power) {
     }
 }
 
-// stop timer and event subscription 
+// stop timer and event subscription
 static void power_auto_poweroff_disarm(Power* power) {
     power_stop_auto_poweroff_timer(power);
     if(power->input_events_subscription) {
@@ -482,7 +481,7 @@ static void power_loader_callback(const void* message, void* context) {
     if(event->type == LoaderEventTypeApplicationBeforeLoad) {
         power->app_running = true;
         power_auto_poweroff_disarm(power);
-    // arm timer if some apps was not loaded or was stoped
+        // arm timer if some apps was not loaded or was stoped
     } else if(
         event->type == LoaderEventTypeApplicationLoadFailed ||
         event->type == LoaderEventTypeApplicationStopped) {
@@ -496,7 +495,7 @@ static void power_settings_apply(Power* power) {
     //apply auto_poweroff settings
     if(power->settings.auto_poweroff_delay_ms && !power->app_running) {
         power_auto_poweroff_arm(power);
-    } else if (power_is_running_auto_poweroff_timer(power)) {
+    } else if(power_is_running_auto_poweroff_timer(power)) {
         power_auto_poweroff_disarm(power);
     }
 }
@@ -621,7 +620,7 @@ static Power* power_alloc(void) {
     Loader* loader = furi_record_open(RECORD_LOADER);
     furi_pubsub_subscribe(loader_get_pubsub(loader), power_loader_callback, power);
     power->input_events_pubsub = furi_record_open(RECORD_INPUT_EVENTS);
-    //define autopoweroff timer and they callback 
+    //define autopoweroff timer and they callback
     power->auto_poweroff_timer =
         furi_timer_alloc(power_auto_poweroff_timer_callback, FuriTimerTypeOnce, power);
 
@@ -670,7 +669,7 @@ int32_t power_srv(void* p) {
 
     furi_record_create(RECORD_POWER, power);
 
-// Can't be done in alloc, other things in startup need power service and it would deadlock by waiting for loader
+    // Can't be done in alloc, other things in startup need power service and it would deadlock by waiting for loader
     Loader* loader = furi_record_open(RECORD_LOADER);
     power->app_running = loader_is_locked(loader);
     furi_record_close(RECORD_LOADER);
diff --git a/applications/services/power/power_service/power_settings.c b/applications/services/power/power_service/power_settings.c
index 9682a65e0..139323a7a 100644
--- a/applications/services/power/power_service/power_settings.c
+++ b/applications/services/power/power_service/power_settings.c
@@ -13,7 +13,7 @@
 #define POWER_SETTINGS_MAGIC (0x18)
 
 typedef struct {
-//inital set - empty
+    //inital set - empty
 } PowerSettingsV0;
 
 void power_settings_load(PowerSettings* settings) {
@@ -33,7 +33,9 @@ void power_settings_load(PowerSettings* settings) {
                 POWER_SETTINGS_MAGIC,
                 POWER_SETTINGS_VER);
 
-        } else if(version == POWER_SETTINGS_VER_0) { // if config previous version - load it and manual set new settings to inital value
+        } else if(
+            version ==
+            POWER_SETTINGS_VER_0) { // if config previous version - load it and manual set new settings to inital value
             PowerSettingsV0* settings_v0 = malloc(sizeof(PowerSettingsV0));
 
             success = saved_struct_load(
diff --git a/applications/services/power/power_service/power_settings.h b/applications/services/power/power_service/power_settings.h
index 038531752..65d8e079e 100644
--- a/applications/services/power/power_service/power_settings.h
+++ b/applications/services/power/power_service/power_settings.h
@@ -13,4 +13,4 @@ void power_settings_load(PowerSettings* settings);
 void power_settings_save(const PowerSettings* settings);
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index dee9d40be..8764d4c16 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -45,10 +45,10 @@ const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = {
 const uint32_t auto_lock_delay_value[AUTO_LOCK_DELAY_COUNT] =
     {0, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000};
 
-#define USB_INHIBIT_AUTO_LOCK_DELAY_COUNT   3
-#define USB_INHIBIT_AUTOLOCK_OFF    0
-#define USB_INHIBIT_AUTOLOCK_ON     1
-#define USB_INHIBIT_AUTOLOCK_RPC    2
+#define USB_INHIBIT_AUTO_LOCK_DELAY_COUNT 3
+#define USB_INHIBIT_AUTOLOCK_OFF          0
+#define USB_INHIBIT_AUTOLOCK_ON           1
+#define USB_INHIBIT_AUTOLOCK_RPC          2
 
 const char* const usb_inhibit_auto_lock_delay_text[USB_INHIBIT_AUTO_LOCK_DELAY_COUNT] = {
     "OFF",
@@ -104,7 +104,6 @@ static void desktop_settings_scene_start_clock_enable_changed(VariableItem* item
     app->settings.display_clock = index;
 }
 
-
 static void desktop_settings_scene_start_auto_lock_delay_changed(VariableItem* item) {
     DesktopSettingsApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
@@ -151,10 +150,12 @@ void desktop_settings_scene_start_on_enter(void* context) {
         app);
 
     value_index = value_index_uint32(
-        app->settings.usb_inhibit_auto_lock, usb_inhibit_auto_lock_delay_value, USB_INHIBIT_AUTO_LOCK_DELAY_COUNT);
+        app->settings.usb_inhibit_auto_lock,
+        usb_inhibit_auto_lock_delay_value,
+        USB_INHIBIT_AUTO_LOCK_DELAY_COUNT);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, usb_inhibit_auto_lock_delay_text[value_index]);
-    
+
     item = variable_item_list_add(
         variable_item_list,
         "Battery View",
diff --git a/applications/settings/power_settings_app/power_settings_app.c b/applications/settings/power_settings_app/power_settings_app.c
index 8fa824252..c0e73e256 100644
--- a/applications/settings/power_settings_app/power_settings_app.c
+++ b/applications/settings/power_settings_app/power_settings_app.c
@@ -48,7 +48,9 @@ PowerSettingsApp* power_settings_app_alloc(uint32_t first_scene) {
         app->view_dispatcher, PowerSettingsAppViewSubmenu, submenu_get_view(app->submenu));
     app->variable_item_list = variable_item_list_alloc();
     view_dispatcher_add_view(
-        app->view_dispatcher, PowerSettingsAppViewVariableItemList, variable_item_list_get_view(app->variable_item_list));
+        app->view_dispatcher,
+        PowerSettingsAppViewVariableItemList,
+        variable_item_list_get_view(app->variable_item_list));
     app->dialog = dialog_ex_alloc();
     view_dispatcher_add_view(
         app->view_dispatcher, PowerSettingsAppViewDialog, dialog_ex_get_view(app->dialog));
diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
index 9a12d65aa..3fc3a8a30 100644
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_start.c
@@ -10,7 +10,7 @@ enum PowerSettingsSubmenuIndex {
 
 #define AUTO_POWEROFF_DELAY_COUNT 8
 const char* const auto_poweroff_delay_text[AUTO_POWEROFF_DELAY_COUNT] =
-    {"OFF","5min", "10min", "15min", "30min", "45min", "60min", "90min"};
+    {"OFF", "5min", "10min", "15min", "30min", "45min", "60min", "90min"};
 
 const uint32_t auto_poweroff_delay_value[AUTO_POWEROFF_DELAY_COUNT] =
     {0, 300000, 600000, 900000, 1800000, 2700000, 3600000, 5400000};
@@ -24,7 +24,9 @@ static void power_settings_scene_start_auto_poweroff_delay_changed(VariableItem*
     app->settings.auto_poweroff_delay_ms = auto_poweroff_delay_value[index];
 }
 
-static void power_settings_scene_start_submenu_callback(void* context, uint32_t index) { //show selected menu screen
+static void power_settings_scene_start_submenu_callback(
+    void* context,
+    uint32_t index) { //show selected menu screen
     furi_assert(context);
     PowerSettingsApp* app = context;
     view_dispatcher_send_custom_event(app->view_dispatcher, index);
@@ -42,7 +44,7 @@ void power_settings_scene_start_on_enter(void* context) {
     uint8_t value_index;
     item = variable_item_list_add(
         variable_item_list,
-        "Auto PowerOff Time",
+        "Auto PowerOff",
         AUTO_POWEROFF_DELAY_COUNT,
         power_settings_scene_start_auto_poweroff_delay_changed, //function for change visible item list value and app settings
         app);
@@ -53,11 +55,14 @@ void power_settings_scene_start_on_enter(void* context) {
         AUTO_POWEROFF_DELAY_COUNT);
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, auto_poweroff_delay_text[value_index]);
-    
+
     variable_item_list_set_selected_item(
-        variable_item_list, scene_manager_get_scene_state(app->scene_manager, PowerSettingsAppSceneStart));
+        variable_item_list,
+        scene_manager_get_scene_state(app->scene_manager, PowerSettingsAppSceneStart));
     variable_item_list_set_enter_callback( //callback to show next mennu screen
-        variable_item_list, power_settings_scene_start_submenu_callback, app);
+        variable_item_list,
+        power_settings_scene_start_submenu_callback,
+        app);
 
     view_dispatcher_switch_to_view(app->view_dispatcher, PowerSettingsAppViewVariableItemList);
 }
diff --git a/lib/signal_reader/parsers/iso15693/iso15693_parser.c b/lib/signal_reader/parsers/iso15693/iso15693_parser.c
index 7823a1237..3bf04d4c6 100644
--- a/lib/signal_reader/parsers/iso15693/iso15693_parser.c
+++ b/lib/signal_reader/parsers/iso15693/iso15693_parser.c
@@ -321,4 +321,4 @@ void iso15693_parser_force_1outof256(Iso15693Parser* instance) {
 
     instance->detect_mode = false;
     instance->mode = Iso15693ParserMode1OutOf256;
-}
\ No newline at end of file
+}
diff --git a/lib/subghz/protocols/protocol_items.h b/lib/subghz/protocols/protocol_items.h
index 9ca7d91ec..71265e88c 100644
--- a/lib/subghz/protocols/protocol_items.h
+++ b/lib/subghz/protocols/protocol_items.h
@@ -51,4 +51,4 @@
 #include "gangqi.h"
 #include "marantec24.h"
 #include "hollarm.h"
-#include "hay21.h"
\ No newline at end of file
+#include "hay21.h"

From 5096b9c88ba8b2788a976c4b0baa891ef128221a Mon Sep 17 00:00:00 2001
From: Aleksandr Kutuzov <alleteam@gmail.com>
Date: Thu, 16 Jan 2025 23:51:10 +0900
Subject: [PATCH 09/13] Infrared: increase max carrier limit

---
 targets/furi_hal_include/furi_hal_infrared.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/furi_hal_include/furi_hal_infrared.h b/targets/furi_hal_include/furi_hal_infrared.h
index 29f7101c1..36eaf122d 100644
--- a/targets/furi_hal_include/furi_hal_infrared.h
+++ b/targets/furi_hal_include/furi_hal_infrared.h
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-#define INFRARED_MAX_FREQUENCY 56000
+#define INFRARED_MAX_FREQUENCY 1000000
 #define INFRARED_MIN_FREQUENCY 10000
 
 typedef enum {

From 0a2b47c7e114807c9bab3cbbec442062d17967a4 Mon Sep 17 00:00:00 2001
From: Dmitry422 <yakovlev.kem@gmail.com>
Date: Fri, 17 Jan 2025 12:12:27 +0700
Subject: [PATCH 10/13] Autolock disarm by active USB connection instead of USB
 charging connection.

---
 applications/services/desktop/desktop.c           | 15 +++------------
 .../scenes/desktop_settings_scene_start.c         | 14 +++-----------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 1c368338c..79eace4a3 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -17,11 +17,6 @@
 
 #define TAG "Desktop"
 
-// dublicate constants from desktop_setting_scene_start.c
-#define USB_INHIBIT_AUTOLOCK_OFF 0
-#define USB_INHIBIT_AUTOLOCK_ON  1
-#define USB_INHIBIT_AUTOLOCK_RPC 2
-
 static void desktop_auto_lock_arm(Desktop*);
 static void desktop_auto_lock_inhibit(Desktop*);
 static void desktop_start_auto_lock_timer(Desktop*);
@@ -150,15 +145,11 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
 
     } else if(event == DesktopGlobalAutoLock) {
         if(!desktop->app_running && !desktop->locked) {
-            // if usb_inhibit_autolock enabled and device charging or device charged but still connected to USB then break desktop locking.
-            if((desktop->settings.usb_inhibit_auto_lock == USB_INHIBIT_AUTOLOCK_ON) &&
-               ((furi_hal_power_is_charging()) || (furi_hal_power_is_charging_done()))) {
-                return (0);
-            }
-            // if usb_inhibit_autolock set to RPC and we have F0 connected to phone or PC app then break desktop locking.
-            if(desktop->settings.usb_inhibit_auto_lock == USB_INHIBIT_AUTOLOCK_RPC) {
+            // Disable AutoLock if usb_inhibit_autolock option enabled and device have active USB connection.
+            if((desktop->settings.usb_inhibit_auto_lock) && (furi_hal_usb_is_locked())) {
                 return (0);
             }
+            
             desktop_lock(desktop);
         }
     } else if(event == DesktopGlobalSaveSettings) {
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index 8764d4c16..74266b28d 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -45,22 +45,14 @@ const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = {
 const uint32_t auto_lock_delay_value[AUTO_LOCK_DELAY_COUNT] =
     {0, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000};
 
-#define USB_INHIBIT_AUTO_LOCK_DELAY_COUNT 3
-#define USB_INHIBIT_AUTOLOCK_OFF          0
-#define USB_INHIBIT_AUTOLOCK_ON           1
-#define USB_INHIBIT_AUTOLOCK_RPC          2
+#define USB_INHIBIT_AUTO_LOCK_DELAY_COUNT 2
 
 const char* const usb_inhibit_auto_lock_delay_text[USB_INHIBIT_AUTO_LOCK_DELAY_COUNT] = {
     "OFF",
     "ON",
-    "RPC",
 };
 
-const uint32_t usb_inhibit_auto_lock_delay_value[USB_INHIBIT_AUTO_LOCK_DELAY_COUNT] = {
-    USB_INHIBIT_AUTOLOCK_OFF,
-    USB_INHIBIT_AUTOLOCK_ON,
-    USB_INHIBIT_AUTOLOCK_RPC,
-};
+const uint32_t usb_inhibit_auto_lock_delay_value[USB_INHIBIT_AUTO_LOCK_DELAY_COUNT] = {0,1};
 
 #define CLOCK_ENABLE_COUNT 2
 const char* const clock_enable_text[CLOCK_ENABLE_COUNT] = {
@@ -144,7 +136,7 @@ void desktop_settings_scene_start_on_enter(void* context) {
     // USB connection Inhibit autolock OFF|ON|with opened RPC session
     item = variable_item_list_add(
         variable_item_list,
-        "USB disarm Auto Lock",
+        "Auto Lock disarm by active USB connection",
         USB_INHIBIT_AUTO_LOCK_DELAY_COUNT,
         desktop_settings_scene_start_usb_inhibit_auto_lock_delay_changed,
         app);

From fbc29f519f5e0888eeec79f3056bbe8c6d0246f6 Mon Sep 17 00:00:00 2001
From: Dmitry422 <yakovlev.kem@gmail.com>
Date: Fri, 17 Jan 2025 13:01:38 +0700
Subject: [PATCH 11/13] Disable autopoweroff if charger connected.

---
 applications/services/power/power_service/power.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index dcbac6717..511c64c78 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -441,13 +441,12 @@ static void power_auto_poweroff_timer_callback(void* context) {
     furi_assert(context);
     Power* power = context;
 
-    //poweroff if not charging now or if connected to charger and charging done
-    if(((!furi_hal_power_is_charging())) || (furi_hal_power_is_charging_done())) {
-        power_off(power);
-    } else {
-        //else we dont poweroff device and restart timer
+    //Dont poweroff device if charger connected
+    if (furi_hal_power_is_charging()) {
         FURI_LOG_D(TAG, "We dont auto_power_off until battery is charging");
         power_start_auto_poweroff_timer(power);
+    } else {
+        power_off(power);
     }
 }
 

From e809e3ddbbe538f7c6924a341de248a7ee9d72c7 Mon Sep 17 00:00:00 2001
From: Dmitry422 <yakovlev.kem@gmail.com>
Date: Fri, 17 Jan 2025 13:12:20 +0700
Subject: [PATCH 12/13] Cosmetic menu changes

---
 applications/services/desktop/desktop.c                         | 2 +-
 .../desktop_settings/scenes/desktop_settings_scene_start.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index 79eace4a3..843dbebb0 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -145,7 +145,7 @@ static bool desktop_custom_event_callback(void* context, uint32_t event) {
 
     } else if(event == DesktopGlobalAutoLock) {
         if(!desktop->app_running && !desktop->locked) {
-            // Disable AutoLock if usb_inhibit_autolock option enabled and device have active USB connection.
+            // Disable AutoLock if usb_inhibit_autolock option enabled and device have active USB session.
             if((desktop->settings.usb_inhibit_auto_lock) && (furi_hal_usb_is_locked())) {
                 return (0);
             }
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index 74266b28d..9b992c80c 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -136,7 +136,7 @@ void desktop_settings_scene_start_on_enter(void* context) {
     // USB connection Inhibit autolock OFF|ON|with opened RPC session
     item = variable_item_list_add(
         variable_item_list,
-        "Auto Lock disarm by active USB connection",
+        "Auto Lock disarm by active USB session",
         USB_INHIBIT_AUTO_LOCK_DELAY_COUNT,
         desktop_settings_scene_start_usb_inhibit_auto_lock_delay_changed,
         app);

From 1acc814b2acb5b026ebc4695e505572e69f58f54 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 17 Jan 2025 14:59:05 +0300
Subject: [PATCH 13/13] upd changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e7d0aa0b..30c0c1f7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Power: Auto Power Off Timer (by @Dmitry422 with some fixes by @xMasterX)
 * OFW: **Fix lost BadBLE keystrokes**
 * OFW: **Add the ability to send a signal once via RPC**
+* OFW PR 4070: Infrared: increase max carrier limit (by @skotopes)
 * OFW PR 4025: Increase system stack's reserved memory size (Fix USB UART Bridge Crash) (by @Astrrra)
 * OFW: merged gsurkov/vcp_break_support branch for usb uart bridge (WIP!!!)
 * Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)