From bfe9ed94116358d8ad48d8677df1bc966b052081 Mon Sep 17 00:00:00 2001
From: Eng1n33r <non@mail.ccc>
Date: Wed, 22 Jun 2022 19:08:34 +0300
Subject: [PATCH] autolock more time options

---
 CHANGELOG.md                                              | 8 ++++++--
 ReadMe.md                                                 | 2 +-
 .../scenes/desktop_settings_scene_start.c                 | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae5939079..0e36b104b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ### New Update
-* Spectrum Analyzer - ULTRA NARROW mode
+* Spectrum Analyzer - show current mode on screen when changing modes
+* Spectrum Analyzer - Ultra Narrow mode
+* Desktop autolock more time options
+* Merged latest ofw dev changes:
+SubGhz: PowerSmart protocol, Infrared app fixes
+#### Previous changes
 * Merged latest ofw dev changes:
  Infrared app C port, nfc: NTAG21x complete emulation, nfc: DESFire fixes
  SubGhz: frequency analyzer combined frequency detection method, etc...
@@ -7,7 +12,6 @@
 * Games: Snake & Tetris now shows score
 * Volume patch in music player (testing needed)
 * Two new games: Arkanoid & Tic Tac Toe
-#### Previous changes
 * Fixed KeeLoq Uknown behavior, patched StarLine same way
 * Fixed incorrect var in protocol Scher-Khan (by @Skorpionm)
 * Came Atomo working emulation algorithm!
diff --git a/ReadMe.md b/ReadMe.md
index 487215247..ba2b43195 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -176,7 +176,7 @@ Use **`flipper-z-{target}-full-{suffix}.dfu`** to flash your device.
 - [UniversalRF Remix (By ESurge)(Original UniversalRF By jimilinuxguy)](https://github.com/ESurge/flipperzero-firmware-unirfremix)
 - [WAV Player (By DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player) With Fix From [Atmanos](https://github.com/at-manos)
 - [Tetris (By jeffplang)](https://github.com/jeffplang/flipperzero-firmware/tree/tetris_game/applications/tetris_game)
-- [Spectrum Analyzer (By jolcese)](https://github.com/jolcese/flipperzero-firmware/tree/spectrum/applications/spectrum_analyzer) - [ULTRA NARROW mode](https://github.com/theY4Kman/flipperzero-firmware)
+- [Spectrum Analyzer (By jolcese)](https://github.com/jolcese/flipperzero-firmware/tree/spectrum/applications/spectrum_analyzer) - [Ultra Narrow mode & scan channels non-consecutively](https://github.com/theY4Kman/flipperzero-firmware/commits?author=theY4Kman)
 - [Arkanoid (By gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)
 - [Tic Tac Toe (By gotnull)](https://github.com/gotnull/flipperzero-firmware-wPlugins)
 
diff --git a/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c
index 8e649c695..aaaf2e779 100644
--- a/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/desktop/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -9,18 +9,21 @@
 #define SCENE_EVENT_SELECT_PIN_SETUP 2
 #define SCENE_EVENT_SELECT_AUTO_LOCK_DELAY 3
 
-#define AUTO_LOCK_DELAY_COUNT 6
+#define AUTO_LOCK_DELAY_COUNT 9
 const char* const auto_lock_delay_text[AUTO_LOCK_DELAY_COUNT] = {
     "OFF",
+    "10s",
+    "15s",
     "30s",
     "60s",
+    "90s",
     "2min",
     "5min",
     "10min",
 };
 
 const uint32_t auto_lock_delay_value[AUTO_LOCK_DELAY_COUNT] =
-    {0, 30000, 60000, 120000, 300000, 600000};
+    {0, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000};
 
 static void desktop_settings_scene_start_var_list_enter_callback(void* context, uint32_t index) {
     DesktopSettingsApp* app = context;