Merge branch 'dev' into release

hc_sr04: Improve accuracy by measuring microseconds

.ci_files/anims_ofw.txt

@@ -36,13 +36,6 @@ Min level: 1
 Max level: 1
 Weight: 3
 
-Name: L1_Happy_holidays_128x64
-Min butthurt: 0
-Max butthurt: 14
-Min level: 1
-Max level: 3
-Weight: 4
-
 Name: L1_Read_books_128x64
 Min butthurt: 0
 Max butthurt: 8

.drone.yml

@@ -198,7 +198,7 @@ steps:
         [-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
 
 
-        [-Download latest extra apps pack-](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)
+        [-Download latest extra apps pack-](https://github.com/xMasterX/unleashed-extra-pack/archive/refs/heads/main.zip)
 
 
         [-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=release-cfw&version=${DRONE_TAG})
@@ -220,7 +220,7 @@ steps:
     commands:
       - wget "https://raw.githubusercontent.com/fieu/discord.sh/e1dc1a7595efad2cad8f072f0b3531c470f5b7c8/discord.sh"
       - chmod +x ./discord.sh
-      - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)'
+      - ./discord.sh --text 'New Unleashed firmware released!\n\nVersion - '${DRONE_TAG}'\n\n[[Github - Changelog]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/'${DRONE_TAG}')\n\n[-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)\n\n[-Download latest extra apps pack-](https://github.com/xMasterX/unleashed-extra-pack/archive/refs/heads/main.zip)\n\n[-Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/'${DRONE_TAG}'/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')\n\n[-Version without custom animations - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)\n\n[-Version with extra apps - Install FW via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-'${DRONE_TAG}'e.tgz&channel=release-cfw&version='${DRONE_TAG}'e)'
 
   - name: "Send extra pack build to telegram"
     image: appleboy/drone-telegram

.vscode/example/launch.json

@@ -11,9 +11,10 @@
             "args": {
                 "useSingleResult": true,
                 "env": {
-                    "PATH": "${workspaceFolder};${env:PATH}"
+                    "PATH": "${workspaceFolder};${env:PATH}",
+                    "FBT_QUIET": 1
                 },
-                "command": "./fbt get_blackmagic",
+                "command": "fbt get_blackmagic",
                 "description": "Get Blackmagic device",
             }
         }

CHANGELOG.md

@@ -1,14 +1,29 @@
 ### New changes
-* SubGHz: **Nice ON2E (Nice One)** support (by @assasinfil | PR #335)
-* SubGHz: Remove 467.75 From freq analyzer since it has too much noise (Frequency is still can be used, just excluded from FA to avoid false detections)
-* Archive and FileBrowser: **Fixed more navigation issues** (by @Willy-JL | PR #334)
-* Plugins -> SubGHz Bruteforcer: Fix Linear Delta 3 repeats (now its more stable and we will be sure signal is received correctly)
-* Plugins: Updated TOTP (Authenticator) [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
-* OFW: **Fix Cyfral & Metakom emulation (My temp fix removed and proper fix from OFW applied)**
-* OFW: BadUSB: disable CDC mode, USB mode switch fix
-* OFW: Updater visual fixes
+* If you have copied apps into `apps` folder - remove `apps` folder on your microSD before installing this release to avoid issues!
+* SubGHz: Fixed timings for static CAME 12 bit and other types (fixed issue #280)
+* SubGHz: Fix #370 and fix other protocol counter issues
+* SubGHz: **Custom buttons for Nice Flor S / Somfy Telis (+Programming mode)** - now you can use arrow buttons to send signal with different button code
+* SubGHz: Somfy Telis -> Add manually (create new remote, now with programming button (Prog / 0x8) you can write it into receiver)
+* SubGHz: BFT Mitto -> Add manually (create new remote, now with programming button (0xF) you can write it into receiver)
+* SubGHz: Nice One -> Add manually (programming is possible using regular button)
+* SubGHz: More precise settings for debug counter increase value
+* Plugins -> MouseJacker: Features, Fixes and improvements (by @MatthisC | PR #366)
+* Plugins -> HC-SR04: Improve accuracy by measuring microseconds (by @clashlab | PR #367)
+* OFW PR: 2441 - Infrared: Fix hangups on repeated button press (by gsurkov)
+* OFW PR: 2440 - Fix navigation on unsupported card types (by Astrrra)
+* OFW: BadUSB UI fixes
+* OFW: Plugins: move to designated categories -> **We moved some plugins to new categories too**
+* OFW: Drivers: remove excessive check in bq25896 and make PVS happy
+* OFW: FuriHal, Power, UnitTests: fix, rename battery charging voltage limit API -> **Breaking API change, api was changed from 14.x to 15.x** 
+**(this will make your manually copied plugins not work, update them in same way you installed them, or delete `apps` folder and then install firmware, if you using extra pack builds (with `e` in version) all apps in _Extra will be updated automatically)**
 
-#### [🎲 Download latest extra apps pack](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)
+* OFW: Fix incorrect type choise condition in image compressor
+* OFW: Updater: handle storage errors when removing files, fix folder remove routine, prevent unused services from starting
+* OFW: Unify power info, power debug, and device_info into one info command
+* OFW: SD Cache: moved to diskio layer, invalidation in case of error
+* OFW: Picopass: factory key support, minor code cleanup
+
+#### [🎲 Download latest extra apps pack](https://github.com/xMasterX/unleashed-extra-pack/archive/refs/heads/main.zip)
 
 [-> How to install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
 

ReadMe.md

@@ -12,8 +12,6 @@
 
 Our goal is to make all features possible on this device without any limitations! 
 
-Please help us implement emulation for all Sub-GHz dynamic (rolling code) protocols!
-
 <br>
 
 ### This software is for experimental purposes only and is not meant for any illegal activity/purposes. <br> We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law. <br> Also, this software is made without any support from Flipper Devices and is in no way related to the official devs. 
@@ -27,7 +25,7 @@ Our Discord Community:
 <br>
 <br>
 
-## Dev builds
+## Dev builds (unstable)
 - https://dev.unleashedflip.com/
 - https://t.me/kotnehleb
 ## Releases in Telegram
@@ -37,7 +35,7 @@ Our Discord Community:
 * Sub-GHz regional TX restrictions removed
 * Sub-GHz frequency range can be extended in settings file (Warning: It can damage Flipper's hardware)
 * Many rolling code protocols now have the ability to save & send captured signals
-* FAAC SLH (Spa) & BFT Mitto (secure with seed) manual creation
+* FAAC SLH (Spa) & BFT Mitto (keeloq secure with seed) manual creation
 * Sub-GHz static code brute-force plugin
 * LFRFID Fuzzer plugin
 * Custom community plugins and games added + all known working apps can be downloaded in extra pack in every release
@@ -45,18 +43,30 @@ Our Discord Community:
 * Picopass/iClass plugin included in releases
 * Recompiled IR TV Universal Remote for ALL buttons
 * Universal remote for Projectors, Fans, A/Cs and Audio(soundbars, etc.)
-* BadUSB keyboard layouts
 * Customizable Flipper name
+- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout)
+- Sub-GHz -> External CC1101 module support - [(by quen0n)](https://github.com/DarkFlippers/unleashed-firmware/pull/307)
+- Sub-GHz -> New frequency analyzer - [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43)
+- Sub-GHz -> Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
+- Sub-GHz -> Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
+- Sub-GHz -> Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
+- Lock device with pin(or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107)
 * Sub-GHz -> Press OK in frequency analyzer to use detected frequency in Read modes
 * Sub-GHz -> Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu 
 * Sub-GHz -> External CC1101 module support
+* SubGHz -> **Hold right in received signal list to delete selected signal**
+* SubGHz -> **Custom buttons for Keeloq / Alutech AT4N / Nice Flor S / Somfy Telis** - now you can use arrow buttons to send signal with different button code
+* SubGHz -> BFT Mitto / Somfy Telis / Nice Flor S manual creation with programming new remote into receiver (use button 0xF for BFT Mitto, 0x8 (Prog) on Somfy Telis)
+* SubGHz -> Debug mode counter increase settings (+1 -> +5, +10, default: +1)
+* SubGHz -> Debug PIN output settings for protocol development
+* Infrared -> Debug TX PIN output settings
 * Other small fixes and changes throughout
-* See other changes in changelog and in readme below
+* See other changes in readme below
 
 Also check the changelog in releases for latest updates!
 
 ### Current modified and new Sub-GHz protocols list:
-Thanks to Official team (to thier SubGHz Developer, Skorp) for implementing decoders for these protocols.
+Thanks to Official team (to their SubGHz Developer, Skorp) for implementing decoders for these protocols.
 
 Encoders/sending made by Eng1n33r & @xMasterX:
 
@@ -70,10 +80,11 @@ Encoders/sending made by Eng1n33r & @xMasterX:
 - Keeloq: FAAC RC,XT
 - Keeloq: Mutancode
 - Keeloq: Normstahl
+- Keeloq: Beninca
 - CAME Atomo
 - Nice Flor S
 - FAAC SLH (Spa) [External seed calculation required (For info contact me in Discord: Nano#8998)] 
-- BFT Mitto [External seed calculation required (For info contact me in Discord: Nano#8998)] 
+- Keeloq: BFT Mitto [External seed calculation required (For info contact me in Discord: Nano#8998)] 
 - Security+ v1 & v2
 - Star Line
 
@@ -118,7 +129,6 @@ You can support us by using links or addresses below:
 - ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module)
 - WiFi Scanner plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module)
 - MultiConverter plugin [(by theisolinearchip)](https://github.com/theisolinearchip/flipperzero_stuff)
-- USB Keyboard plugin [(by huuck)](https://github.com/huuck/FlipperZeroUSBKeyboard)
 - WAV Player [(OFW: DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player) - Fixed and improved by [LTVA1](https://github.com/LTVA1/wav_player)
 - Barcode generator plugin [(original by McAzzaMan)](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator) - [EAN-8 and refactoring](https://github.com/DarkFlippers/unleashed-firmware/pull/154) by @msvsergey
 - GPIO: Sentry Safe plugin [(by H4ckd4ddy)](https://github.com/H4ckd4ddy/flipperzero-sentry-safe-plugin)
@@ -142,6 +152,7 @@ You can support us by using links or addresses below:
 - Text Viewer [(by kowalski7cc & kyhwana)](https://github.com/kowalski7cc/flipper-zero-text-viewer/tree/refactor-text-app)
 - **UART Terminal** [(by cool4uma)](https://github.com/cool4uma/UART_Terminal/tree/main)
 - **ProtoView** [(by antirez)](https://github.com/antirez/protoview)
+- **SWD Probe** [(by g3gg0)](https://github.com/g3gg0/flipper-swd_probe)
 
 Games:
 - DOOM (fixed) [(by p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
@@ -157,15 +168,6 @@ Games:
 - BlackJack [(by teeebor)](https://github.com/teeebor/flipper_games)
 - 2048 game [(by eugene-kirzhanov)](https://github.com/eugene-kirzhanov/flipper-zero-2048-game)
 
-### Other changes
-
-- BadUSB -> Keyboard layouts [(by rien > dummy-decoy)](https://github.com/dummy-decoy/flipperzero-firmware/tree/dummy_decoy/bad_usb_keyboard_layout)
-- Sub-GHz -> External CC1101 module support - [(by quen0n)](https://github.com/DarkFlippers/unleashed-firmware/pull/307)
-- Sub-GHz -> New frequency analyzer - [(by ClusterM)](https://github.com/DarkFlippers/unleashed-firmware/pull/43)
-- Sub-GHz -> Save last used frequency [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
-- Sub-GHz -> Press OK in frequency analyzer to use detected frequency in Read modes [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/77)
-- Sub-GHz -> Long press OK button in Sub-GHz Frequency analyzer to switch to Read menu [(by derskythe)](https://github.com/DarkFlippers/unleashed-firmware/pull/79)
-- Lock device with pin(or regular lock if pin not set) by holding UP button on main screen [(by an4tur0r)](https://github.com/DarkFlippers/unleashed-firmware/pull/107)
 
 # Instructions
 ## [- How to install firmware](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md)
@@ -178,12 +180,20 @@ Games:
 
 ## [- How to change Flipper name](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/CustomFlipperName.md)
 
+### **Sub-GHz**
+
+## [- Transmission is blocked? - How to extend Sub-GHz frequency range](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/DangerousSettings.md)
+
+## [- How to add extra Sub-GHz frequencies](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzSettings.md)
+
+## [- How to use Flipper as new remote (Nice FlorS, BFT Mitto, Somfy Telis)](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemoteProg.md)
+
+## [- Configure Sub-GHz Remote App](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md)
+
 ### **Plugins**
 
 ## [- 🎲 Download Extra plugins for Unleashed](https://github.com/xMasterX/unleashed-extra-pack)
 
-## [- Configure Sub-GHz Remote App](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzRemotePlugin.md)
-
 ## [- TOTP (Authenticator) config description](https://github.com/akopachov/flipper-zero_authenticator/blob/master/docs/conf-file_description.md)
 
 ## [- Barcode Generator](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/BarcodeGenerator.md)
@@ -218,20 +228,12 @@ Games:
 
 ## [- How to use: [GPIO] SentrySafe plugin](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SentrySafe.md)
 
-### **Sub-GHz**
-
-## [- Transmission is blocked? - How to extend Sub-GHz frequency range](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/DangerousSettings.md)
-
-## [- How to add extra Sub-GHz frequencies](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/SubGHzSettings.md)
-
 <br>
 <br>
 
 # Where I can find IR, Sub-GHz, ... files, DBs, and other stuff?
 ## [UberGuidoZ Playground - Large collection of files - Github](https://github.com/UberGuidoZ/Flipper)
 ## [Awesome Flipper Zero - Github](https://github.com/djsime1/awesome-flipperzero)
-## [CAME-12bit, NICE-12bit, Linear-10bit, PT-2240 - Sub-GHz fixed code bruteforce](https://github.com/tobiabocchi/flipperzero-bruteforce)
-## [SMC5326, UNILARM - Sub-GHz fixed code bruteforce](https://github.com/Hong5489/flipperzero-gate-bruteforce)
 
 <br>
 <br>
@@ -239,6 +241,9 @@ Games:
 # Links
 
 * Unofficial Discord: [discord.unleashedflip.com](https://discord.unleashedflip.com)
+* Hello world - plugin tutorial (English): [https://github.com/DroomOne/Flipper-Plugin-Tutorial](https://github.com/DroomOne/Flipper-Plugin-Tutorial)
+* Hello world - plugin tutorial (in Russian): [https://yakovlev.me/hello-flipper-zero/](https://yakovlev.me/hello-flipper-zero/)
+* CLion IDE - How to setup workspace for flipper firmware development: [https://krasovs.ky/2022/11/01/flipper-zero-clion.html](https://krasovs.ky/2022/11/01/flipper-zero-clion.html)
 * Docs by atmanos / How to write your own app (outdated API): [https://flipper.atmanos.com/docs/overview/intro](https://flipper.atmanos.com/docs/overview/intro)
 
 * Official Docs: [http://docs.flipperzero.one](http://docs.flipperzero.one)

SConstruct

@@ -139,7 +139,7 @@ if GetOption("fullenv") or any(
 basic_dist = distenv.DistCommand("fw_dist", distenv["DIST_DEPENDS"])
 distenv.Default(basic_dist)
 
-dist_dir = distenv.GetProjetDirName()
+dist_dir = distenv.GetProjectDirName()
 fap_dist = [
     distenv.Install(
         distenv.Dir(f"#/dist/{dist_dir}/apps/debug_elf"),

applications/debug/unit_tests/power/power_test.c

@@ -3,56 +3,63 @@
 #include "../minunit.h"
 
 static void power_test_deinit(void) {
-    // Try to reset to default charging voltage
-    furi_hal_power_set_battery_charging_voltage(4.208f);
+    // Try to reset to default charge voltage limit
+    furi_hal_power_set_battery_charge_voltage_limit(4.208f);
 }
 
-MU_TEST(test_power_charge_voltage_exact) {
-    // Power of 16mV charge voltages get applied exactly
+MU_TEST(test_power_charge_voltage_limit_exact) {
+    // Power of 16mV charge voltage limits get applied exactly
     // (bq25896 charge controller works in 16mV increments)
     //
     // This test may need adapted if other charge controllers are used in the future.
     for(uint16_t charge_mv = 3840; charge_mv <= 4208; charge_mv += 16) {
         float charge_volt = (float)charge_mv / 1000.0f;
-        furi_hal_power_set_battery_charging_voltage(charge_volt);
-        mu_assert_double_eq(charge_volt, furi_hal_power_get_battery_charging_voltage());
+        furi_hal_power_set_battery_charge_voltage_limit(charge_volt);
+        mu_assert_double_eq(charge_volt, furi_hal_power_get_battery_charge_voltage_limit());
     }
 }
 
-MU_TEST(test_power_charge_voltage_floating_imprecision) {
+MU_TEST(test_power_charge_voltage_limit_floating_imprecision) {
     // 4.016f should act as 4.016 V, even with floating point imprecision
-    furi_hal_power_set_battery_charging_voltage(4.016f);
-    mu_assert_double_eq(4.016f, furi_hal_power_get_battery_charging_voltage());
+    furi_hal_power_set_battery_charge_voltage_limit(4.016f);
+    mu_assert_double_eq(4.016f, furi_hal_power_get_battery_charge_voltage_limit());
 }
 
-MU_TEST(test_power_charge_voltage_inexact) {
-    // Charge voltages that are not power of 16mV get truncated down
-    furi_hal_power_set_battery_charging_voltage(3.841f);
-    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charging_voltage());
+MU_TEST(test_power_charge_voltage_limit_inexact) {
+    // Charge voltage limits that are not power of 16mV get truncated down
+    furi_hal_power_set_battery_charge_voltage_limit(3.841f);
+    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit());
 
-    furi_hal_power_set_battery_charging_voltage(3.900f);
-    mu_assert_double_eq(3.888, furi_hal_power_get_battery_charging_voltage());
+    furi_hal_power_set_battery_charge_voltage_limit(3.900f);
+    mu_assert_double_eq(3.888, furi_hal_power_get_battery_charge_voltage_limit());
 
-    furi_hal_power_set_battery_charging_voltage(4.200f);
-    mu_assert_double_eq(4.192, furi_hal_power_get_battery_charging_voltage());
+    furi_hal_power_set_battery_charge_voltage_limit(4.200f);
+    mu_assert_double_eq(4.192, furi_hal_power_get_battery_charge_voltage_limit());
 }
 
-MU_TEST(test_power_charge_voltage_invalid_clamped) {
-    // Out-of-range charge voltages get clamped to 3.840 V and 4.208 V
-    furi_hal_power_set_battery_charging_voltage(3.808f);
-    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charging_voltage());
+MU_TEST(test_power_charge_voltage_limit_invalid_clamped) {
+    // Out-of-range charge voltage limits get clamped to 3.840 V and 4.208 V
+    furi_hal_power_set_battery_charge_voltage_limit(3.808f);
+    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit());
+    furi_hal_power_set_battery_charge_voltage_limit(1.0f);
+    mu_assert_double_eq(3.840, furi_hal_power_get_battery_charge_voltage_limit());
 
     // NOTE: Intentionally picking a small increment above 4.208 V to reduce the risk of an
     // unhappy battery if this fails.
-    furi_hal_power_set_battery_charging_voltage(4.240f);
-    mu_assert_double_eq(4.208, furi_hal_power_get_battery_charging_voltage());
+    furi_hal_power_set_battery_charge_voltage_limit(4.240f);
+    mu_assert_double_eq(4.208, furi_hal_power_get_battery_charge_voltage_limit());
+    // Likewise, picking a number that the uint8_t wraparound in the driver would result in a
+    // VREG value under 23 if this test fails.
+    // E.g. (uint8_t)((8105-3840)/16) -> 10
+    furi_hal_power_set_battery_charge_voltage_limit(8.105f);
+    mu_assert_double_eq(4.208, furi_hal_power_get_battery_charge_voltage_limit());
 }
 
 MU_TEST_SUITE(test_power_suite) {
-    MU_RUN_TEST(test_power_charge_voltage_exact);
-    MU_RUN_TEST(test_power_charge_voltage_floating_imprecision);
-    MU_RUN_TEST(test_power_charge_voltage_inexact);
-    MU_RUN_TEST(test_power_charge_voltage_invalid_clamped);
+    MU_RUN_TEST(test_power_charge_voltage_limit_exact);
+    MU_RUN_TEST(test_power_charge_voltage_limit_floating_imprecision);
+    MU_RUN_TEST(test_power_charge_voltage_limit_inexact);
+    MU_RUN_TEST(test_power_charge_voltage_limit_invalid_clamped);
     power_test_deinit();
 }
 

applications/main/bad_usb/bad_usb_app.c

@@ -142,10 +142,6 @@ void bad_usb_app_free(BadUsbApp* app) {
         app->bad_usb_script = NULL;
     }
 
-    if(app->usb_if_prev) {
-        furi_check(furi_hal_usb_set_config(app->usb_if_prev, NULL));
-    }
-
     // Views
     view_dispatcher_remove_view(app->view_dispatcher, BadUsbAppViewWork);
     bad_usb_free(app->bad_usb_view);
@@ -172,6 +168,10 @@ void bad_usb_app_free(BadUsbApp* app) {
     furi_string_free(app->file_path);
     furi_string_free(app->keyboard_layout);
 
+    if(app->usb_if_prev) {
+        furi_check(furi_hal_usb_set_config(app->usb_if_prev, NULL));
+    }
+
     free(app);
 }
 

applications/main/bad_usb/bad_usb_script.c

@@ -32,6 +32,7 @@ struct BadUsbScript {
     FuriString* file_path;
     uint32_t defdelay;
     uint16_t layout[128];
+    uint32_t stringdelay;
     FuriThread* thread;
     uint8_t file_buf[FILE_BUFFER_LEN + 1];
     uint8_t buf_start;
@@ -113,6 +114,8 @@ static const char ducky_cmd_delay[] = {"DELAY "};
 static const char ducky_cmd_string[] = {"STRING "};
 static const char ducky_cmd_defdelay_1[] = {"DEFAULT_DELAY "};
 static const char ducky_cmd_defdelay_2[] = {"DEFAULTDELAY "};
+static const char ducky_cmd_stringdelay_1[] = {"STRINGDELAY "};
+static const char ducky_cmd_stringdelay_2[] = {"STRING_DELAY "};
 static const char ducky_cmd_repeat[] = {"REPEAT "};
 static const char ducky_cmd_sysrq[] = {"SYSRQ "};
 
@@ -211,14 +214,19 @@ static bool ducky_altstring(const char* param) {
 
 static bool ducky_string(BadUsbScript* bad_usb, const char* param) {
     uint32_t i = 0;
+
     while(param[i] != '\0') {
         uint16_t keycode = BADUSB_ASCII_TO_KEY(bad_usb, param[i]);
         if(keycode != HID_KEYBOARD_NONE) {
             furi_hal_hid_kb_press(keycode);
             furi_hal_hid_kb_release(keycode);
+            if(bad_usb->stringdelay > 0) {
+                furi_delay_ms(bad_usb->stringdelay);
+            }
         }
         i++;
     }
+    bad_usb->stringdelay = 0;
     return true;
 }
 
@@ -277,6 +285,20 @@ static int32_t
             snprintf(error, error_len, "Invalid number %s", line_tmp);
         }
         return (state) ? (0) : SCRIPT_STATE_ERROR;
+    } else if(
+        (strncmp(line_tmp, ducky_cmd_stringdelay_1, strlen(ducky_cmd_stringdelay_1)) == 0) ||
+        (strncmp(line_tmp, ducky_cmd_stringdelay_2, strlen(ducky_cmd_stringdelay_2)) == 0)) {
+        //STRINGDELAY, finally it's here
+        line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
+        state = ducky_get_number(line_tmp, &bad_usb->stringdelay);
+        if((state) && (bad_usb->stringdelay > 0)) {
+            return state;
+        }
+        if(error != NULL) {
+            snprintf(error, error_len, "Invalid number %s", line_tmp);
+        }
+        return SCRIPT_STATE_ERROR;
+
     } else if(strncmp(line_tmp, ducky_cmd_string, strlen(ducky_cmd_string)) == 0) {
         // STRING
         line_tmp = &line_tmp[ducky_get_command_len(line_tmp) + 1];
@@ -484,6 +506,19 @@ static void bad_usb_hid_state_callback(bool state, void* context) {
         furi_thread_flags_set(furi_thread_get_id(bad_usb->thread), WorkerEvtDisconnect);
 }
 
+static uint32_t bad_usb_flags_get(uint32_t flags_mask, uint32_t timeout) {
+    uint32_t flags = furi_thread_flags_get();
+    furi_check((flags & FuriFlagError) == 0);
+    if(flags == 0) {
+        flags = furi_thread_flags_wait(flags_mask, FuriFlagWaitAny, timeout);
+        furi_check(((flags & FuriFlagError) == 0) || (flags == (unsigned)FuriFlagErrorTimeout));
+    } else {
+        uint32_t state = furi_thread_flags_clear(flags);
+        furi_check((state & FuriFlagError) == 0);
+    }
+    return flags;
+}
+
 static int32_t bad_usb_worker(void* context) {
     BadUsbScript* bad_usb = context;
 
@@ -520,11 +555,9 @@ static int32_t bad_usb_worker(void* context) {
             bad_usb->st.state = worker_state;
 
         } else if(worker_state == BadUsbStateNotConnected) { // State: USB not connected
-            uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd | WorkerEvtConnect | WorkerEvtToggle,
-                FuriFlagWaitAny,
-                FuriWaitForever);
-            furi_check((flags & FuriFlagError) == 0);
+            uint32_t flags = bad_usb_flags_get(
+                WorkerEvtEnd | WorkerEvtConnect | WorkerEvtToggle, FuriWaitForever);
+
             if(flags & WorkerEvtEnd) {
                 break;
             } else if(flags & WorkerEvtConnect) {
@@ -535,11 +568,9 @@ static int32_t bad_usb_worker(void* context) {
             bad_usb->st.state = worker_state;
 
         } else if(worker_state == BadUsbStateIdle) { // State: ready to start
-            uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd | WorkerEvtToggle | WorkerEvtDisconnect,
-                FuriFlagWaitAny,
-                FuriWaitForever);
-            furi_check((flags & FuriFlagError) == 0);
+            uint32_t flags = bad_usb_flags_get(
+                WorkerEvtEnd | WorkerEvtToggle | WorkerEvtDisconnect, FuriWaitForever);
+
             if(flags & WorkerEvtEnd) {
                 break;
             } else if(flags & WorkerEvtToggle) { // Start executing script
@@ -548,6 +579,7 @@ static int32_t bad_usb_worker(void* context) {
                 bad_usb->buf_len = 0;
                 bad_usb->st.line_cur = 0;
                 bad_usb->defdelay = 0;
+                bad_usb->stringdelay = 0;
                 bad_usb->repeat_cnt = 0;
                 bad_usb->file_end = false;
                 storage_file_seek(script_file, 0, true);
@@ -558,11 +590,9 @@ static int32_t bad_usb_worker(void* context) {
             bad_usb->st.state = worker_state;
 
         } else if(worker_state == BadUsbStateWillRun) { // State: start on connection
-            uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd | WorkerEvtConnect | WorkerEvtToggle,
-                FuriFlagWaitAny,
-                FuriWaitForever);
-            furi_check((flags & FuriFlagError) == 0);
+            uint32_t flags = bad_usb_flags_get(
+                WorkerEvtEnd | WorkerEvtConnect | WorkerEvtToggle, FuriWaitForever);
+
             if(flags & WorkerEvtEnd) {
                 break;
             } else if(flags & WorkerEvtConnect) { // Start executing script
@@ -571,12 +601,22 @@ static int32_t bad_usb_worker(void* context) {
                 bad_usb->buf_len = 0;
                 bad_usb->st.line_cur = 0;
                 bad_usb->defdelay = 0;
+                bad_usb->stringdelay = 0;
                 bad_usb->repeat_cnt = 0;
                 bad_usb->file_end = false;
                 storage_file_seek(script_file, 0, true);
                 // extra time for PC to recognize Flipper as keyboard
-                furi_thread_flags_wait(0, FuriFlagWaitAny, 1500);
-                worker_state = BadUsbStateRunning;
+                flags = furi_thread_flags_wait(
+                    WorkerEvtEnd | WorkerEvtDisconnect | WorkerEvtToggle,
+                    FuriFlagWaitAny | FuriFlagNoClear,
+                    1500);
+                if(flags == (unsigned)FuriFlagErrorTimeout) {
+                    // If nothing happened - start script execution
+                    worker_state = BadUsbStateRunning;
+                } else if(flags & WorkerEvtToggle) {
+                    worker_state = BadUsbStateIdle;
+                    furi_thread_flags_clear(WorkerEvtToggle);
+                }
             } else if(flags & WorkerEvtToggle) { // Cancel scheduled execution
                 worker_state = BadUsbStateNotConnected;
             }
@@ -586,6 +626,7 @@ static int32_t bad_usb_worker(void* context) {
             uint16_t delay_cur = (delay_val > 1000) ? (1000) : (delay_val);
             uint32_t flags = furi_thread_flags_wait(
                 WorkerEvtEnd | WorkerEvtToggle | WorkerEvtDisconnect, FuriFlagWaitAny, delay_cur);
+
             delay_val -= delay_cur;
             if(!(flags & FuriFlagError)) {
                 if(flags & WorkerEvtEnd) {
@@ -629,9 +670,9 @@ static int32_t bad_usb_worker(void* context) {
         } else if(
             (worker_state == BadUsbStateFileError) ||
             (worker_state == BadUsbStateScriptError)) { // State: error
-            uint32_t flags = furi_thread_flags_wait(
-                WorkerEvtEnd, FuriFlagWaitAny, FuriWaitForever); // Waiting for exit command
-            furi_check((flags & FuriFlagError) == 0);
+            uint32_t flags =
+                bad_usb_flags_get(WorkerEvtEnd, FuriWaitForever); // Waiting for exit command
+
             if(flags & WorkerEvtEnd) {
                 break;
             }

applications/main/bad_usb/scenes/bad_usb_scene_file_select.c

@@ -22,7 +22,6 @@ static bool bad_usb_file_select(BadUsbApp* bad_usb) {
 void bad_usb_scene_file_select_on_enter(void* context) {
     BadUsbApp* bad_usb = context;
 
-    furi_hal_usb_disable();
     if(bad_usb->bad_usb_script) {
         bad_usb_script_close(bad_usb->bad_usb_script);
         bad_usb->bad_usb_script = NULL;
@@ -34,7 +33,6 @@ void bad_usb_scene_file_select_on_enter(void* context) {
 
         scene_manager_next_scene(bad_usb->scene_manager, BadUsbSceneWork);
     } else {
-        furi_hal_usb_enable();
         view_dispatcher_stop(bad_usb->view_dispatcher);
     }
 }

applications/main/bad_usb/scenes/bad_usb_scene_work.c

@@ -16,7 +16,9 @@ bool bad_usb_scene_work_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == InputKeyLeft) {
-            scene_manager_next_scene(app->scene_manager, BadUsbSceneConfig);
+            if(bad_usb_is_idle_state(app->bad_usb_view)) {
+                scene_manager_next_scene(app->scene_manager, BadUsbSceneConfig);
+            }
             consumed = true;
         } else if(event.event == InputKeyOk) {
             bad_usb_script_toggle(app->bad_usb_script);

applications/main/bad_usb/views/bad_usb_view.c

@@ -48,17 +48,13 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
     if((model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone) ||
        (model->state.state == BadUsbStateNotConnected)) {
         elements_button_center(canvas, "Run");
+        elements_button_left(canvas, "Config");
     } else if((model->state.state == BadUsbStateRunning) || (model->state.state == BadUsbStateDelay)) {
         elements_button_center(canvas, "Stop");
     } else if(model->state.state == BadUsbStateWillRun) {
         elements_button_center(canvas, "Cancel");
     }
 
-    if((model->state.state == BadUsbStateNotConnected) ||
-       (model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone)) {
-        elements_button_left(canvas, "Config");
-    }
-
     if(model->state.state == BadUsbStateNotConnected) {
         canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
         canvas_set_font(canvas, FontPrimary);
@@ -203,6 +199,7 @@ void bad_usb_set_layout(BadUsb* bad_usb, const char* layout) {
         { strlcpy(model->layout, layout, MAX_NAME_LEN); },
         true);
 }
+
 void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
     furi_assert(st);
     with_view_model(
@@ -214,3 +211,19 @@ void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st) {
         },
         true);
 }
+
+bool bad_usb_is_idle_state(BadUsb* bad_usb) {
+    bool is_idle = false;
+    with_view_model(
+        bad_usb->view,
+        BadUsbModel * model,
+        {
+            if((model->state.state == BadUsbStateIdle) ||
+               (model->state.state == BadUsbStateDone) ||
+               (model->state.state == BadUsbStateNotConnected)) {
+                is_idle = true;
+            }
+        },
+        false);
+    return is_idle;
+}

applications/main/bad_usb/views/bad_usb_view.h

@@ -19,3 +19,5 @@ void bad_usb_set_file_name(BadUsb* bad_usb, const char* name);
 void bad_usb_set_layout(BadUsb* bad_usb, const char* layout);
 
 void bad_usb_set_state(BadUsb* bad_usb, BadUsbState* st);
+
+bool bad_usb_is_idle_state(BadUsb* bad_usb);

applications/main/infrared/infrared.c

@@ -3,6 +3,8 @@
 #include <string.h>
 #include <dolphin/dolphin.h>
 
+#define INFRARED_TX_MIN_INTERVAL_MS 50U
+
 static const NotificationSequence* infrared_notification_sequences[] = {
     &sequence_success,
     &sequence_set_only_green_255,
@@ -148,6 +150,12 @@ static Infrared* infrared_alloc() {
     view_dispatcher_add_view(
         view_dispatcher, InfraredViewTextInput, text_input_get_view(infrared->text_input));
 
+    infrared->variable_item_list = variable_item_list_alloc();
+    view_dispatcher_add_view(
+        infrared->view_dispatcher,
+        InfraredViewVariableItemList,
+        variable_item_list_get_view(infrared->variable_item_list));
+
     infrared->dialog_ex = dialog_ex_alloc();
     view_dispatcher_add_view(
         view_dispatcher, InfraredViewDialogEx, dialog_ex_get_view(infrared->dialog_ex));
@@ -195,6 +203,9 @@ static void infrared_free(Infrared* infrared) {
     view_dispatcher_remove_view(view_dispatcher, InfraredViewTextInput);
     text_input_free(infrared->text_input);
 
+    view_dispatcher_remove_view(infrared->view_dispatcher, InfraredViewVariableItemList);
+    variable_item_list_free(infrared->variable_item_list);
+
     view_dispatcher_remove_view(view_dispatcher, InfraredViewDialogEx);
     dialog_ex_free(infrared->dialog_ex);
 
@@ -299,10 +310,13 @@ bool infrared_rename_current_remote(Infrared* infrared, const char* name) {
 
 void infrared_tx_start_signal(Infrared* infrared, InfraredSignal* signal) {
     if(infrared->app_state.is_transmitting) {
-        FURI_LOG_D(INFRARED_LOG_TAG, "Transmitter is already active");
         return;
-    } else {
-        infrared->app_state.is_transmitting = true;
+    }
+
+    const uint32_t time_elapsed = furi_get_tick() - infrared->app_state.last_transmit_time;
+
+    if(time_elapsed < INFRARED_TX_MIN_INTERVAL_MS) {
+        return;
     }
 
     if(infrared_signal_is_raw(signal)) {
@@ -319,6 +333,8 @@ void infrared_tx_start_signal(Infrared* infrared, InfraredSignal* signal) {
     infrared_worker_tx_set_get_signal_callback(
         infrared->worker, infrared_worker_tx_get_signal_steady_callback, infrared);
     infrared_worker_tx_start(infrared->worker);
+
+    infrared->app_state.is_transmitting = true;
 }
 
 void infrared_tx_start_button_index(Infrared* infrared, size_t button_index) {
@@ -328,26 +344,24 @@ void infrared_tx_start_button_index(Infrared* infrared, size_t button_index) {
     InfraredSignal* signal = infrared_remote_button_get_signal(button);
 
     infrared_tx_start_signal(infrared, signal);
-    infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStartSend);
 }
 
 void infrared_tx_start_received(Infrared* infrared) {
     infrared_tx_start_signal(infrared, infrared->received_signal);
-    infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStartSend);
 }
 
 void infrared_tx_stop(Infrared* infrared) {
     if(!infrared->app_state.is_transmitting) {
-        FURI_LOG_D(INFRARED_LOG_TAG, "Transmitter is already stopped");
         return;
-    } else {
-        infrared->app_state.is_transmitting = false;
     }
 
     infrared_worker_tx_stop(infrared->worker);
     infrared_worker_tx_set_get_signal_callback(infrared->worker, NULL, NULL);
 
     infrared_play_notification_message(infrared, InfraredNotificationMessageBlinkStop);
+
+    infrared->app_state.is_transmitting = false;
+    infrared->app_state.last_transmit_time = furi_get_tick();
 }
 
 void infrared_text_store_set(Infrared* infrared, uint32_t bank, const char* text, ...) {

applications/main/infrared/infrared_i.h

@@ -10,6 +10,7 @@
 #include <gui/modules/popup.h>
 #include <gui/modules/loading.h>
 #include <gui/modules/submenu.h>
+#include <gui/modules/variable_item_list.h>
 #include <gui/modules/dialog_ex.h>
 #include <gui/modules/text_input.h>
 #include <gui/modules/button_menu.h>
@@ -69,6 +70,7 @@ typedef struct {
     InfraredEditTarget edit_target : 8;
     InfraredEditMode edit_mode : 8;
     int32_t current_button_index;
+    uint32_t last_transmit_time;
 } InfraredAppState;
 
 struct Infrared {
@@ -86,6 +88,7 @@ struct Infrared {
 
     Submenu* submenu;
     TextInput* text_input;
+    VariableItemList* variable_item_list;
     DialogEx* dialog_ex;
     ButtonMenu* button_menu;
     Popup* popup;
@@ -107,6 +110,7 @@ struct Infrared {
 typedef enum {
     InfraredViewSubmenu,
     InfraredViewTextInput,
+    InfraredViewVariableItemList,
     InfraredViewDialogEx,
     InfraredViewButtonMenu,
     InfraredViewPopup,

applications/main/infrared/scenes/infrared_scene_config.h

@@ -21,4 +21,5 @@ ADD_SCENE(infrared, universal_audio, UniversalAudio)
 ADD_SCENE(infrared, universal_projector, UniversalProjector)
 ADD_SCENE(infrared, debug, Debug)
 ADD_SCENE(infrared, error_databases, ErrorDatabases)
+ADD_SCENE(infrared, debug_settings, DebugSettings)
 ADD_SCENE(infrared, rpc, Rpc)

applications/main/infrared/scenes/infrared_scene_debug_settings.c

@@ -0,0 +1,59 @@
+#include "../infrared_i.h"
+#include <furi_hal_infrared.h>
+
+uint8_t value_index_ir;
+
+#define DEB_PINS_COUNT (sizeof(infrared_debug_cfg_variables_text) / sizeof(char* const))
+const char* const infrared_debug_cfg_variables_text[] = {
+    "Internal",
+    "2 (A7)",
+};
+
+static void infrared_scene_debug_settings_changed(VariableItem* item) {
+    Infrared* infrared = variable_item_get_context(item);
+    value_index_ir = variable_item_get_current_value_index(item);
+    UNUSED(infrared);
+
+    variable_item_set_current_value_text(item, infrared_debug_cfg_variables_text[value_index_ir]);
+
+    furi_hal_infrared_set_debug_out(value_index_ir);
+}
+static void infrared_debug_settings_start_var_list_enter_callback(void* context, uint32_t index) {
+    Infrared* infrared = context;
+    view_dispatcher_send_custom_event(infrared->view_dispatcher, index);
+}
+
+void infrared_scene_debug_settings_on_enter(void* context) {
+    Infrared* infrared = context;
+
+    VariableItemList* variable_item_list = infrared->variable_item_list;
+
+    value_index_ir = furi_hal_infrared_get_debug_out_status();
+    VariableItem* item = variable_item_list_add(
+        variable_item_list,
+        "Send signal to",
+        DEB_PINS_COUNT,
+        infrared_scene_debug_settings_changed,
+        infrared);
+
+    variable_item_list_set_enter_callback(
+        variable_item_list, infrared_debug_settings_start_var_list_enter_callback, infrared);
+
+    variable_item_set_current_value_index(item, value_index_ir);
+    variable_item_set_current_value_text(item, infrared_debug_cfg_variables_text[value_index_ir]);
+
+    view_dispatcher_switch_to_view(infrared->view_dispatcher, InfraredViewVariableItemList);
+}
+
+bool infrared_scene_debug_settings_on_event(void* context, SceneManagerEvent event) {
+    Infrared* infrared = context;
+    UNUSED(infrared);
+    UNUSED(event);
+
+    return false;
+}
+
+void infrared_scene_debug_settings_on_exit(void* context) {
+    Infrared* infrared = context;
+    variable_item_list_reset(infrared->variable_item_list);
+}

applications/main/infrared/scenes/infrared_scene_start.c

@@ -5,7 +5,8 @@ enum SubmenuIndex {
     SubmenuIndexLearnNewRemote,
     SubmenuIndexLearnNewRemoteRaw,
     SubmenuIndexSavedRemotes,
-    SubmenuIndexDebug
+    SubmenuIndexDebug,
+    SubmenuIndexDebugSettings
 };
 
 static void infrared_scene_start_submenu_callback(void* context, uint32_t index) {
@@ -45,7 +46,17 @@ void infrared_scene_start_on_enter(void* context) {
             infrared_scene_start_submenu_callback,
             infrared);
         submenu_add_item(
-            submenu, "Debug", SubmenuIndexDebug, infrared_scene_start_submenu_callback, infrared);
+            submenu,
+            "Debug RX",
+            SubmenuIndexDebug,
+            infrared_scene_start_submenu_callback,
+            infrared);
+        submenu_add_item(
+            submenu,
+            "Debug Settings",
+            SubmenuIndexDebugSettings,
+            infrared_scene_start_submenu_callback,
+            infrared);
     }
 
     const uint32_t submenu_index =
@@ -86,6 +97,9 @@ bool infrared_scene_start_on_event(void* context, SceneManagerEvent event) {
         } else if(submenu_index == SubmenuIndexDebug) {
             scene_manager_next_scene(scene_manager, InfraredSceneDebug);
             consumed = true;
+        } else if(submenu_index == SubmenuIndexDebugSettings) {
+            scene_manager_next_scene(scene_manager, InfraredSceneDebugSettings);
+            consumed = true;
         }
     }
 

applications/main/infrared/views/infrared_progress_view.h

@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 
-/** Anonumous instance */
+/** Anonymous instance */
 typedef struct InfraredProgressView InfraredProgressView;
 
 /** Callback for back button handling */

applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c

@@ -14,7 +14,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) {
     T55xxTiming* t55xxtiming = malloc(sizeof(T55xxTiming));
     Popup* popup = app->popup;
     char curr_buf[32] = {};
-    //TODO: use .txt file in resourses for passwords.
+    //TODO: use .txt file in resources for passwords.
     const uint32_t default_passwords[] = {
         0x51243648, 0x000D8787, 0x19920427, 0x50524F58, 0xF9DCEBA0, 0x65857569, 0x05D73B9F,
         0x89A69E60, 0x314159E0, 0xAA55BBBB, 0xA5B4C3D2, 0x1C0B5848, 0x00434343, 0x444E4752,

applications/main/nfc/helpers/nfc_emv_parser.h

@@ -9,7 +9,7 @@
  * @param aid - AID number array
  * @param aid_len - AID length
  * @param aid_name - string to keep AID name
- * @return - true if AID found, false otherwies
+ * @return - true if AID found, false otherwise
  */
 bool nfc_emv_parser_get_aid_name(
     Storage* storage,
@@ -21,7 +21,7 @@ bool nfc_emv_parser_get_aid_name(
  * @param storage Storage instance
  * @param country_code - ISO 3166 country code
  * @param country_name - string to keep country name
- * @return - true if country found, false otherwies
+ * @return - true if country found, false otherwise
  */
 bool nfc_emv_parser_get_country_name(
     Storage* storage,
@@ -32,7 +32,7 @@ bool nfc_emv_parser_get_country_name(
  * @param storage Storage instance
  * @param currency_code - ISO 3166 currency code
  * @param currency_name - string to keep currency name
- * @return - true if currency found, false otherwies
+ * @return - true if currency found, false otherwise
  */
 bool nfc_emv_parser_get_currency_name(
     Storage* storage,

applications/main/nfc/nfc_cli.c

@@ -32,7 +32,7 @@ static void nfc_cli_detect(Cli* cli, FuriString* args) {
     while(!cmd_exit) {
         cmd_exit |= cli_cmd_interrupt_received(cli);
         if(furi_hal_nfc_detect(&dev_data, 400)) {
-            printf("found: %s ", nfc_get_dev_type(dev_data.type));
+            printf("Found: %s ", nfc_get_dev_type(dev_data.type));
             printf("UID length: %d, UID:", dev_data.uid_len);
             for(size_t i = 0; i < dev_data.uid_len; i++) {
                 printf("%02X", dev_data.uid[i]);

applications/main/nfc/scenes/nfc_scene_config.h

@@ -29,6 +29,7 @@ ADD_SCENE(nfc, mf_desfire_menu, MfDesfireMenu)
 ADD_SCENE(nfc, mf_desfire_data, MfDesfireData)
 ADD_SCENE(nfc, mf_desfire_app, MfDesfireApp)
 ADD_SCENE(nfc, mf_classic_read_success, MfClassicReadSuccess)
+ADD_SCENE(nfc, mf_classic_data, MfClassicData)
 ADD_SCENE(nfc, mf_classic_menu, MfClassicMenu)
 ADD_SCENE(nfc, mf_classic_emulate, MfClassicEmulate)
 ADD_SCENE(nfc, mf_classic_keys, MfClassicKeys)

applications/main/nfc/scenes/nfc_scene_mf_classic_data.c

@@ -0,0 +1,106 @@
+#include "../nfc_i.h"
+
+void nfc_scene_mf_classic_data_on_enter(void* context) {
+    Nfc* nfc = context;
+    MfClassicType type = nfc->dev->dev_data.mf_classic_data.type;
+    MfClassicData* data = &nfc->dev->dev_data.mf_classic_data;
+    TextBox* text_box = nfc->text_box;
+
+    text_box_set_font(text_box, TextBoxFontHex);
+
+    int card_blocks = 0;
+    if(type == MfClassicType1k) {
+        card_blocks = MF_CLASSIC_1K_TOTAL_SECTORS_NUM * 4;
+    } else if(type == MfClassicType4k) {
+        // 16 sectors of 4 blocks each plus 8 sectors of 16 blocks each
+        card_blocks = MF_CLASSIC_1K_TOTAL_SECTORS_NUM * 4 + 8 * 16;
+    } else if(type == MfClassicTypeMini) {
+        card_blocks = MF_MINI_TOTAL_SECTORS_NUM * 4;
+    }
+
+    int bytes_written = 0;
+    for(int block_num = 0; block_num < card_blocks; block_num++) {
+        bool is_sec_trailer = mf_classic_is_sector_trailer(block_num);
+        if(is_sec_trailer) {
+            uint8_t sector_num = mf_classic_get_sector_by_block(block_num);
+            MfClassicSectorTrailer* sec_tr =
+                mf_classic_get_sector_trailer_by_sector(data, sector_num);
+            // Key A
+            for(size_t i = 0; i < sizeof(sec_tr->key_a); i += 2) {
+                if((bytes_written % 8 == 0) && (bytes_written != 0)) {
+                    furi_string_push_back(nfc->text_box_store, '\n');
+                }
+                if(mf_classic_is_key_found(data, sector_num, MfClassicKeyA)) {
+                    furi_string_cat_printf(
+                        nfc->text_box_store, "%02X%02X ", sec_tr->key_a[i], sec_tr->key_a[i + 1]);
+                } else {
+                    furi_string_cat_printf(nfc->text_box_store, "???? ");
+                }
+                bytes_written += 2;
+            }
+            // Access bytes
+            for(size_t i = 0; i < MF_CLASSIC_ACCESS_BYTES_SIZE; i += 2) {
+                if((bytes_written % 8 == 0) && (bytes_written != 0)) {
+                    furi_string_push_back(nfc->text_box_store, '\n');
+                }
+                if(mf_classic_is_block_read(data, block_num)) {
+                    furi_string_cat_printf(
+                        nfc->text_box_store,
+                        "%02X%02X ",
+                        sec_tr->access_bits[i],
+                        sec_tr->access_bits[i + 1]);
+                } else {
+                    furi_string_cat_printf(nfc->text_box_store, "???? ");
+                }
+                bytes_written += 2;
+            }
+            // Key B
+            for(size_t i = 0; i < sizeof(sec_tr->key_b); i += 2) {
+                if((bytes_written % 8 == 0) && (bytes_written != 0)) {
+                    furi_string_push_back(nfc->text_box_store, '\n');
+                }
+                if(mf_classic_is_key_found(data, sector_num, MfClassicKeyB)) {
+                    furi_string_cat_printf(
+                        nfc->text_box_store, "%02X%02X ", sec_tr->key_b[i], sec_tr->key_b[i + 1]);
+                } else {
+                    furi_string_cat_printf(nfc->text_box_store, "???? ");
+                }
+                bytes_written += 2;
+            }
+        } else {
+            // Write data block
+            for(size_t i = 0; i < MF_CLASSIC_BLOCK_SIZE; i += 2) {
+                if((bytes_written % 8 == 0) && (bytes_written != 0)) {
+                    furi_string_push_back(nfc->text_box_store, '\n');
+                }
+                if(mf_classic_is_block_read(data, block_num)) {
+                    furi_string_cat_printf(
+                        nfc->text_box_store,
+                        "%02X%02X ",
+                        data->block[block_num].value[i],
+                        data->block[block_num].value[i + 1]);
+                } else {
+                    furi_string_cat_printf(nfc->text_box_store, "???? ");
+                }
+                bytes_written += 2;
+            }
+        }
+    }
+    text_box_set_text(text_box, furi_string_get_cstr(nfc->text_box_store));
+
+    view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewTextBox);
+}
+
+bool nfc_scene_mf_classic_data_on_event(void* context, SceneManagerEvent event) {
+    UNUSED(context);
+    UNUSED(event);
+    return false;
+}
+
+void nfc_scene_mf_classic_data_on_exit(void* context) {
+    Nfc* nfc = context;
+
+    // Clean view
+    text_box_reset(nfc->text_box);
+    furi_string_reset(nfc->text_box_store);
+}

applications/main/nfc/scenes/nfc_scene_nfc_data_info.c

@@ -14,7 +14,8 @@ void nfc_scene_nfc_data_info_on_enter(void* context) {
     NfcDeviceData* dev_data = &nfc->dev->dev_data;
     NfcProtocol protocol = dev_data->protocol;
     uint8_t text_scroll_height = 0;
-    if((protocol == NfcDeviceProtocolMifareDesfire) || (protocol == NfcDeviceProtocolMifareUl)) {
+    if((protocol == NfcDeviceProtocolMifareDesfire) || (protocol == NfcDeviceProtocolMifareUl) ||
+       (protocol == NfcDeviceProtocolMifareClassic)) {
         widget_add_button_element(
             widget, GuiButtonTypeRight, "More", nfc_scene_nfc_data_info_widget_callback, nfc);
         text_scroll_height = 52;
@@ -136,6 +137,9 @@ bool nfc_scene_nfc_data_info_on_event(void* context, SceneManagerEvent event) {
             } else if(protocol == NfcDeviceProtocolMifareUl) {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneMfUltralightData);
                 consumed = true;
+            } else if(protocol == NfcDeviceProtocolMifareClassic) {
+                scene_manager_next_scene(nfc->scene_manager, NfcSceneMfClassicData);
+                consumed = true;
             }
         }
     }

applications/main/nfc/scenes/nfc_scene_read_card_success.c

@@ -46,6 +46,9 @@ bool nfc_scene_read_card_success_on_event(void* context, SceneManagerEvent event
         if(event.event == GuiButtonTypeLeft) {
             consumed = scene_manager_previous_scene(nfc->scene_manager);
         }
+    } else if(event.type == SceneManagerEventTypeBack) {
+        consumed =
+            scene_manager_search_and_switch_to_previous_scene(nfc->scene_manager, NfcSceneStart);
     }
     return consumed;
 }

applications/main/nfc/scenes/nfc_scene_saved_menu.c

@@ -151,6 +151,8 @@ bool nfc_scene_saved_menu_on_event(void* context, SceneManagerEvent event) {
                 application_info_present = nfc_supported_card_verify_and_parse(dev_data);
             }
 
+            FURI_LOG_I("nfc", "application_info_present: %d", application_info_present);
+
             if(application_info_present) {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneDeviceInfo);
             } else {

applications/main/subghz/helpers/subghz_chat.c

@@ -9,7 +9,7 @@ struct SubGhzChatWorker {
     SubGhzTxRxWorker* subghz_txrx;
 
     volatile bool worker_running;
-    volatile bool worker_stoping;
+    volatile bool worker_stopping;
     FuriMessageQueue* event_queue;
     uint32_t last_time_rx_data;
 

applications/main/subghz/helpers/subghz_custom_event.h

@@ -8,11 +8,14 @@ typedef enum {
     //SubmenuIndex
     SubmenuIndexFaacSLH_433,
     SubmenuIndexFaacSLH_868,
-    SubmenuIndexBFT,
+    SubmenuIndexBFTClone,
+    SubmenuIndexBFTMitto,
+    SubmenuIndexSomfyTelis,
     SubmenuIndexPricenton,
     SubmenuIndexNiceFlo12bit,
     SubmenuIndexNiceFlo24bit,
     SubmenuIndexNiceFlorS_433_92,
+    SubmenuIndexNiceOne_433_92,
     SubmenuIndexNiceSmilo_433_92,
     SubmenuIndexCAME12bit,
     SubmenuIndexCAME24bit,
@@ -64,6 +67,7 @@ typedef enum {
     SubGhzCustomEventViewReceiverBack,
     SubGhzCustomEventViewReceiverOffDisplay,
     SubGhzCustomEventViewReceiverUnlock,
+    SubGhzCustomEventViewReceiverDeleteItem,
 
     SubGhzCustomEventViewReadRAWBack,
     SubGhzCustomEventViewReadRAWIDLE,

applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c

@@ -117,15 +117,15 @@ static int32_t subghz_frequency_analyzer_worker_thread(void* context) {
 
         // First stage: coarse scan
         for(size_t i = 0; i < subghz_setting_get_frequency_count(instance->setting); i++) {
-            uint32_t current_frequnecy = subghz_setting_get_frequency(instance->setting, i);
-            if(furi_hal_subghz_is_frequency_valid(current_frequnecy) &&
-               (current_frequnecy != 467750000) &&
+            uint32_t current_frequency = subghz_setting_get_frequency(instance->setting, i);
+            if(furi_hal_subghz_is_frequency_valid(current_frequency) &&
+               (current_frequency != 467750000) &&
                !((furi_hal_subghz.radio_type == SubGhzRadioExternal) &&
-                 (current_frequnecy >= 311900000 && current_frequnecy <= 312200000))) {
+                 (current_frequency >= 311900000 && current_frequency <= 312200000))) {
                 furi_hal_spi_acquire(furi_hal_subghz.spi_bus_handle);
                 cc1101_switch_to_idle(furi_hal_subghz.spi_bus_handle);
                 frequency =
-                    cc1101_set_frequency(furi_hal_subghz.spi_bus_handle, current_frequnecy);
+                    cc1101_set_frequency(furi_hal_subghz.spi_bus_handle, current_frequency);
 
                 cc1101_calibrate(furi_hal_subghz.spi_bus_handle);
                 do {
@@ -330,4 +330,4 @@ void subghz_frequency_analyzer_worker_set_trigger_level(
 
 float subghz_frequency_analyzer_worker_get_trigger_level(SubGhzFrequencyAnalyzerWorker* instance) {
     return instance->trigger_level;
-}
+}

applications/main/subghz/helpers/subghz_types.h

@@ -23,7 +23,7 @@ typedef enum {
 /** SubGhzHopperState state */
 typedef enum {
     SubGhzHopperStateOFF,
-    SubGhzHopperStateRunnig,
+    SubGhzHopperStateRunning,
     SubGhzHopperStatePause,
     SubGhzHopperStateRSSITimeOut,
 } SubGhzHopperState;

applications/main/subghz/scenes/subghz_scene_ext_module_settings.c

@@ -1,8 +1,9 @@
 #include "../subghz_i.h"
 #include "../helpers/subghz_custom_event.h"
 
-uint8_t value_index;
-uint8_t value_index2;
+uint8_t value_index_exm;
+uint8_t value_index_dpin;
+uint8_t value_index_cnt;
 
 #define EXT_MODULES_COUNT (sizeof(radio_modules_variables_text) / sizeof(char* const))
 const char* const radio_modules_variables_text[] = {
@@ -16,12 +17,22 @@ const char* const debug_pin_text[DEBUG_P_COUNT] = {
     "17(1W)",
 };
 
+#define DEBUG_COUNTER_COUNT 6
+const char* const debug_counter_text[DEBUG_COUNTER_COUNT] = {
+    "+1",
+    "+2",
+    "+3",
+    "+4",
+    "+5",
+    "+10",
+};
+
 static void subghz_scene_ext_module_changed(VariableItem* item) {
     SubGhz* subghz = variable_item_get_context(item);
-    value_index = variable_item_get_current_value_index(item);
+    value_index_exm = variable_item_get_current_value_index(item);
     UNUSED(subghz);
 
-    variable_item_set_current_value_text(item, radio_modules_variables_text[value_index]);
+    variable_item_set_current_value_text(item, radio_modules_variables_text[value_index_exm]);
 }
 static void subghz_ext_module_start_var_list_enter_callback(void* context, uint32_t index) {
     SubGhz* subghz = context;
@@ -37,20 +48,49 @@ static void subghz_scene_receiver_config_set_debug_pin(VariableItem* item) {
     subghz->txrx->debug_pin_state = index == 1;
 }
 
+static void subghz_scene_receiver_config_set_debug_counter(VariableItem* item) {
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, debug_counter_text[index]);
+
+    switch(index) {
+    case 0:
+        furi_hal_subghz_set_rolling_counter_mult(1);
+        break;
+    case 1:
+        furi_hal_subghz_set_rolling_counter_mult(2);
+        break;
+    case 2:
+        furi_hal_subghz_set_rolling_counter_mult(3);
+        break;
+    case 3:
+        furi_hal_subghz_set_rolling_counter_mult(4);
+        break;
+    case 4:
+        furi_hal_subghz_set_rolling_counter_mult(5);
+        break;
+    case 5:
+        furi_hal_subghz_set_rolling_counter_mult(10);
+        break;
+    default:
+        break;
+    }
+}
+
 void subghz_scene_ext_module_settings_on_enter(void* context) {
     SubGhz* subghz = context;
 
     VariableItemList* variable_item_list = subghz->variable_item_list;
 
-    value_index = furi_hal_subghz.radio_type;
+    value_index_exm = furi_hal_subghz.radio_type;
     VariableItem* item = variable_item_list_add(
         variable_item_list, "Module", EXT_MODULES_COUNT, subghz_scene_ext_module_changed, subghz);
 
     variable_item_list_set_enter_callback(
         variable_item_list, subghz_ext_module_start_var_list_enter_callback, subghz);
 
-    variable_item_set_current_value_index(item, value_index);
-    variable_item_set_current_value_text(item, radio_modules_variables_text[value_index]);
+    variable_item_set_current_value_index(item, value_index_exm);
+    variable_item_set_current_value_text(item, radio_modules_variables_text[value_index_exm]);
 
     if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDebug)) {
         item = variable_item_list_add(
@@ -59,9 +99,40 @@ void subghz_scene_ext_module_settings_on_enter(void* context) {
             DEBUG_P_COUNT,
             subghz_scene_receiver_config_set_debug_pin,
             subghz);
-        value_index2 = subghz->txrx->debug_pin_state;
-        variable_item_set_current_value_index(item, value_index2);
-        variable_item_set_current_value_text(item, debug_pin_text[value_index2]);
+        value_index_dpin = subghz->txrx->debug_pin_state;
+        variable_item_set_current_value_index(item, value_index_dpin);
+        variable_item_set_current_value_text(item, debug_pin_text[value_index_dpin]);
+
+        item = variable_item_list_add(
+            subghz->variable_item_list,
+            "Counter Mult:",
+            DEBUG_COUNTER_COUNT,
+            subghz_scene_receiver_config_set_debug_counter,
+            subghz);
+        switch(furi_hal_subghz_get_rolling_counter_mult()) {
+        case 1:
+            value_index_cnt = 0;
+            break;
+        case 2:
+            value_index_cnt = 1;
+            break;
+        case 3:
+            value_index_cnt = 2;
+            break;
+        case 4:
+            value_index_cnt = 3;
+            break;
+        case 5:
+            value_index_cnt = 4;
+            break;
+        case 10:
+            value_index_cnt = 5;
+            break;
+        default:
+            break;
+        }
+        variable_item_set_current_value_index(item, value_index_cnt);
+        variable_item_set_current_value_text(item, debug_counter_text[value_index_cnt]);
     }
 
     view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdVariableItemList);
@@ -73,12 +144,12 @@ bool subghz_scene_ext_module_settings_on_event(void* context, SceneManagerEvent
     UNUSED(event);
 
     // Set selected radio module
-    furi_hal_subghz_set_radio_type(value_index);
+    furi_hal_subghz_set_radio_type(value_index_exm);
 
     // Check if module is present, if no -> show error
     if(!furi_hal_subghz_check_radio()) {
-        value_index = 0;
-        furi_hal_subghz_set_radio_type(value_index);
+        value_index_exm = 0;
+        furi_hal_subghz_set_radio_type(value_index_exm);
         furi_string_set(subghz->error_str, "Please connect\nexternal radio");
         scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowErrorSub);
     }

applications/main/subghz/scenes/subghz_scene_read_raw.c

@@ -368,7 +368,7 @@ bool subghz_scene_read_raw_on_event(void* context, SceneManagerEvent event) {
 
             float rssi = furi_hal_subghz_get_rssi();
 
-            if(float_is_equal(subghz->txrx->raw_threshold_rssi, SUBGHZ_RAW_TRESHOLD_MIN)) {
+            if(float_is_equal(subghz->txrx->raw_threshold_rssi, SUBGHZ_RAW_THRESHOLD_MIN)) {
                 subghz_read_raw_add_data_rssi(subghz->subghz_read_raw, rssi, true);
                 subghz_protocol_raw_save_to_file_pause(
                     (SubGhzProtocolDecoderRAW*)subghz->txrx->decoder_result, false);
@@ -421,4 +421,4 @@ void subghz_scene_read_raw_on_exit(void* context) {
 
     //filter restoration
     subghz_receiver_set_filter(subghz->txrx->receiver, subghz->txrx->filter);
-}
+}

applications/main/subghz/scenes/subghz_scene_receiver.c

@@ -204,6 +204,16 @@ bool subghz_scene_receiver_on_event(void* context, SceneManagerEvent event) {
             DOLPHIN_DEED(DolphinDeedSubGhzReceiverInfo);
             consumed = true;
             break;
+        case SubGhzCustomEventViewReceiverDeleteItem:
+            subghz->txrx->idx_menu_chosen =
+                subghz_view_receiver_get_idx_menu(subghz->subghz_receiver);
+
+            subghz_history_delete_item(subghz->txrx->history, subghz->txrx->idx_menu_chosen);
+            subghz_view_receiver_delete_element_callback(subghz->subghz_receiver);
+
+            subghz_scene_receiver_update_statusbar(subghz);
+            consumed = true;
+            break;
         case SubGhzCustomEventViewReceiverConfig:
             subghz->state_notifications = SubGhzNotificationStateIDLE;
             subghz->txrx->idx_menu_chosen =

applications/main/subghz/scenes/subghz_scene_receiver_config.c

@@ -8,11 +8,11 @@ enum SubGhzSettingIndex {
     SubGhzSettingIndexBinRAW,
     SubGhzSettingIndexSound,
     SubGhzSettingIndexLock,
-    SubGhzSettingIndexRAWThesholdRSSI,
+    SubGhzSettingIndexRAWThresholdRSSI,
 };
 
 #define RAW_THRESHOLD_RSSI_COUNT 11
-const char* const raw_theshold_rssi_text[RAW_THRESHOLD_RSSI_COUNT] = {
+const char* const raw_threshold_rssi_text[RAW_THRESHOLD_RSSI_COUNT] = {
     "-----",
     "-85.0",
     "-80.0",
@@ -26,7 +26,7 @@ const char* const raw_theshold_rssi_text[RAW_THRESHOLD_RSSI_COUNT] = {
     "-40.0",
 
 };
-const float raw_theshold_rssi_value[RAW_THRESHOLD_RSSI_COUNT] = {
+const float raw_threshold_rssi_value[RAW_THRESHOLD_RSSI_COUNT] = {
     -90.0f,
     -85.0f,
     -80.0f,
@@ -47,7 +47,7 @@ const char* const hopping_text[HOPPING_COUNT] = {
 };
 const uint32_t hopping_value[HOPPING_COUNT] = {
     SubGhzHopperStateOFF,
-    SubGhzHopperStateRunnig,
+    SubGhzHopperStateRunning,
 };
 
 #define SPEAKER_COUNT 2
@@ -213,8 +213,8 @@ static void subghz_scene_receiver_config_set_raw_threshold_rssi(VariableItem* it
     SubGhz* subghz = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
 
-    variable_item_set_current_value_text(item, raw_theshold_rssi_text[index]);
-    subghz->txrx->raw_threshold_rssi = raw_theshold_rssi_value[index];
+    variable_item_set_current_value_text(item, raw_threshold_rssi_text[index]);
+    subghz->txrx->raw_threshold_rssi = raw_threshold_rssi_value[index];
 }
 
 static void subghz_scene_receiver_config_var_list_enter_callback(void* context, uint32_t index) {
@@ -320,9 +320,9 @@ void subghz_scene_receiver_config_on_enter(void* context) {
             subghz_scene_receiver_config_set_raw_threshold_rssi,
             subghz);
         value_index = value_index_float(
-            subghz->txrx->raw_threshold_rssi, raw_theshold_rssi_value, RAW_THRESHOLD_RSSI_COUNT);
+            subghz->txrx->raw_threshold_rssi, raw_threshold_rssi_value, RAW_THRESHOLD_RSSI_COUNT);
         variable_item_set_current_value_index(item, value_index);
-        variable_item_set_current_value_text(item, raw_theshold_rssi_text[value_index]);
+        variable_item_set_current_value_text(item, raw_threshold_rssi_text[value_index]);
     }
     view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdVariableItemList);
 }

applications/main/subghz/scenes/subghz_scene_receiver_info.c

@@ -2,6 +2,9 @@
 #include "../helpers/subghz_custom_event.h"
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/star_line.h>
+#include <lib/subghz/protocols/alutech_at_4n.h>
+#include <lib/subghz/protocols/nice_flor_s.h>
+#include <lib/subghz/protocols/somfy_telis.h>
 
 void subghz_scene_receiver_info_callback(GuiButtonType result, InputType type, void* context) {
     furi_assert(context);
@@ -148,7 +151,7 @@ bool subghz_scene_receiver_info_on_event(void* context, SceneManagerEvent event)
                         subghz_rx(subghz, subghz->txrx->preset->frequency);
                     }
                     if(subghz->txrx->hopper_state == SubGhzHopperStatePause) {
-                        subghz->txrx->hopper_state = SubGhzHopperStateRunnig;
+                        subghz->txrx->hopper_state = SubGhzHopperStateRunning;
                     }
                     subghz->state_notifications = SubGhzNotificationStateRx;
                 } else {
@@ -175,7 +178,7 @@ bool subghz_scene_receiver_info_on_event(void* context, SceneManagerEvent event)
                     subghz_rx(subghz, subghz->txrx->preset->frequency);
                 }
                 if(subghz->txrx->hopper_state == SubGhzHopperStatePause) {
-                    subghz->txrx->hopper_state = SubGhzHopperStateRunnig;
+                    subghz->txrx->hopper_state = SubGhzHopperStateRunning;
                 }
                 subghz->state_notifications = SubGhzNotificationStateRx;
             }
@@ -233,6 +236,10 @@ void subghz_scene_receiver_info_on_exit(void* context) {
     widget_reset(subghz->widget);
     keeloq_reset_mfname();
     keeloq_reset_kl_type();
+    keeloq_reset_original_btn();
+    alutech_reset_original_btn();
+    nice_flors_reset_original_btn();
+    somfy_telis_reset_original_btn();
     star_line_reset_mfname();
     star_line_reset_kl_type();
 }

applications/main/subghz/scenes/subghz_scene_rpc.c

@@ -1,6 +1,9 @@
 #include "../subghz_i.h"
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/star_line.h>
+#include <lib/subghz/protocols/alutech_at_4n.h>
+#include <lib/subghz/protocols/nice_flor_s.h>
+#include <lib/subghz/protocols/somfy_telis.h>
 
 typedef enum {
     SubGhzRpcStateIdle,
@@ -110,6 +113,10 @@ void subghz_scene_rpc_on_exit(void* context) {
 
     keeloq_reset_mfname();
     keeloq_reset_kl_type();
+    keeloq_reset_original_btn();
+    alutech_reset_original_btn();
+    nice_flors_reset_original_btn();
+    somfy_telis_reset_original_btn();
     star_line_reset_mfname();
     star_line_reset_kl_type();
 }

applications/main/subghz/scenes/subghz_scene_set_seed_bft.c

@@ -14,7 +14,7 @@ void subghz_scene_set_seed_bft_on_enter(void* context) {
     SubGhz* subghz = context;
 
     // Setup view
-    // roguemaster don't steal!!!
+    // RogueMaster don't steal!!!
     ByteInput* byte_input = subghz->byte_input;
     byte_input_set_header_text(byte_input, "Enter SEED in hex");
     byte_input_set_result_callback(

applications/main/subghz/scenes/subghz_scene_set_seed_faac.c

@@ -65,7 +65,7 @@ bool subghz_scene_set_seed_faac_on_event(void* context, SceneManagerEvent event)
                     seed,
                     "FAAC_SLH",
                     subghz->txrx->preset);
-                // rogueemaster dont steal!
+                // RogueMaster dont steal!
                 uint8_t seed_data[sizeof(uint32_t)] = {0};
                 for(size_t i = 0; i < sizeof(uint32_t); i++) {
                     seed_data[sizeof(uint32_t) - i - 1] = (seed >> i * 8) & 0xFF;

applications/main/subghz/scenes/subghz_scene_set_type.c

@@ -79,10 +79,22 @@ void subghz_scene_set_type_on_enter(void* context) {
         SubmenuIndexFaacSLH_433,
         subghz_scene_set_type_submenu_callback,
         subghz);
+    submenu_add_item(
+        subghz->submenu,
+        "BFT [Manual] 433MHz",
+        SubmenuIndexBFTClone,
+        subghz_scene_set_type_submenu_callback,
+        subghz);
     submenu_add_item(
         subghz->submenu,
         "BFT Mitto 433MHz",
-        SubmenuIndexBFT,
+        SubmenuIndexBFTMitto,
+        subghz_scene_set_type_submenu_callback,
+        subghz);
+    submenu_add_item(
+        subghz->submenu,
+        "Somfy Telis 433MHz",
+        SubmenuIndexSomfyTelis,
         subghz_scene_set_type_submenu_callback,
         subghz);
     submenu_add_item(
@@ -115,6 +127,12 @@ void subghz_scene_set_type_on_enter(void* context) {
         SubmenuIndexNiceFlorS_433_92,
         subghz_scene_set_type_submenu_callback,
         subghz);
+    submenu_add_item(
+        subghz->submenu,
+        "Nice One 433MHz",
+        SubmenuIndexNiceOne_433_92,
+        subghz_scene_set_type_submenu_callback,
+        subghz);
     submenu_add_item(
         subghz->submenu,
         "CAME 12bit 433MHz",
@@ -230,7 +248,7 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
         case SubmenuIndexFaacSLH_433:
             scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetFixFaac);
             break;
-        case SubmenuIndexBFT:
+        case SubmenuIndexBFTClone:
             scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetFixBft);
             break;
         case SubmenuIndexPricenton:
@@ -306,6 +324,66 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 generated_protocol = true;
             }
             break;
+        case SubmenuIndexBFTMitto:
+            subghz->txrx->transmitter = subghz_transmitter_alloc_init(
+                subghz->txrx->environment, SUBGHZ_PROTOCOL_KEELOQ_NAME);
+            subghz_preset_init(subghz, "AM650", 433920000, NULL, 0);
+            if(subghz->txrx->transmitter) {
+                subghz_protocol_keeloq_bft_create_data(
+                    subghz_transmitter_get_protocol_instance(subghz->txrx->transmitter),
+                    subghz->txrx->fff_data,
+                    key & 0x000FFFFF,
+                    0x2,
+                    0x0002,
+                    key & 0x000FFFFF,
+                    "BFT",
+                    subghz->txrx->preset);
+
+                uint8_t seed_data[sizeof(uint32_t)] = {0};
+                for(size_t i = 0; i < sizeof(uint32_t); i++) {
+                    seed_data[sizeof(uint32_t) - i - 1] = ((key & 0x000FFFFF) >> i * 8) & 0xFF;
+                }
+
+                flipper_format_write_hex(
+                    subghz->txrx->fff_data, "Seed", seed_data, sizeof(uint32_t));
+
+                flipper_format_write_string_cstr(subghz->txrx->fff_data, "Manufacture", "BFT");
+
+                generated_protocol = true;
+            } else {
+                generated_protocol = false;
+            }
+            subghz_transmitter_free(subghz->txrx->transmitter);
+            if(!generated_protocol) {
+                furi_string_set(
+                    subghz->error_str, "Function requires\nan SD card with\nfresh databases.");
+                scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowError);
+            }
+            break;
+        case SubmenuIndexSomfyTelis:
+            subghz->txrx->transmitter = subghz_transmitter_alloc_init(
+                subghz->txrx->environment, SUBGHZ_PROTOCOL_SOMFY_TELIS_NAME);
+            subghz_preset_init(
+                subghz, "AM650", subghz_setting_get_default_frequency(subghz->setting), NULL, 0);
+            if(subghz->txrx->transmitter) {
+                subghz_protocol_somfy_telis_create_data(
+                    subghz_transmitter_get_protocol_instance(subghz->txrx->transmitter),
+                    subghz->txrx->fff_data,
+                    key & 0x00FFFFFF,
+                    0x2,
+                    0x0003,
+                    subghz->txrx->preset);
+                generated_protocol = true;
+            } else {
+                generated_protocol = false;
+            }
+            subghz_transmitter_free(subghz->txrx->transmitter);
+            if(!generated_protocol) {
+                furi_string_set(
+                    subghz->error_str, "Function requires\nan SD card with\nfresh databases.");
+                scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowError);
+            }
+            break;
         case SubmenuIndexDoorHan_433_92:
             subghz->txrx->transmitter = subghz_transmitter_alloc_init(
                 subghz->txrx->environment, SUBGHZ_PROTOCOL_KEELOQ_NAME);
@@ -367,7 +445,33 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                     key & 0x0FFFFFFF,
                     0x1,
                     0x0003,
-                    subghz->txrx->preset);
+                    subghz->txrx->preset,
+                    false);
+                generated_protocol = true;
+            } else {
+                generated_protocol = false;
+            }
+            subghz_transmitter_free(subghz->txrx->transmitter);
+            if(!generated_protocol) {
+                furi_string_set(
+                    subghz->error_str, "Function requires\nan SD card with\nfresh databases.");
+                scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowError);
+            }
+            break;
+        case SubmenuIndexNiceOne_433_92:
+            subghz->txrx->transmitter = subghz_transmitter_alloc_init(
+                subghz->txrx->environment, SUBGHZ_PROTOCOL_NICE_FLOR_S_NAME);
+            subghz_preset_init(
+                subghz, "AM650", subghz_setting_get_default_frequency(subghz->setting), NULL, 0);
+            if(subghz->txrx->transmitter) {
+                subghz_protocol_nice_flor_s_create_data(
+                    subghz_transmitter_get_protocol_instance(subghz->txrx->transmitter),
+                    subghz->txrx->fff_data,
+                    key & 0x0FFFFFFF,
+                    0x1,
+                    0x0003,
+                    subghz->txrx->preset,
+                    true);
                 generated_protocol = true;
             } else {
                 generated_protocol = false;

applications/main/subghz/scenes/subghz_scene_transmitter.c

@@ -2,7 +2,10 @@
 #include "../views/transmitter.h"
 #include <dolphin/dolphin.h>
 #include <lib/subghz/protocols/keeloq.h>
+#include <lib/subghz/protocols/alutech_at_4n.h>
 #include <lib/subghz/protocols/star_line.h>
+#include <lib/subghz/protocols/nice_flor_s.h>
+#include <lib/subghz/protocols/somfy_telis.h>
 
 void subghz_scene_transmitter_callback(SubGhzCustomEvent event, void* context) {
     furi_assert(context);
@@ -89,6 +92,27 @@ bool subghz_scene_transmitter_on_event(void* context, SceneManagerEvent event) {
                 subghz_tx_stop(subghz);
                 subghz_sleep(subghz);
             }
+            if(keeloq_get_custom_btn() != 0) {
+                keeloq_set_btn(0);
+                alutech_set_btn(0);
+                nice_flors_set_btn(0);
+                somfy_telis_set_btn(0);
+                uint8_t tmp_counter = furi_hal_subghz_get_rolling_counter_mult();
+                furi_hal_subghz_set_rolling_counter_mult(0);
+                // Calling restore!
+                if(subghz->txrx->txrx_state == SubGhzTxRxStateRx) {
+                    subghz_rx_end(subghz);
+                }
+                if((subghz->txrx->txrx_state == SubGhzTxRxStateIDLE) ||
+                   (subghz->txrx->txrx_state == SubGhzTxRxStateSleep)) {
+                    if(!subghz_tx_start(subghz, subghz->txrx->fff_data)) {
+                        scene_manager_next_scene(subghz->scene_manager, SubGhzSceneShowOnlyRx);
+                    }
+                }
+                subghz_tx_stop(subghz);
+                subghz_sleep(subghz);
+                furi_hal_subghz_set_rolling_counter_mult(tmp_counter);
+            }
             return true;
         } else if(event.event == SubGhzCustomEventViewTransmitterBack) {
             subghz->state_notifications = SubGhzNotificationStateIDLE;
@@ -113,6 +137,10 @@ void subghz_scene_transmitter_on_exit(void* context) {
     subghz->state_notifications = SubGhzNotificationStateIDLE;
     keeloq_reset_mfname();
     keeloq_reset_kl_type();
+    keeloq_reset_original_btn();
+    alutech_reset_original_btn();
+    nice_flors_reset_original_btn();
+    somfy_telis_reset_original_btn();
     star_line_reset_mfname();
     star_line_reset_kl_type();
 }

applications/main/subghz/subghz.c

@@ -275,7 +275,7 @@ SubGhz* subghz_alloc(bool alloc_for_tx_only) {
         subghz->txrx->history = subghz_history_alloc();
     }
 
-    subghz->txrx->raw_threshold_rssi = SUBGHZ_RAW_TRESHOLD_MIN;
+    subghz->txrx->raw_threshold_rssi = SUBGHZ_RAW_THRESHOLD_MIN;
     subghz->txrx->worker = subghz_worker_alloc();
 
     subghz->txrx->fff_data = flipper_format_string_alloc();

applications/main/subghz/subghz_history.c

@@ -88,6 +88,28 @@ void subghz_history_reset(SubGhzHistory* instance) {
     instance->code_last_hash_data = 0;
 }
 
+void subghz_history_delete_item(SubGhzHistory* instance, uint16_t item_id) {
+    furi_assert(instance);
+
+    SubGhzHistoryItemArray_it_t it;
+    //SubGhzHistoryItem* target_item = SubGhzHistoryItemArray_get(instance->history->data, item_id);
+    SubGhzHistoryItemArray_it_last(it, instance->history->data);
+    while(!SubGhzHistoryItemArray_end_p(it)) {
+        SubGhzHistoryItem* item = SubGhzHistoryItemArray_ref(it);
+
+        if(it->index == (size_t)(item_id)) {
+            furi_string_free(item->item_str);
+            furi_string_free(item->preset->name);
+            free(item->preset);
+            flipper_format_free(item->flipper_string);
+            item->type = 0;
+            SubGhzHistoryItemArray_remove(instance->history->data, it);
+        }
+        SubGhzHistoryItemArray_previous(it);
+    }
+    instance->last_index_write--;
+}
+
 uint16_t subghz_history_get_item(SubGhzHistory* instance) {
     furi_assert(instance);
     return instance->last_index_write;

applications/main/subghz/subghz_history.h

@@ -27,6 +27,8 @@ void subghz_history_free(SubGhzHistory* instance);
  */
 void subghz_history_reset(SubGhzHistory* instance);
 
+void subghz_history_delete_item(SubGhzHistory* instance, uint16_t item_id);
+
 /** Get frequency to history[idx]
  * 
  * @param instance  - SubGhzHistory instance
@@ -80,7 +82,7 @@ void subghz_history_get_text_item_menu(SubGhzHistory* instance, FuriString* outp
  * 
  * @param instance  - SubGhzHistory instance
  * @param output    - FuriString* output
- * @return bool - is FUUL
+ * @return bool - is FULL
  */
 bool subghz_history_get_text_space_left(SubGhzHistory* instance, FuriString* output);
 

applications/main/subghz/subghz_history_private.h

@@ -92,7 +92,7 @@ uint32_t subghz_history_rand_range(uint32_t min, uint32_t max);
  * 
  * @param file - Stream*
  * @param is_negative_start - first value is negative or positive?
- * @param current_position - 0 if started from begining
+ * @param current_position - 0 if started from beginning
  * @param empty_line - add RAW_Data to this line
  * @return true 
  * @return false 
@@ -160,4 +160,4 @@ bool subghz_history_stream_seek_to_key(Stream* stream, const char* key, bool str
  * @return true 
  * @return false 
  */
-bool subghz_history_stream_read_value(Stream* stream, FuriString* value, bool* last);
+bool subghz_history_stream_read_value(Stream* stream, FuriString* value, bool* last);

applications/main/subghz/subghz_i.c

@@ -575,7 +575,7 @@ void subghz_hopper_update(SubGhz* subghz) {
             return;
         }
     } else {
-        subghz->txrx->hopper_state = SubGhzHopperStateRunnig;
+        subghz->txrx->hopper_state = SubGhzHopperStateRunning;
     }
     // Select next frequency
     if(subghz->txrx->hopper_idx_frequency <

applications/main/subghz/views/receiver.c

@@ -12,7 +12,7 @@
 #define MENU_ITEMS 4u
 #define UNLOCK_CNT 3
 
-#define SUBGHZ_RAW_TRESHOLD_MIN -90.0f
+#define SUBGHZ_RAW_THRESHOLD_MIN -90.0f
 
 typedef struct {
     FuriString* item_str;
@@ -80,10 +80,10 @@ void subghz_receiver_rssi(SubGhzViewReceiver* instance, float rssi) {
         instance->view,
         SubGhzViewReceiverModel * model,
         {
-            if(rssi < SUBGHZ_RAW_TRESHOLD_MIN) {
+            if(rssi < SUBGHZ_RAW_THRESHOLD_MIN) {
                 model->u_rssi = 0;
             } else {
-                model->u_rssi = (uint8_t)(rssi - SUBGHZ_RAW_TRESHOLD_MIN);
+                model->u_rssi = (uint8_t)(rssi - SUBGHZ_RAW_THRESHOLD_MIN);
             }
         },
         true);
@@ -427,6 +427,34 @@ bool subghz_view_receiver_input(InputEvent* event, void* context) {
             true);
     } else if(event->key == InputKeyLeft && event->type == InputTypeShort) {
         subghz_receiver->callback(SubGhzCustomEventViewReceiverConfig, subghz_receiver->context);
+    } else if(event->key == InputKeyRight && event->type == InputTypeLong) {
+        with_view_model(
+            subghz_receiver->view,
+            SubGhzViewReceiverModel * model,
+            {
+                if(model->history_item != 0) {
+                    SubGhzReceiverMenuItemArray_it_t it;
+                    // SubGhzReceiverMenuItem* target_item =
+                    //     SubGhzReceiverMenuItemArray_get(model->history->data, model->idx);
+                    SubGhzReceiverMenuItemArray_it_last(it, model->history->data);
+                    while(!SubGhzReceiverMenuItemArray_end_p(it)) {
+                        SubGhzReceiverMenuItem* item = SubGhzReceiverMenuItemArray_ref(it);
+
+                        if(it->index == (size_t)(model->idx)) {
+                            furi_string_free(item->item_str);
+                            item->type = 0;
+                            SubGhzReceiverMenuItemArray_remove(model->history->data, it);
+                        }
+
+                        SubGhzReceiverMenuItemArray_previous(it);
+                    }
+
+                    // Callback
+                    subghz_receiver->callback(
+                        SubGhzCustomEventViewReceiverDeleteItem, subghz_receiver->context);
+                }
+            },
+            true);
     } else if(event->key == InputKeyOk && event->type == InputTypeShort) {
         with_view_model(
             subghz_receiver->view,
@@ -540,12 +568,34 @@ View* subghz_view_receiver_get_view(SubGhzViewReceiver* subghz_receiver) {
 
 uint16_t subghz_view_receiver_get_idx_menu(SubGhzViewReceiver* subghz_receiver) {
     furi_assert(subghz_receiver);
-    uint32_t idx = 0;
+    uint16_t idx = 0;
     with_view_model(
         subghz_receiver->view, SubGhzViewReceiverModel * model, { idx = model->idx; }, false);
     return idx;
 }
 
+void subghz_view_receiver_delete_element_callback(SubGhzViewReceiver* subghz_receiver) {
+    furi_assert(subghz_receiver);
+
+    with_view_model(
+        subghz_receiver->view,
+        SubGhzViewReceiverModel * model,
+        {
+            if(model->history_item == 5) {
+                if(model->idx >= 2) {
+                    model->idx = model->history_item - 1;
+                }
+            }
+            model->history_item--;
+
+            if(model->idx != 0) {
+                model->idx--;
+            }
+        },
+        true);
+    furi_delay_ms(200);
+}
+
 void subghz_view_receiver_set_idx_menu(SubGhzViewReceiver* subghz_receiver, uint16_t idx) {
     furi_assert(subghz_receiver);
     with_view_model(

applications/main/subghz/views/receiver.h

@@ -46,4 +46,6 @@ uint16_t subghz_view_receiver_get_idx_menu(SubGhzViewReceiver* subghz_receiver);
 
 void subghz_view_receiver_set_idx_menu(SubGhzViewReceiver* subghz_receiver, uint16_t idx);
 
+void subghz_view_receiver_delete_element_callback(SubGhzViewReceiver* subghz_receiver);
+
 void subghz_view_receiver_exit(void* context);

applications/main/subghz/views/subghz_read_raw.c

@@ -23,7 +23,7 @@ typedef struct {
     FuriString* sample_write;
     FuriString* file_name;
     uint8_t* rssi_history;
-    uint8_t rssi_curret;
+    uint8_t rssi_current;
     bool rssi_history_end;
     uint8_t ind_write;
     uint8_t ind_sin;
@@ -62,17 +62,17 @@ void subghz_read_raw_add_data_rssi(SubGhzReadRAW* instance, float rssi, bool tra
     furi_assert(instance);
     uint8_t u_rssi = 0;
 
-    if(rssi < SUBGHZ_RAW_TRESHOLD_MIN) {
+    if(rssi < SUBGHZ_RAW_THRESHOLD_MIN) {
         u_rssi = 0;
     } else {
-        u_rssi = (uint8_t)((rssi - SUBGHZ_RAW_TRESHOLD_MIN) / 2.7);
+        u_rssi = (uint8_t)((rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7);
     }
 
     with_view_model(
         instance->view,
         SubGhzReadRAWModel * model,
         {
-            model->rssi_curret = u_rssi;
+            model->rssi_current = u_rssi;
             if(trace) {
                 model->rssi_history[model->ind_write++] = u_rssi;
             } else {
@@ -206,10 +206,10 @@ void subghz_read_raw_draw_rssi(Canvas* canvas, SubGhzReadRAWModel* model) {
             canvas_draw_line(canvas, i, 47, i, 47 - model->rssi_history[i]);
         }
         canvas_draw_line(
-            canvas, model->ind_write + 1, 47, model->ind_write + 1, 47 - model->rssi_curret);
+            canvas, model->ind_write + 1, 47, model->ind_write + 1, 47 - model->rssi_current);
         if(model->ind_write > 3) {
             canvas_draw_line(
-                canvas, model->ind_write - 1, 47, model->ind_write - 1, 47 - model->rssi_curret);
+                canvas, model->ind_write - 1, 47, model->ind_write - 1, 47 - model->rssi_current);
 
             for(uint8_t i = 13; i < 47; i += width * 2) {
                 canvas_draw_line(canvas, model->ind_write, i, model->ind_write, i + width);
@@ -231,13 +231,13 @@ void subghz_read_raw_draw_rssi(Canvas* canvas, SubGhzReadRAWModel* model) {
             SUBGHZ_READ_RAW_RSSI_HISTORY_SIZE - 1,
             47,
             SUBGHZ_READ_RAW_RSSI_HISTORY_SIZE - 1,
-            47 - model->rssi_curret);
+            47 - model->rssi_current);
         canvas_draw_line(
             canvas,
             SUBGHZ_READ_RAW_RSSI_HISTORY_SIZE + 1,
             47,
             SUBGHZ_READ_RAW_RSSI_HISTORY_SIZE + 1,
-            47 - model->rssi_curret);
+            47 - model->rssi_current);
 
         for(uint8_t i = 13; i < 47; i += width * 2) {
             canvas_draw_line(
@@ -266,9 +266,9 @@ void subghz_read_raw_draw_threshold_rssi(Canvas* canvas, SubGhzReadRAWModel* mod
     uint8_t x = 118;
     uint8_t y = 48;
 
-    if(model->raw_threshold_rssi > SUBGHZ_RAW_TRESHOLD_MIN) {
+    if(model->raw_threshold_rssi > SUBGHZ_RAW_THRESHOLD_MIN) {
         uint8_t x = 118;
-        y -= (uint8_t)((model->raw_threshold_rssi - SUBGHZ_RAW_TRESHOLD_MIN) / 2.7);
+        y -= (uint8_t)((model->raw_threshold_rssi - SUBGHZ_RAW_THRESHOLD_MIN) / 2.7);
 
         uint8_t width = 3;
         for(uint8_t i = 0; i < x; i += width * 2) {

applications/main/subghz/views/subghz_read_raw.h

@@ -3,7 +3,7 @@
 #include <gui/view.h>
 #include "../helpers/subghz_custom_event.h"
 
-#define SUBGHZ_RAW_TRESHOLD_MIN -90.0f
+#define SUBGHZ_RAW_THRESHOLD_MIN -90.0f
 
 typedef struct SubGhzReadRAW SubGhzReadRAW;
 

applications/main/subghz/views/transmitter.c

@@ -4,6 +4,11 @@
 #include <input/input.h>
 #include <gui/elements.h>
 
+#include <lib/subghz/protocols/keeloq.h>
+#include <lib/subghz/protocols/alutech_at_4n.h>
+#include <lib/subghz/protocols/nice_flor_s.h>
+#include <lib/subghz/protocols/somfy_telis.h>
+
 struct SubGhzViewTransmitter {
     View* view;
     SubGhzViewTransmitterCallback callback;
@@ -15,6 +20,8 @@ typedef struct {
     FuriString* preset_str;
     FuriString* key_str;
     uint8_t show_button;
+    FuriString* temp_button_id;
+    bool draw_temp_button;
 } SubGhzViewTransmitterModel;
 
 void subghz_view_transmitter_set_callback(
@@ -89,6 +96,12 @@ void subghz_view_transmitter_draw(Canvas* canvas, SubGhzViewTransmitterModel* mo
     canvas_draw_str(canvas, 78, 7, furi_string_get_cstr(model->frequency_str));
     canvas_draw_str(canvas, 113, 7, furi_string_get_cstr(model->preset_str));
 
+    if(model->draw_temp_button) {
+        canvas_set_font(canvas, FontBatteryPercent);
+        canvas_draw_str(canvas, 117, 40, furi_string_get_cstr(model->temp_button_id));
+        canvas_set_font(canvas, FontSecondary);
+    }
+
     if(model->show_button) {
         canvas_draw_str(canvas, 58, 62, furi_hal_subghz_get_radio_type() ? "R: Ext" : "R: Int");
         subghz_view_transmitter_button_right(canvas, "Send");
@@ -108,7 +121,9 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
                 furi_string_reset(model->frequency_str);
                 furi_string_reset(model->preset_str);
                 furi_string_reset(model->key_str);
+                furi_string_reset(model->temp_button_id);
                 model->show_button = 0;
+                model->draw_temp_button = false;
             },
             false);
         return false;
@@ -125,6 +140,14 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
         true);
 
     if(can_be_sent && event->key == InputKeyOk && event->type == InputTypePress) {
+        with_view_model(
+            subghz_transmitter->view,
+            SubGhzViewTransmitterModel * model,
+            {
+                furi_string_reset(model->temp_button_id);
+                model->draw_temp_button = false;
+            },
+            true);
         subghz_transmitter->callback(
             SubGhzCustomEventViewTransmitterSendStart, subghz_transmitter->context);
         return true;
@@ -134,6 +157,141 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
         return true;
     }
 
+    // Temp Buttons (UP)
+    if(can_be_sent && event->key == InputKeyUp && event->type == InputTypePress) {
+        keeloq_set_btn(1);
+        alutech_set_btn(1);
+        nice_flors_set_btn(1);
+        somfy_telis_set_btn(1);
+        with_view_model(
+            subghz_transmitter->view,
+            SubGhzViewTransmitterModel * model,
+            {
+                furi_string_reset(model->temp_button_id);
+                if(keeloq_get_original_btn() != 0) {
+                    furi_string_printf(model->temp_button_id, "%01X", keeloq_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(alutech_get_original_btn() != 0) {
+                    furi_string_printf(model->temp_button_id, "%01X", alutech_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(nice_flors_get_original_btn() != 0) {
+                    furi_string_printf(
+                        model->temp_button_id, "%01X", nice_flors_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(somfy_telis_get_original_btn() != 0) {
+                    furi_string_printf(
+                        model->temp_button_id, "%01X", somfy_telis_get_original_btn());
+                    model->draw_temp_button = true;
+                }
+            },
+            true);
+        subghz_transmitter->callback(
+            SubGhzCustomEventViewTransmitterSendStart, subghz_transmitter->context);
+        return true;
+    } else if(can_be_sent && event->key == InputKeyUp && event->type == InputTypeRelease) {
+        subghz_transmitter->callback(
+            SubGhzCustomEventViewTransmitterSendStop, subghz_transmitter->context);
+        return true;
+    }
+    // Down
+    if(can_be_sent && event->key == InputKeyDown && event->type == InputTypePress) {
+        keeloq_set_btn(2);
+        alutech_set_btn(2);
+        nice_flors_set_btn(2);
+        somfy_telis_set_btn(2);
+        with_view_model(
+            subghz_transmitter->view,
+            SubGhzViewTransmitterModel * model,
+            {
+                furi_string_reset(model->temp_button_id);
+                if(keeloq_get_original_btn() != 0) {
+                    furi_string_printf(model->temp_button_id, "%01X", keeloq_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(alutech_get_original_btn() != 0) {
+                    furi_string_printf(model->temp_button_id, "%01X", alutech_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(nice_flors_get_original_btn() != 0) {
+                    furi_string_printf(
+                        model->temp_button_id, "%01X", nice_flors_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(somfy_telis_get_original_btn() != 0) {
+                    furi_string_printf(
+                        model->temp_button_id, "%01X", somfy_telis_get_original_btn());
+                    model->draw_temp_button = true;
+                }
+            },
+            true);
+        subghz_transmitter->callback(
+            SubGhzCustomEventViewTransmitterSendStart, subghz_transmitter->context);
+        return true;
+    } else if(can_be_sent && event->key == InputKeyDown && event->type == InputTypeRelease) {
+        subghz_transmitter->callback(
+            SubGhzCustomEventViewTransmitterSendStop, subghz_transmitter->context);
+        return true;
+    }
+    // Left
+    if(can_be_sent && event->key == InputKeyLeft && event->type == InputTypePress) {
+        keeloq_set_btn(3);
+        alutech_set_btn(3);
+        nice_flors_set_btn(3);
+        somfy_telis_set_btn(3);
+        with_view_model(
+            subghz_transmitter->view,
+            SubGhzViewTransmitterModel * model,
+            {
+                furi_string_reset(model->temp_button_id);
+                if(keeloq_get_original_btn() != 0) {
+                    furi_string_printf(model->temp_button_id, "%01X", keeloq_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(alutech_get_original_btn() != 0) {
+                    furi_string_printf(model->temp_button_id, "%01X", alutech_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(nice_flors_get_original_btn() != 0) {
+                    furi_string_printf(
+                        model->temp_button_id, "%01X", nice_flors_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(somfy_telis_get_original_btn() != 0) {
+                    furi_string_printf(
+                        model->temp_button_id, "%01X", somfy_telis_get_original_btn());
+                    model->draw_temp_button = true;
+                }
+            },
+            true);
+        subghz_transmitter->callback(
+            SubGhzCustomEventViewTransmitterSendStart, subghz_transmitter->context);
+        return true;
+    } else if(can_be_sent && event->key == InputKeyLeft && event->type == InputTypeRelease) {
+        subghz_transmitter->callback(
+            SubGhzCustomEventViewTransmitterSendStop, subghz_transmitter->context);
+        return true;
+    }
+    // Right
+    if(can_be_sent && event->key == InputKeyRight && event->type == InputTypePress) {
+        keeloq_set_btn(4);
+        alutech_set_btn(4);
+        with_view_model(
+            subghz_transmitter->view,
+            SubGhzViewTransmitterModel * model,
+            {
+                furi_string_reset(model->temp_button_id);
+                if(keeloq_get_original_btn() != 0) {
+                    furi_string_printf(model->temp_button_id, "%01X", keeloq_get_original_btn());
+                    model->draw_temp_button = true;
+                } else if(alutech_get_original_btn() != 0) {
+                    furi_string_printf(model->temp_button_id, "%01X", alutech_get_original_btn());
+                    model->draw_temp_button = true;
+                }
+            },
+            true);
+        subghz_transmitter->callback(
+            SubGhzCustomEventViewTransmitterSendStart, subghz_transmitter->context);
+        return true;
+    } else if(can_be_sent && event->key == InputKeyRight && event->type == InputTypeRelease) {
+        subghz_transmitter->callback(
+            SubGhzCustomEventViewTransmitterSendStop, subghz_transmitter->context);
+        return true;
+    }
+
     return true;
 }
 
@@ -166,6 +324,7 @@ SubGhzViewTransmitter* subghz_view_transmitter_alloc() {
             model->frequency_str = furi_string_alloc();
             model->preset_str = furi_string_alloc();
             model->key_str = furi_string_alloc();
+            model->temp_button_id = furi_string_alloc();
         },
         true);
     return subghz_transmitter;
@@ -181,6 +340,7 @@ void subghz_view_transmitter_free(SubGhzViewTransmitter* subghz_transmitter) {
             furi_string_free(model->frequency_str);
             furi_string_free(model->preset_str);
             furi_string_free(model->key_str);
+            furi_string_free(model->temp_button_id);
         },
         true);
     view_free(subghz_transmitter->view);

applications/main/u2f/u2f_data.c

@@ -178,7 +178,7 @@ bool u2f_data_cert_key_load(uint8_t* cert_key) {
     uint8_t key_slot = 0;
     uint32_t version = 0;
 
-    // Check if unique key exists in secure eclave and generate it if missing
+    // Check if unique key exists in secure eclave(typo?) and generate it if missing
     if(!furi_hal_crypto_verify_key(U2F_DATA_FILE_ENCRYPTION_KEY_SLOT_UNIQUE)) return false;
 
     FuriString* filetype;

applications/main/unirfremix/unirfremix_app.c

@@ -19,6 +19,9 @@
 #include <lib/subghz/types.h>
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/star_line.h>
+#include <lib/subghz/protocols/alutech_at_4n.h>
+#include <lib/subghz/protocols/nice_flor_s.h>
+#include <lib/subghz/protocols/somfy_telis.h>
 
 #define UNIRFMAP_FOLDER "/ext/unirf"
 #define UNIRFMAP_EXTENSION ".txt"
@@ -481,6 +484,10 @@ void unirfremix_tx_stop(UniRFRemix* app) {
 
         keeloq_reset_mfname();
         keeloq_reset_kl_type();
+        keeloq_reset_original_btn();
+        alutech_reset_original_btn();
+        nice_flors_reset_original_btn();
+        somfy_telis_reset_original_btn();
         star_line_reset_mfname();
         star_line_reset_kl_type();
     }
@@ -640,7 +647,7 @@ static void render_callback(Canvas* canvas, void* ctx) {
         //canvas_draw_str(canvas, 0, 40, "D: ");
         //canvas_draw_str(canvas, 0, 50, "Ok: ");
 
-        //PNGs are located in assets/icons/UniRFRemix before compiliation
+        //PNGs are located in assets/icons/UniRFRemix before compilation
 
         //Icons for Labels
         //canvas_draw_icon(canvas, 0, 0, &I_UniRFRemix_LeftAlignedButtons_9x64);
@@ -1046,4 +1053,4 @@ int32_t unirfremix_app(void* p) {
     unirfremix_free(app, true);
 
     return 0;
-}
+}

applications/plugins/dap_link/application.fam

@@ -10,7 +10,7 @@ App(
     stack_size=4 * 1024,
     order=20,
     fap_icon="dap_link.png",
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_private_libs=[
         Lib(
             name="free-dap",

applications/plugins/hc_sr04/hc_sr04.c

@@ -3,6 +3,7 @@
 // Ported and modified by @xMasterX
 
 #include <furi.h>
+#include <furi_hal.h>
 #include <furi_hal_power.h>
 #include <furi_hal_console.h>
 #include <gui/gui.h>
@@ -26,7 +27,7 @@ typedef struct {
     NotificationApp* notification;
     bool have_5v;
     bool measurement_made;
-    uint32_t echo; // ms
+    uint32_t echo; // us
     float distance; // meters
 } PluginState;
 
@@ -72,7 +73,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
 
             FuriString* str_buf;
             str_buf = furi_string_alloc();
-            furi_string_printf(str_buf, "Echo: %ld ms", plugin_state->echo);
+            furi_string_printf(str_buf, "Echo: %ld us", plugin_state->echo);
 
             canvas_draw_str_aligned(
                 canvas, 8, 38, AlignLeft, AlignTop, furi_string_get_cstr(str_buf));
@@ -110,9 +111,11 @@ static void hc_sr04_state_init(PluginState* const plugin_state) {
     }
 }
 
-float hc_sr04_ms_to_m(uint32_t ms) {
-    const float speed_sound_m_per_s = 343.0f;
-    const float time_s = ms / 1e3f;
+float hc_sr04_us_to_m(uint32_t us) {
+    //speed of sound for 20°C, 50% relative humidity
+    //331.3 + 20 * 0.606 + 50 * 0.0124 = 0.034404
+    const float speed_sound_m_per_s = 344.04f;
+    const float time_s = us / 1e6f;
     const float total_dist = time_s * speed_sound_m_per_s;
     return total_dist / 2.0f;
 }
@@ -147,10 +150,6 @@ static void hc_sr04_measure(PluginState* const plugin_state) {
     furi_delay_ms(10);
     furi_hal_gpio_write(&gpio_usart_tx, false);
 
-    // TODO change from furi_get_tick(), which returns ms,
-    // to DWT->CYCCNT, which is a more precise counter with
-    // us precision (see furi_hal_cortex_delay_us)
-
     const uint32_t start = furi_get_tick();
 
     while(furi_get_tick() - start < timeout_ms && furi_hal_gpio_read(&gpio_usart_rx))
@@ -158,16 +157,17 @@ static void hc_sr04_measure(PluginState* const plugin_state) {
     while(furi_get_tick() - start < timeout_ms && !furi_hal_gpio_read(&gpio_usart_rx))
         ;
 
-    const uint32_t pulse_start = furi_get_tick();
+    const uint32_t pulse_start = DWT->CYCCNT;
 
     while(furi_get_tick() - start < timeout_ms && furi_hal_gpio_read(&gpio_usart_rx))
         ;
+    const uint32_t pulse_end = DWT->CYCCNT;
 
-    const uint32_t pulse_end = furi_get_tick();
     //FURI_CRITICAL_EXIT();
 
-    plugin_state->echo = pulse_end - pulse_start;
-    plugin_state->distance = hc_sr04_ms_to_m(pulse_end - pulse_start);
+    plugin_state->echo =
+        (pulse_end - pulse_start) / furi_hal_cortex_instructions_per_microsecond();
+    plugin_state->distance = hc_sr04_us_to_m(plugin_state->echo);
     plugin_state->measurement_made = true;
 
     //furi_hal_light_set(LightRed, 0x00);
@@ -270,4 +270,4 @@ int32_t hc_sr04_app() {
     delete_mutex(&state_mutex);
 
     return 0;
-}
+}

applications/plugins/hid_app/application.fam

@@ -1,14 +1,14 @@
-#App(
-#    appid="hid_usb",
-#    name="USB Remote",
-#    apptype=FlipperAppType.PLUGIN,
-#    entry_point="hid_usb_app",
-#    stack_size=1 * 1024,
-#    fap_category="Tools",
-#    fap_icon="hid_usb_10px.png",
-#    fap_icon_assets="assets",
-#    fap_icon_assets_symbol="hid",
-#)
+App(
+    appid="hid_usb",
+    name="USB Keyboard & Mouse",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="hid_usb_app",
+    stack_size=1 * 1024,
+    fap_category="Misc",
+    fap_icon="hid_usb_10px.png",
+    fap_icon_assets="assets",
+    fap_icon_assets_symbol="hid",
+)
 
 
 App(
@@ -17,7 +17,7 @@ App(
     apptype=FlipperAppType.PLUGIN,
     entry_point="hid_ble_app",
     stack_size=1 * 1024,
-    fap_category="Tools",
+    fap_category="Misc",
     fap_icon="hid_ble_10px.png",
     fap_icon_assets="assets",
     fap_icon_assets_symbol="hid",

applications/plugins/hid_app/views/hid_keyboard.c

@@ -140,18 +140,18 @@ const HidKeyboardKey hid_keyboard_keyset[ROW_COUNT][COLUMN_COUNT] = {
         {.width = 1, .icon = &I_ButtonRight_4x7, .value = HID_KEYBOARD_RIGHT_ARROW},
     },
     {
-        {.width = 3, .icon = NULL, .key = "Ctrl", .value = HID_KEYBOARD_L_CTRL},
+        {.width = 2, .icon = NULL, .key = "Ctl", .value = HID_KEYBOARD_L_CTRL},
         {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_CTRL},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_CTRL},
-        {.width = 3, .icon = NULL, .key = "Alt", .value = HID_KEYBOARD_L_ALT},
+        {.width = 2, .icon = NULL, .key = "Alt", .value = HID_KEYBOARD_L_ALT},
         {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_ALT},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_ALT},
-        {.width = 3, .icon = NULL, .key = "Cmd", .value = HID_KEYBOARD_L_GUI},
+        {.width = 2, .icon = NULL, .key = "Cmd", .value = HID_KEYBOARD_L_GUI},
         {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_GUI},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_L_GUI},
-        {.width = 3, .icon = NULL, .key = "Tab", .value = HID_KEYBOARD_TAB},
-        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_TAB},
+        {.width = 2, .icon = NULL, .key = "Tab", .value = HID_KEYBOARD_TAB},
         {.width = 0, .icon = NULL, .value = HID_KEYBOARD_TAB},
+        {.width = 2, .icon = NULL, .key = "Esc", .value = HID_KEYBOARD_ESCAPE},
+        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_ESCAPE},
+        {.width = 2, .icon = NULL, .key = "Del", .value = HID_KEYBOARD_DELETE_FORWARD},
+        {.width = 0, .icon = NULL, .value = HID_KEYBOARD_DELETE_FORWARD},
     },
 };
 

applications/plugins/lightmeter/gui/scenes/lightmeter_scene_config.c

@@ -1,5 +1,7 @@
 #include "../../lightmeter.h"
 
+#define TAG "Scene Config"
+
 static const char* iso_numbers[] = {
     [ISO_6] = "6",
     [ISO_12] = "12",
@@ -39,10 +41,24 @@ static const char* diffusion_dome[] = {
     [WITH_DOME] = "Yes",
 };
 
+static const char* backlight[] = {
+    [BACKLIGHT_AUTO] = "Auto",
+    [BACKLIGHT_ON] = "On",
+};
+
+static const char* lux_only[] = {
+    [LUX_ONLY_OFF] = "Off",
+    [LUX_ONLY_ON] = "On",
+};
+
 enum LightMeterSubmenuIndex {
     LightMeterSubmenuIndexISO,
     LightMeterSubmenuIndexND,
     LightMeterSubmenuIndexDome,
+    LightMeterSubmenuIndexBacklight,
+    LightMeterSubmenuIndexLuxMeter,
+    LightMeterSubmenuIndexHelp,
+    LightMeterSubmenuIndexAbout,
 };
 
 static void iso_numbers_cb(VariableItem* item) {
@@ -78,14 +94,47 @@ static void dome_presence_cb(VariableItem* item) {
     lightmeter_app_set_config(app, config);
 }
 
+static void backlight_cb(VariableItem* item) {
+    LightMeterApp* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, backlight[index]);
+
+    LightMeterConfig* config = app->config;
+    if(index != config->backlight) {
+        if(index == BACKLIGHT_ON) {
+            notification_message(
+                app->notifications,
+                &sequence_display_backlight_enforce_on); // force on backlight
+        } else {
+            notification_message(
+                app->notifications,
+                &sequence_display_backlight_enforce_auto); // force auto backlight
+        }
+    }
+    config->backlight = index;
+    lightmeter_app_set_config(app, config);
+}
+
+static void lux_only_cb(VariableItem* item) {
+    LightMeterApp* app = variable_item_get_context(item);
+    uint8_t index = variable_item_get_current_value_index(item);
+
+    variable_item_set_current_value_text(item, lux_only[index]);
+
+    LightMeterConfig* config = app->config;
+    config->lux_only = index;
+    lightmeter_app_set_config(app, config);
+}
+
 static void ok_cb(void* context, uint32_t index) {
     LightMeterApp* app = context;
     UNUSED(app);
     switch(index) {
-    case 3:
+    case LightMeterSubmenuIndexHelp:
         view_dispatcher_send_custom_event(app->view_dispatcher, LightMeterAppCustomEventHelp);
         break;
-    case 4:
+    case LightMeterSubmenuIndexAbout:
         view_dispatcher_send_custom_event(app->view_dispatcher, LightMeterAppCustomEventAbout);
         break;
     default:
@@ -114,6 +163,16 @@ void lightmeter_scene_config_on_enter(void* context) {
     variable_item_set_current_value_index(item, config->dome);
     variable_item_set_current_value_text(item, diffusion_dome[config->dome]);
 
+    item =
+        variable_item_list_add(var_item_list, "Backlight", COUNT_OF(backlight), backlight_cb, app);
+    variable_item_set_current_value_index(item, config->backlight);
+    variable_item_set_current_value_text(item, backlight[config->backlight]);
+
+    item = variable_item_list_add(
+        var_item_list, "Lux meter only", COUNT_OF(lux_only), lux_only_cb, app);
+    variable_item_set_current_value_index(item, config->lux_only);
+    variable_item_set_current_value_text(item, lux_only[config->lux_only]);
+
     item = variable_item_list_add(var_item_list, "Help and Pinout", 0, NULL, NULL);
     item = variable_item_list_add(var_item_list, "About", 0, NULL, NULL);
 
@@ -153,4 +212,5 @@ void lightmeter_scene_config_on_exit(void* context) {
     main_view_set_iso(app->main_view, app->config->iso);
     main_view_set_nd(app->main_view, app->config->nd);
     main_view_set_dome(app->main_view, app->config->dome);
+    main_view_set_lux_only(app->main_view, app->config->lux_only);
 }

applications/plugins/lightmeter/gui/scenes/lightmeter_scene_help.c

@@ -10,6 +10,8 @@ void lightmeter_scene_help_on_enter(void* context) {
     furi_string_cat(temp_str, "\e#Pinout:\r\n");
     furi_string_cat(
         temp_str,
+        "    VCC: 3.3V\r\n"
+        "    GND: GND\r\n"
         "    SDA: 15 [C1]\r\n"
         "    SCL: 16 [C0]\r\n");
 

applications/plugins/lightmeter/gui/views/main_view.c

@@ -41,7 +41,7 @@ static const int nd_numbers[] = {
     [ND_4096] = 4096,
 };
 
-static const float aperture_numbers[] = {
+const float aperture_numbers[] = {
     [AP_1] = 1.0,
     [AP_1_4] = 1.4,
     [AP_2] = 2.0,
@@ -59,14 +59,14 @@ static const float aperture_numbers[] = {
     [AP_128] = 128,
 };
 
-static const float speed_numbers[] = {
+const float speed_numbers[] = {
     [SPEED_8000] = 1.0 / 8000, [SPEED_4000] = 1.0 / 4000, [SPEED_2000] = 1.0 / 2000,
     [SPEED_1000] = 1.0 / 1000, [SPEED_500] = 1.0 / 500,   [SPEED_250] = 1.0 / 250,
-    [SPEED_125] = 1.0 / 125,   [SPEED_60] = 1.0 / 60,     [SPEED_30] = 1.0 / 30,
-    [SPEED_15] = 1.0 / 15,     [SPEED_8] = 1.0 / 8,       [SPEED_4] = 1.0 / 4,
-    [SPEED_2] = 1.0 / 2,       [SPEED_1S] = 1.0,          [SPEED_2S] = 2.0,
-    [SPEED_4S] = 4.0,          [SPEED_8S] = 8.0,          [SPEED_15S] = 15.0,
-    [SPEED_30S] = 30.0,
+    [SPEED_125] = 1.0 / 125,   [SPEED_60] = 1.0 / 60,     [SPEED_48] = 1.0 / 48,
+    [SPEED_30] = 1.0 / 30,     [SPEED_15] = 1.0 / 15,     [SPEED_8] = 1.0 / 8,
+    [SPEED_4] = 1.0 / 4,       [SPEED_2] = 1.0 / 2,       [SPEED_1S] = 1.0,
+    [SPEED_2S] = 2.0,          [SPEED_4S] = 4.0,          [SPEED_8S] = 8.0,
+    [SPEED_15S] = 15.0,        [SPEED_30S] = 30.0,
 };
 
 struct MainView {
@@ -94,37 +94,39 @@ static void main_view_draw_callback(Canvas* canvas, void* context) {
     furi_assert(context);
     MainViewModel* model = context;
 
-    // FURI_LOG_D("MAIN VIEW", "Drawing");
-
     canvas_clear(canvas);
 
-    // top row
-    draw_top_row(canvas, model);
-
-    // add f, T values
-    canvas_set_font(canvas, FontBigNumbers);
-
-    // draw f icon and number
-    canvas_draw_icon(canvas, 15, 17, &I_f_10x14);
-    draw_aperture(canvas, model);
-
-    // draw T icon and number
-    canvas_draw_icon(canvas, 15, 34, &I_T_10x14);
-    draw_speed(canvas, model);
-
     // draw button
     canvas_set_font(canvas, FontSecondary);
     elements_button_left(canvas, "Config");
 
-    // draw ND number
-    draw_nd_number(canvas, model);
+    if(!model->lux_only) {
+        // top row
+        draw_top_row(canvas, model);
 
-    // draw EV number
-    canvas_set_font(canvas, FontSecondary);
-    draw_EV_number(canvas, model);
+        // add f, T values
+        canvas_set_font(canvas, FontBigNumbers);
 
-    // draw mode indicator
-    draw_mode_indicator(canvas, model);
+        // draw f icon and number
+        canvas_draw_icon(canvas, 15, 17, &I_f_10x14);
+        draw_aperture(canvas, model);
+
+        // draw T icon and number
+        canvas_draw_icon(canvas, 15, 34, &I_T_10x14);
+        draw_speed(canvas, model);
+
+        // draw ND number
+        draw_nd_number(canvas, model);
+
+        // draw EV number
+        canvas_set_font(canvas, FontSecondary);
+        draw_EV_number(canvas, model);
+
+        // draw mode indicator
+        draw_mode_indicator(canvas, model);
+    } else {
+        draw_lux_only_mode(canvas, model);
+    }
 }
 
 static void main_view_process(MainView* main_view, InputEvent* event) {
@@ -267,6 +269,12 @@ void main_view_set_dome(MainView* main_view, bool dome) {
         main_view->view, MainViewModel * model, { model->dome = dome; }, true);
 }
 
+void main_view_set_lux_only(MainView* main_view, bool lux_only) {
+    furi_assert(main_view);
+    with_view_model(
+        main_view->view, MainViewModel * model, { model->lux_only = lux_only; }, true);
+}
+
 bool main_view_get_dome(MainView* main_view) {
     furi_assert(main_view);
     bool val = false;
@@ -307,7 +315,7 @@ void draw_top_row(Canvas* canvas, MainViewModel* context) {
 
         canvas_set_font(canvas, FontPrimary);
         // metering mode A – ambient, F – flash
-        canvas_draw_str_aligned(canvas, 1, 1, AlignLeft, AlignTop, "A");
+        // canvas_draw_str_aligned(canvas, 1, 1, AlignLeft, AlignTop, "A");
 
         snprintf(str, sizeof(str), "ISO: %d", iso_numbers[model->iso]);
         canvas_draw_str_aligned(canvas, 19, 1, AlignLeft, AlignTop, str);
@@ -412,6 +420,8 @@ void draw_nd_number(Canvas* canvas, MainViewModel* context) {
 
     char str[9];
 
+    canvas_set_font(canvas, FontSecondary);
+
     if(model->response) {
         snprintf(str, sizeof(str), "ND: %d", nd_numbers[model->nd]);
     } else {
@@ -432,3 +442,29 @@ void draw_EV_number(Canvas* canvas, MainViewModel* context) {
         canvas_draw_str_aligned(canvas, 87, 29, AlignLeft, AlignBottom, "EV: --");
     }
 }
+
+void draw_lux_only_mode(Canvas* canvas, MainViewModel* context) {
+    MainViewModel* model = context;
+
+    if(!model->response) {
+        canvas_draw_box(canvas, 0, 0, 128, 12);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_set_font(canvas, FontPrimary);
+        canvas_draw_str(canvas, 24, 10, "No sensor found");
+        canvas_set_color(canvas, ColorBlack);
+    } else {
+        char str[12];
+
+        canvas_set_font(canvas, FontPrimary);
+
+        canvas_draw_line(canvas, 0, 10, 128, 10);
+        canvas_draw_str_aligned(canvas, 64, 1, AlignCenter, AlignTop, "Lux meter mode");
+
+        canvas_set_font(canvas, FontBigNumbers);
+        snprintf(str, sizeof(str), "%.0f", (double)model->lux);
+        canvas_draw_str_aligned(canvas, 80, 32, AlignRight, AlignCenter, str);
+
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str_aligned(canvas, 85, 39, AlignLeft, AlignBottom, "Lux");
+    }
+}

applications/plugins/lightmeter/gui/views/main_view.h

@@ -27,6 +27,7 @@ typedef struct {
     int aperture;
     int speed;
     bool dome;
+    bool lux_only;
 } MainViewModel;
 
 typedef void (*LightMeterMainViewButtonCallback)(void* context);
@@ -58,6 +59,8 @@ void main_view_set_speed(MainView* main_view, int val);
 
 void main_view_set_dome(MainView* main_view, bool val);
 
+void main_view_set_lux_only(MainView* main_view, bool val);
+
 bool main_view_get_dome(MainView* main_view);
 
 void draw_top_row(Canvas* canvas, MainViewModel* context);
@@ -71,3 +74,5 @@ void draw_mode_indicator(Canvas* canvas, MainViewModel* context);
 void draw_nd_number(Canvas* canvas, MainViewModel* context);
 
 void draw_EV_number(Canvas* canvas, MainViewModel* context);
+
+void draw_lux_only_mode(Canvas* canvas, MainViewModel* context);

applications/plugins/lightmeter/lib/BH1750/BH1750.c

@@ -15,6 +15,7 @@
 
 BH1750_mode bh1750_mode = BH1750_DEFAULT_MODE; // Current sensor mode
 uint8_t bh1750_mt_reg = BH1750_DEFAULT_MTREG; // Current MT register value
+uint8_t bh1750_addr = BH1750_ADDRESS;
 
 BH1750_STATUS bh1750_init() {
     if(BH1750_OK == bh1750_reset()) {
@@ -25,12 +26,17 @@ BH1750_STATUS bh1750_init() {
     return BH1750_ERROR;
 }
 
+BH1750_STATUS bh1750_init_with_addr(uint8_t addr) {
+    bh1750_addr = (addr << 1);
+    return bh1750_init();
+}
+
 BH1750_STATUS bh1750_reset() {
     uint8_t command = 0x07;
     bool status;
 
     furi_hal_i2c_acquire(I2C_BUS);
-    status = furi_hal_i2c_tx(I2C_BUS, BH1750_ADDRESS, &command, 1, I2C_TIMEOUT);
+    status = furi_hal_i2c_tx(I2C_BUS, bh1750_addr, &command, 1, I2C_TIMEOUT);
     furi_hal_i2c_release(I2C_BUS);
 
     if(status) {
@@ -45,7 +51,7 @@ BH1750_STATUS bh1750_set_power_state(uint8_t PowerOn) {
     bool status;
 
     furi_hal_i2c_acquire(I2C_BUS);
-    status = furi_hal_i2c_tx(I2C_BUS, BH1750_ADDRESS, &PowerOn, 1, I2C_TIMEOUT);
+    status = furi_hal_i2c_tx(I2C_BUS, bh1750_addr, &PowerOn, 1, I2C_TIMEOUT);
     furi_hal_i2c_release(I2C_BUS);
 
     if(status) {
@@ -69,7 +75,7 @@ BH1750_STATUS bh1750_set_mode(BH1750_mode mode) {
     bh1750_mode = mode;
 
     furi_hal_i2c_acquire(I2C_BUS);
-    status = furi_hal_i2c_tx(I2C_BUS, BH1750_ADDRESS, &mode, 1, I2C_TIMEOUT);
+    status = furi_hal_i2c_tx(I2C_BUS, bh1750_addr, &mode, 1, I2C_TIMEOUT);
     furi_hal_i2c_release(I2C_BUS);
 
     if(status) {
@@ -93,14 +99,14 @@ BH1750_STATUS bh1750_set_mt_reg(uint8_t mt_reg) {
     tmp[1] = (0x60 | (mt_reg & 0x1F));
 
     furi_hal_i2c_acquire(I2C_BUS);
-    status = furi_hal_i2c_tx(I2C_BUS, BH1750_ADDRESS, &tmp[0], 1, I2C_TIMEOUT);
+    status = furi_hal_i2c_tx(I2C_BUS, bh1750_addr, &tmp[0], 1, I2C_TIMEOUT);
     furi_hal_i2c_release(I2C_BUS);
     if(!status) {
         return BH1750_ERROR;
     }
 
     furi_hal_i2c_acquire(I2C_BUS);
-    status = furi_hal_i2c_tx(I2C_BUS, BH1750_ADDRESS, &tmp[1], 1, I2C_TIMEOUT);
+    status = furi_hal_i2c_tx(I2C_BUS, bh1750_addr, &tmp[1], 1, I2C_TIMEOUT);
     furi_hal_i2c_release(I2C_BUS);
     if(status) {
         return BH1750_OK;
@@ -122,7 +128,7 @@ BH1750_STATUS bh1750_read_light(float* result) {
     bool status;
 
     furi_hal_i2c_acquire(I2C_BUS);
-    status = furi_hal_i2c_rx(I2C_BUS, BH1750_ADDRESS, rcv, 2, I2C_TIMEOUT);
+    status = furi_hal_i2c_rx(I2C_BUS, bh1750_addr, rcv, 2, I2C_TIMEOUT);
     furi_hal_i2c_release(I2C_BUS);
 
     if(status) {

applications/plugins/lightmeter/lib/BH1750/BH1750.h

@@ -49,6 +49,13 @@ typedef enum {
  */
 BH1750_STATUS bh1750_init();
 
+/**
+ * @brief Change the I2C device address and then initialize the sensor.
+ * 
+ * @return BH1750_STATUS
+ */
+BH1750_STATUS bh1750_init_with_addr(uint8_t addr);
+
 /**
  * @brief Reset all registers to the default value.
  * 

applications/plugins/lightmeter/lightmeter.c

@@ -1,7 +1,7 @@
 #include "lightmeter.h"
 #include "lightmeter_helper.h"
 
-#define WORKER_TAG "MAIN APP"
+#define TAG "MAIN APP"
 
 static bool lightmeter_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
@@ -31,7 +31,6 @@ LightMeterApp* lightmeter_app_alloc(uint32_t first_scene) {
     bh1750_set_power_state(1);
     bh1750_init();
     bh1750_set_mode(ONETIME_HIGH_RES_MODE);
-    bh1750_set_mt_reg(100);
 
     // Set default values to config
     app->config = malloc(sizeof(LightMeterConfig));
@@ -39,12 +38,11 @@ LightMeterApp* lightmeter_app_alloc(uint32_t first_scene) {
     app->config->nd = DEFAULT_ND;
     app->config->aperture = DEFAULT_APERTURE;
     app->config->dome = DEFAULT_DOME;
+    app->config->backlight = DEFAULT_BACKLIGHT;
 
     // Records
     app->gui = furi_record_open(RECORD_GUI);
     app->notifications = furi_record_open(RECORD_NOTIFICATION);
-    notification_message(
-        app->notifications, &sequence_display_backlight_enforce_on); // force on backlight
 
     // View dispatcher
     app->view_dispatcher = view_dispatcher_alloc();
@@ -112,9 +110,11 @@ void lightmeter_app_free(LightMeterApp* app) {
 
     // Records
     furi_record_close(RECORD_GUI);
-    notification_message(
-        app->notifications,
-        &sequence_display_backlight_enforce_auto); // set backlight back to auto
+    if(app->config->backlight != BACKLIGHT_AUTO) {
+        notification_message(
+            app->notifications,
+            &sequence_display_backlight_enforce_auto); // set backlight back to auto
+    }
     furi_record_close(RECORD_NOTIFICATION);
 
     bh1750_set_power_state(0);

applications/plugins/lightmeter/lightmeter.h

@@ -24,6 +24,8 @@ typedef struct {
     int nd;
     int aperture;
     int dome;
+    int backlight;
+    int lux_only;
 } LightMeterConfig;
 
 typedef struct {

applications/plugins/lightmeter/lightmeter_config.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#define LM_VERSION_APP "0.5"
+#define LM_VERSION_APP "0.7"
 #define LM_DEVELOPED "Oleksii Kutuzov"
 #define LM_GITHUB "https://github.com/oleksiikutuzov/flipperzero-lightmeter"
 
@@ -10,6 +10,7 @@
 #define DEFAULT_APERTURE AP_2_8
 #define DEFAULT_SPEED SPEED_125
 #define DEFAULT_DOME WITHOUT_DOME
+#define DEFAULT_BACKLIGHT BACKLIGHT_AUTO
 
 typedef enum {
     ISO_6,
@@ -78,6 +79,7 @@ typedef enum {
     SPEED_250,
     SPEED_125,
     SPEED_60,
+    SPEED_48,
     SPEED_30,
     SPEED_15,
     SPEED_8,
@@ -97,3 +99,10 @@ typedef enum {
     WITHOUT_DOME,
     WITH_DOME,
 } LightMeterDomePresence;
+
+typedef enum {
+    LUX_ONLY_OFF,
+    LUX_ONLY_ON,
+} LightMeterLuxOnlyMode;
+
+typedef enum { BACKLIGHT_AUTO, BACKLIGHT_ON } LightMeterBacklight;

applications/plugins/lightmeter/lightmeter_helper.c

@@ -1,33 +1,8 @@
 #include "lightmeter_helper.h"
 #include "lightmeter_config.h"
 
-static const float aperture_numbers[] = {
-    [AP_1] = 1.0,
-    [AP_1_4] = 1.4,
-    [AP_2] = 2.0,
-    [AP_2_8] = 2.8,
-    [AP_4] = 4.0,
-    [AP_5_6] = 5.6,
-    [AP_8] = 8,
-    [AP_11] = 11,
-    [AP_16] = 16,
-    [AP_22] = 22,
-    [AP_32] = 32,
-    [AP_45] = 45,
-    [AP_64] = 64,
-    [AP_90] = 90,
-    [AP_128] = 128,
-};
-
-static const float time_numbers[] = {
-    [SPEED_8000] = 1.0 / 8000, [SPEED_4000] = 1.0 / 4000, [SPEED_2000] = 1.0 / 2000,
-    [SPEED_1000] = 1.0 / 1000, [SPEED_500] = 1.0 / 500,   [SPEED_250] = 1.0 / 250,
-    [SPEED_125] = 1.0 / 125,   [SPEED_60] = 1.0 / 60,     [SPEED_30] = 1.0 / 30,
-    [SPEED_15] = 1.0 / 15,     [SPEED_8] = 1.0 / 8,       [SPEED_4] = 1.0 / 4,
-    [SPEED_2] = 1.0 / 2,       [SPEED_1S] = 1.0,          [SPEED_2S] = 2.0,
-    [SPEED_4S] = 4.0,          [SPEED_8S] = 8.0,          [SPEED_15S] = 15.0,
-    [SPEED_30S] = 30.0,
-};
+extern const float aperture_numbers[];
+extern const float speed_numbers[];
 
 float lux2ev(float lux) {
     return log2(lux / 2.5);
@@ -41,7 +16,6 @@ float getMinDistance(float x, float v1, float v2) {
     return v1;
 }
 
-// Convert calculated aperture value to photography style aperture value.
 float normalizeAperture(float a) {
     for(int i = 0; i < AP_NUM; i++) {
         float a1 = aperture_numbers[i];
@@ -57,8 +31,8 @@ float normalizeAperture(float a) {
 
 float normalizeTime(float a) {
     for(int i = 0; i < SPEED_NUM; i++) {
-        float a1 = time_numbers[i];
-        float a2 = time_numbers[i + 1];
+        float a1 = speed_numbers[i];
+        float a2 = speed_numbers[i + 1];
 
         if(a1 < a && a2 >= a) {
             return getMinDistance(a, a1, a2);

applications/plugins/metronome/application.fam

@@ -8,7 +8,7 @@ App(
         "gui",
     ],
     fap_icon="metronome_icon.png",
-    fap_category="Music",
+    fap_category="Media",
     fap_icon_assets="images",
     stack_size=2 * 1024,
     order=20,

applications/plugins/morse_code/application.fam

@@ -10,6 +10,6 @@ App(
     stack_size=1 * 1024,
     order=20,
     fap_icon="morse_code_10px.png",
-    fap_category="Music"
+    fap_category="Media"
 
 )

applications/plugins/mousejacker/mousejacker_ducky.c

@@ -3,6 +3,7 @@
 static const char ducky_cmd_comment[] = {"REM"};
 static const char ducky_cmd_delay[] = {"DELAY "};
 static const char ducky_cmd_string[] = {"STRING "};
+static const char ducky_cmd_altstring[] = {"ALTSTRING "};
 static const char ducky_cmd_repeat[] = {"REPEAT "};
 
 static uint8_t LOGITECH_HID_TEMPLATE[] =
@@ -11,6 +12,10 @@ static uint8_t LOGITECH_HELLO[] = {0x00, 0x4F, 0x00, 0x04, 0xB0, 0x10, 0x00, 0x0
 static uint8_t LOGITECH_KEEPALIVE[] = {0x00, 0x40, 0x00, 0x55, 0x6B};
 
 uint8_t prev_hid = 0;
+static bool holding_ctrl = false;
+static bool holding_shift = false;
+static bool holding_alt = false;
+static bool holding_gui = false;
 
 #define RT_THRESHOLD 50
 #define LOGITECH_MIN_CHANNEL 2
@@ -65,7 +70,10 @@ MJDuckyKey mj_ducky_keys[] = {{" ", 44, 0},         {"!", 30, 2},          {"\""
                               {"LEFTARROW", 80, 0}, {"RIGHTARROW", 79, 0}, {"PAGEDOWN", 78, 0},
                               {"PAUSE", 72, 0},     {"SPACE", 44, 0},      {"UPARROW", 82, 0},
                               {"F11", 68, 0},       {"F7", 64, 0},         {"UP", 82, 0},
-                              {"LEFT", 80, 0}};
+                              {"LEFT", 80, 0},      {"NUM 1", 89, 0},      {"NUM 2", 90, 0},
+                              {"NUM 3", 91, 0},     {"NUM 4", 92, 0},      {"NUM 5", 93, 0},
+                              {"NUM 6", 94, 0},     {"NUM 7", 95, 0},      {"NUM 8", 96, 0},
+                              {"NUM 9", 97, 0},     {"NUM 0", 98, 0}};
 
 /*
 static bool mj_ducky_get_number(const char* param, uint32_t* val) {
@@ -89,7 +97,8 @@ static uint32_t mj_ducky_get_command_len(const char* line) {
 static bool mj_get_ducky_key(char* key, size_t keylen, MJDuckyKey* dk) {
     //FURI_LOG_D(TAG, "looking up key %s with length %d", key, keylen);
     for(uint i = 0; i < sizeof(mj_ducky_keys) / sizeof(MJDuckyKey); i++) {
-        if(!strncmp(mj_ducky_keys[i].name, key, keylen)) {
+        if(strlen(mj_ducky_keys[i].name) == keylen &&
+           !strncmp(mj_ducky_keys[i].name, key, keylen)) {
             memcpy(dk, &mj_ducky_keys[i], sizeof(MJDuckyKey));
             return true;
         }
@@ -152,6 +161,30 @@ static void build_hid_packet(uint8_t mod, uint8_t hid, uint8_t* payload) {
     checksum(payload, LOGITECH_HID_TEMPLATE_SIZE);
 }
 
+static void release_key(
+    FuriHalSpiBusHandle* handle,
+    uint8_t* addr,
+    uint8_t addr_size,
+    uint8_t rate,
+    PluginState* plugin_state) {
+    // This function release keys currently pressed, but keep pressing special keys
+    // if holding mod keys variable are set to true
+
+    uint8_t hid_payload[LOGITECH_HID_TEMPLATE_SIZE] = {0};
+    build_hid_packet(
+        0 | holding_ctrl | holding_shift << 1 | holding_alt << 2 | holding_gui << 3,
+        0,
+        hid_payload);
+    inject_packet(
+        handle,
+        addr,
+        addr_size,
+        rate,
+        hid_payload,
+        LOGITECH_HID_TEMPLATE_SIZE,
+        plugin_state); // empty hid packet
+}
+
 static void send_hid_packet(
     FuriHalSpiBusHandle* handle,
     uint8_t* addr,
@@ -161,24 +194,22 @@ static void send_hid_packet(
     uint8_t hid,
     PluginState* plugin_state) {
     uint8_t hid_payload[LOGITECH_HID_TEMPLATE_SIZE] = {0};
-    build_hid_packet(0, 0, hid_payload);
-    if(hid == prev_hid)
-        inject_packet(
-            handle,
-            addr,
-            addr_size,
-            rate,
-            hid_payload,
-            LOGITECH_HID_TEMPLATE_SIZE,
-            plugin_state); // empty hid packet
+    if(hid == prev_hid) release_key(handle, addr, addr_size, rate, plugin_state);
 
     prev_hid = hid;
-    build_hid_packet(mod, hid, hid_payload);
+    build_hid_packet(
+        mod | holding_ctrl | holding_shift << 1 | holding_alt << 2 | holding_gui << 3,
+        hid,
+        hid_payload);
     inject_packet(
         handle, addr, addr_size, rate, hid_payload, LOGITECH_HID_TEMPLATE_SIZE, plugin_state);
     furi_delay_ms(12);
 }
 
+static bool ducky_end_line(const char chr) {
+    return ((chr == ' ') || (chr == '\0') || (chr == '\r') || (chr == '\n'));
+}
+
 // returns false if there was an error processing script line
 static bool mj_process_ducky_line(
     FuriHalSpiBusHandle* handle,
@@ -251,6 +282,32 @@ static bool mj_process_ducky_line(
             send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
         }
 
+        return true;
+    } else if(strncmp(line_tmp, ducky_cmd_altstring, strlen(ducky_cmd_altstring)) == 0) {
+        // ALTSTRING
+        line_tmp = &line_tmp[mj_ducky_get_command_len(line_tmp) + 1];
+        for(size_t i = 0; i < strlen(line_tmp); i++) {
+            if((line_tmp[i] < ' ') || (line_tmp[i] > '~')) {
+                continue; // Skip non-printable chars
+            }
+
+            char alt_code[4];
+            // Getting altcode of the char
+            snprintf(alt_code, 4, "%u", line_tmp[i]);
+
+            uint8_t j = 0;
+            while(!ducky_end_line(alt_code[j])) {
+                char pad_num[5] = {'N', 'U', 'M', ' ', alt_code[j]};
+                if(!mj_get_ducky_key(pad_num, 5, &dk)) return false;
+                holding_alt = true;
+                FURI_LOG_D(TAG, "Sending %s", pad_num);
+                send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
+                j++;
+            }
+            holding_alt = false;
+            release_key(handle, addr, addr_size, rate, plugin_state);
+        }
+
         return true;
     } else if(strncmp(line_tmp, ducky_cmd_repeat, strlen(ducky_cmd_repeat)) == 0) {
         // REPEAT
@@ -269,7 +326,9 @@ static bool mj_process_ducky_line(
     } else if(strncmp(line_tmp, "ALT", strlen("ALT")) == 0) {
         line_tmp = &line_tmp[mj_ducky_get_command_len(line_tmp) + 1];
         if(!mj_get_ducky_key(line_tmp, strlen(line_tmp), &dk)) return false;
-        send_hid_packet(handle, addr, addr_size, rate, dk.mod | 4, dk.hid, plugin_state);
+        holding_alt = true;
+        send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
+        holding_alt = false;
         return true;
     } else if(
         strncmp(line_tmp, "GUI", strlen("GUI")) == 0 ||
@@ -277,33 +336,47 @@ static bool mj_process_ducky_line(
         strncmp(line_tmp, "COMMAND", strlen("COMMAND")) == 0) {
         line_tmp = &line_tmp[mj_ducky_get_command_len(line_tmp) + 1];
         if(!mj_get_ducky_key(line_tmp, strlen(line_tmp), &dk)) return false;
-        send_hid_packet(handle, addr, addr_size, rate, dk.mod | 8, dk.hid, plugin_state);
+        holding_gui = true;
+        send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
+        holding_gui = false;
         return true;
     } else if(
         strncmp(line_tmp, "CTRL-ALT", strlen("CTRL-ALT")) == 0 ||
         strncmp(line_tmp, "CONTROL-ALT", strlen("CONTROL-ALT")) == 0) {
         line_tmp = &line_tmp[mj_ducky_get_command_len(line_tmp) + 1];
         if(!mj_get_ducky_key(line_tmp, strlen(line_tmp), &dk)) return false;
-        send_hid_packet(handle, addr, addr_size, rate, dk.mod | 4 | 1, dk.hid, plugin_state);
+        holding_ctrl = true;
+        holding_alt = true;
+        send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
+        holding_ctrl = false;
+        holding_alt = false;
         return true;
     } else if(
         strncmp(line_tmp, "CTRL-SHIFT", strlen("CTRL-SHIFT")) == 0 ||
         strncmp(line_tmp, "CONTROL-SHIFT", strlen("CONTROL-SHIFT")) == 0) {
         line_tmp = &line_tmp[mj_ducky_get_command_len(line_tmp) + 1];
         if(!mj_get_ducky_key(line_tmp, strlen(line_tmp), &dk)) return false;
-        send_hid_packet(handle, addr, addr_size, rate, dk.mod | 1 | 2, dk.hid, plugin_state);
+        holding_ctrl = true;
+        holding_shift = true;
+        send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
+        holding_ctrl = false;
+        holding_shift = false;
         return true;
     } else if(
         strncmp(line_tmp, "CTRL", strlen("CTRL")) == 0 ||
         strncmp(line_tmp, "CONTROL", strlen("CONTROL")) == 0) {
         line_tmp = &line_tmp[mj_ducky_get_command_len(line_tmp) + 1];
         if(!mj_get_ducky_key(line_tmp, strlen(line_tmp), &dk)) return false;
-        send_hid_packet(handle, addr, addr_size, rate, dk.mod | 1, dk.hid, plugin_state);
+        holding_ctrl = true;
+        send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
+        holding_ctrl = false;
         return true;
     } else if(strncmp(line_tmp, "SHIFT", strlen("SHIFT")) == 0) {
         line_tmp = &line_tmp[mj_ducky_get_command_len(line_tmp) + 1];
         if(!mj_get_ducky_key(line_tmp, strlen(line_tmp), &dk)) return false;
-        send_hid_packet(handle, addr, addr_size, rate, dk.mod | 2, dk.hid, plugin_state);
+        holding_shift = true;
+        send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
+        holding_shift = false;
         return true;
     } else if(
         strncmp(line_tmp, "ESC", strlen("ESC")) == 0 ||
@@ -344,6 +417,10 @@ static bool mj_process_ducky_line(
         if(!mj_get_ducky_key("SPACE", 5, &dk)) return false;
         send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
         return true;
+    } else if(strncmp(line_tmp, "TAB", strlen("TAB")) == 0) {
+        if(!mj_get_ducky_key("TAB", 3, &dk)) return false;
+        send_hid_packet(handle, addr, addr_size, rate, dk.mod, dk.hid, plugin_state);
+        return true;
     }
 
     return false;

applications/plugins/music_player/application.fam

@@ -13,7 +13,7 @@ App(
     order=20,
     fap_icon="icons/music_10px.png",
     fap_icon_assets="icons",
-    fap_category="Music",
+    fap_category="Media",
 )
 
 App(

applications/plugins/picopass/application.fam

@@ -1,6 +1,6 @@
 App(
     appid="Picopass",
-    name="PicoPass Reader",
+    name="[iClass] PicoPass",
     apptype=FlipperAppType.EXTERNAL,
     targets=["f7"],
     entry_point="picopass_app",

applications/plugins/picopass/picopass.c

@@ -171,6 +171,16 @@ void picopass_show_loading_popup(void* context, bool show) {
     }
 }
 
+bool picopass_is_memset(const uint8_t* data, const uint8_t pattern, size_t size) {
+    bool result = size > 0;
+    while(size > 0) {
+        result &= (*data == pattern);
+        data++;
+        size--;
+    }
+    return result;
+}
+
 int32_t picopass_app(void* p) {
     UNUSED(p);
     Picopass* picopass = picopass_alloc();

applications/plugins/picopass/picopass_device.c

@@ -368,7 +368,7 @@ ReturnCode picopass_device_parse_wiegand(uint8_t* data, PicopassWiegandRecord* r
 
         record->CardNumber = (bot >> 1) & 0xFFFF;
         record->FacilityCode = (bot >> 17) & 0xFF;
-        FURI_LOG_D(TAG, "FC:%u CN: %u\n", record->FacilityCode, record->CardNumber);
+        FURI_LOG_D(TAG, "FC: %u CN: %u", record->FacilityCode, record->CardNumber);
         record->valid = true;
     } else {
         record->CardNumber = 0;

applications/plugins/picopass/picopass_device.h

@@ -22,6 +22,7 @@
 #define PICOPASS_KD_BLOCK_INDEX 3
 #define PICOPASS_KC_BLOCK_INDEX 4
 #define PICOPASS_AIA_BLOCK_INDEX 5
+#define PICOPASS_PACS_CFG_BLOCK_INDEX 6
 
 #define PICOPASS_APP_FOLDER ANY_PATH("picopass")
 #define PICOPASS_APP_EXTENSION ".picopass"

applications/plugins/picopass/picopass_i.h

@@ -81,3 +81,15 @@ void picopass_blink_start(Picopass* picopass);
 void picopass_blink_stop(Picopass* picopass);
 
 void picopass_show_loading_popup(void* context, bool show);
+
+/** Check if memory is set to pattern
+ *
+ * @warning    zero size will return false
+ *
+ * @param[in]  data     Pointer to the byte array
+ * @param[in]  pattern  The pattern
+ * @param[in]  size     The byte array size
+ *
+ * @return     True if memory is set to pattern, false otherwise
+ */
+bool picopass_is_memset(const uint8_t* data, const uint8_t pattern, size_t size);

applications/plugins/picopass/picopass_worker.c

@@ -5,7 +5,8 @@
 #define TAG "PicopassWorker"
 
 const uint8_t picopass_iclass_key[] = {0xaf, 0xa7, 0x85, 0xa7, 0xda, 0xb3, 0x33, 0x78};
-const uint8_t picopass_factory_key[] = {0x76, 0x65, 0x54, 0x43, 0x32, 0x21, 0x10, 0x00};
+const uint8_t picopass_factory_credit_key[] = {0x76, 0x65, 0x54, 0x43, 0x32, 0x21, 0x10, 0x00};
+const uint8_t picopass_factory_debit_key[] = {0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87};
 
 static void picopass_worker_enable_field() {
     furi_hal_nfc_ll_txrx_on();
@@ -197,6 +198,28 @@ static ReturnCode picopass_auth_standard(uint8_t* csn, uint8_t* div_key) {
     return rfalPicoPassPollerCheck(mac, &chkRes);
 }
 
+static ReturnCode picopass_auth_factory(uint8_t* csn, uint8_t* div_key) {
+    rfalPicoPassReadCheckRes rcRes;
+    rfalPicoPassCheckRes chkRes;
+
+    ReturnCode err;
+
+    uint8_t mac[4] = {0};
+    uint8_t ccnr[12] = {0};
+
+    err = rfalPicoPassPollerReadCheck(&rcRes);
+    if(err != ERR_NONE) {
+        FURI_LOG_E(TAG, "rfalPicoPassPollerReadCheck error %d", err);
+        return err;
+    }
+    memcpy(ccnr, rcRes.CCNR, sizeof(rcRes.CCNR)); // last 4 bytes left 0
+
+    loclass_diversifyKey(csn, picopass_factory_debit_key, div_key);
+    loclass_opt_doReaderMAC(ccnr, div_key, mac);
+
+    return rfalPicoPassPollerCheck(mac, &chkRes);
+}
+
 static ReturnCode picopass_auth_dict(
     uint8_t* csn,
     PicopassPacs* pacs,
@@ -264,14 +287,23 @@ static ReturnCode picopass_auth_dict(
 ReturnCode picopass_auth(PicopassBlock* AA1, PicopassPacs* pacs) {
     ReturnCode err;
 
-    FURI_LOG_E(TAG, "Trying standard legacy key");
+    FURI_LOG_I(TAG, "Trying standard legacy key");
     err = picopass_auth_standard(
         AA1[PICOPASS_CSN_BLOCK_INDEX].data, AA1[PICOPASS_KD_BLOCK_INDEX].data);
     if(err == ERR_NONE) {
+        memcpy(pacs->key, picopass_iclass_key, PICOPASS_BLOCK_LEN);
         return ERR_NONE;
     }
 
-    FURI_LOG_E(TAG, "Starting user dictionary attack");
+    FURI_LOG_I(TAG, "Trying factory default key");
+    err = picopass_auth_factory(
+        AA1[PICOPASS_CSN_BLOCK_INDEX].data, AA1[PICOPASS_KD_BLOCK_INDEX].data);
+    if(err == ERR_NONE) {
+        memcpy(pacs->key, picopass_factory_debit_key, PICOPASS_BLOCK_LEN);
+        return ERR_NONE;
+    }
+
+    FURI_LOG_I(TAG, "Starting user dictionary attack");
     err = picopass_auth_dict(
         AA1[PICOPASS_CSN_BLOCK_INDEX].data,
         pacs,
@@ -281,7 +313,7 @@ ReturnCode picopass_auth(PicopassBlock* AA1, PicopassPacs* pacs) {
         return ERR_NONE;
     }
 
-    FURI_LOG_E(TAG, "Starting in-built dictionary attack");
+    FURI_LOG_I(TAG, "Starting system dictionary attack");
     err = picopass_auth_dict(
         AA1[PICOPASS_CSN_BLOCK_INDEX].data,
         pacs,
@@ -406,6 +438,84 @@ ReturnCode picopass_write_card(PicopassBlock* AA1) {
     return ERR_NONE;
 }
 
+ReturnCode picopass_write_block(PicopassPacs* pacs, uint8_t blockNo, uint8_t* newBlock) {
+    rfalPicoPassIdentifyRes idRes;
+    rfalPicoPassSelectRes selRes;
+    rfalPicoPassReadCheckRes rcRes;
+    rfalPicoPassCheckRes chkRes;
+
+    ReturnCode err;
+
+    uint8_t div_key[8] = {0};
+    uint8_t mac[4] = {0};
+    uint8_t ccnr[12] = {0};
+
+    err = rfalPicoPassPollerIdentify(&idRes);
+    if(err != ERR_NONE) {
+        FURI_LOG_E(TAG, "rfalPicoPassPollerIdentify error %d", err);
+        return err;
+    }
+
+    err = rfalPicoPassPollerSelect(idRes.CSN, &selRes);
+    if(err != ERR_NONE) {
+        FURI_LOG_E(TAG, "rfalPicoPassPollerSelect error %d", err);
+        return err;
+    }
+
+    err = rfalPicoPassPollerReadCheck(&rcRes);
+    if(err != ERR_NONE) {
+        FURI_LOG_E(TAG, "rfalPicoPassPollerReadCheck error %d", err);
+        return err;
+    }
+    memcpy(ccnr, rcRes.CCNR, sizeof(rcRes.CCNR)); // last 4 bytes left 0
+
+    loclass_diversifyKey(selRes.CSN, pacs->key, div_key);
+    loclass_opt_doReaderMAC(ccnr, div_key, mac);
+
+    err = rfalPicoPassPollerCheck(mac, &chkRes);
+    if(err != ERR_NONE) {
+        FURI_LOG_E(TAG, "rfalPicoPassPollerCheck error %d", err);
+        return err;
+    }
+
+    FURI_LOG_D(TAG, "rfalPicoPassPollerWriteBlock %d", blockNo);
+    uint8_t data[9] = {
+        blockNo,
+        newBlock[0],
+        newBlock[1],
+        newBlock[2],
+        newBlock[3],
+        newBlock[4],
+        newBlock[5],
+        newBlock[6],
+        newBlock[7]};
+    loclass_doMAC_N(data, sizeof(data), div_key, mac);
+    FURI_LOG_D(
+        TAG,
+        "loclass_doMAC_N %d %02x%02x%02x%02x%02x%02x%02x%02x %02x%02x%02x%02x",
+        blockNo,
+        data[1],
+        data[2],
+        data[3],
+        data[4],
+        data[5],
+        data[6],
+        data[7],
+        data[8],
+        mac[0],
+        mac[1],
+        mac[2],
+        mac[3]);
+
+    err = rfalPicoPassPollerWriteBlock(data[0], data + 1, mac);
+    if(err != ERR_NONE) {
+        FURI_LOG_E(TAG, "rfalPicoPassPollerWriteBlock error %d", err);
+        return err;
+    }
+
+    return ERR_NONE;
+}
+
 int32_t picopass_worker_task(void* context) {
     PicopassWorker* picopass_worker = context;
 
@@ -414,6 +524,8 @@ int32_t picopass_worker_task(void* context) {
         picopass_worker_detect(picopass_worker);
     } else if(picopass_worker->state == PicopassWorkerStateWrite) {
         picopass_worker_write(picopass_worker);
+    } else if(picopass_worker->state == PicopassWorkerStateWriteStandardKey) {
+        picopass_worker_write_standard_key(picopass_worker);
     }
     picopass_worker_disable_field(ERR_NONE);
 
@@ -448,7 +560,7 @@ void picopass_worker_detect(PicopassWorker* picopass_worker) {
             }
 
             // Thank you proxmark!
-            pacs->legacy = (memcmp(AA1[5].data, "\xff\xff\xff\xff\xff\xff\xff\xff", 8) == 0);
+            pacs->legacy = picopass_is_memset(AA1[5].data, 0xFF, 8);
             pacs->se_enabled = (memcmp(AA1[5].data, "\xff\xff\xff\x00\x06\xff\xff\xff", 8) == 0);
             if(pacs->se_enabled) {
                 FURI_LOG_D(TAG, "SE enabled");
@@ -520,3 +632,46 @@ void picopass_worker_write(PicopassWorker* picopass_worker) {
         furi_delay_ms(100);
     }
 }
+
+void picopass_worker_write_standard_key(PicopassWorker* picopass_worker) {
+    PicopassDeviceData* dev_data = picopass_worker->dev_data;
+    PicopassBlock* AA1 = dev_data->AA1;
+    PicopassPacs* pacs = &dev_data->pacs;
+    ReturnCode err;
+    PicopassWorkerEvent nextState = PicopassWorkerEventSuccess;
+
+    uint8_t* csn = AA1[PICOPASS_CSN_BLOCK_INDEX].data;
+    uint8_t* configBlock = AA1[PICOPASS_CONFIG_BLOCK_INDEX].data;
+    uint8_t fuses = configBlock[7];
+    uint8_t* oldKey = AA1[PICOPASS_KD_BLOCK_INDEX].data;
+
+    uint8_t newKey[PICOPASS_BLOCK_LEN] = {0};
+    loclass_diversifyKey(csn, picopass_iclass_key, newKey);
+
+    if((fuses & 0x80) == 0x80) {
+        FURI_LOG_D(TAG, "Plain write for personalized mode key change");
+    } else {
+        FURI_LOG_D(TAG, "XOR write for application mode key change");
+        // XOR when in application mode
+        for(size_t i = 0; i < PICOPASS_BLOCK_LEN; i++) {
+            newKey[i] ^= oldKey[i];
+        }
+    }
+
+    while(picopass_worker->state == PicopassWorkerStateWriteStandardKey) {
+        if(picopass_detect_card(1000) == ERR_NONE) {
+            err = picopass_write_block(pacs, PICOPASS_KD_BLOCK_INDEX, newKey);
+            if(err != ERR_NONE) {
+                FURI_LOG_E(TAG, "picopass_write_block error %d", err);
+                nextState = PicopassWorkerEventFail;
+            }
+
+            // Notify caller and exit
+            if(picopass_worker->callback) {
+                picopass_worker->callback(nextState, picopass_worker->context);
+            }
+            break;
+        }
+        furi_delay_ms(100);
+    }
+}

applications/plugins/picopass/picopass_worker.h

@@ -12,6 +12,7 @@ typedef enum {
     // Main worker states
     PicopassWorkerStateDetect,
     PicopassWorkerStateWrite,
+    PicopassWorkerStateWriteStandardKey,
     // Transition
     PicopassWorkerStateStop,
 } PicopassWorkerState;

applications/plugins/picopass/picopass_worker_i.h

@@ -31,3 +31,4 @@ int32_t picopass_worker_task(void* context);
 
 void picopass_worker_detect(PicopassWorker* picopass_worker);
 void picopass_worker_write(PicopassWorker* picopass_worker);
+void picopass_worker_write_standard_key(PicopassWorker* picopass_worker);

applications/plugins/picopass/scenes/picopass_scene_config.h

@@ -11,3 +11,5 @@ ADD_SCENE(picopass, delete, Delete)
 ADD_SCENE(picopass, delete_success, DeleteSuccess)
 ADD_SCENE(picopass, write_card, WriteCard)
 ADD_SCENE(picopass, write_card_success, WriteCardSuccess)
+ADD_SCENE(picopass, read_factory_success, ReadFactorySuccess)
+ADD_SCENE(picopass, write_key, WriteKey)

applications/plugins/picopass/scenes/picopass_scene_read_card.c

@@ -1,6 +1,8 @@
 #include "../picopass_i.h"
 #include <dolphin/dolphin.h>
 
+const uint8_t picopass_factory_key_check[] = {0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87};
+
 void picopass_read_card_worker_callback(PicopassWorkerEvent event, void* context) {
     UNUSED(event);
     Picopass* picopass = context;
@@ -34,7 +36,14 @@ bool picopass_scene_read_card_on_event(void* context, SceneManagerEvent event) {
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == PicopassCustomEventWorkerExit) {
-            scene_manager_next_scene(picopass->scene_manager, PicopassSceneReadCardSuccess);
+            if(memcmp(
+                   picopass->dev->dev_data.pacs.key,
+                   picopass_factory_key_check,
+                   PICOPASS_BLOCK_LEN) == 0) {
+                scene_manager_next_scene(picopass->scene_manager, PicopassSceneReadFactorySuccess);
+            } else {
+                scene_manager_next_scene(picopass->scene_manager, PicopassSceneReadCardSuccess);
+            }
             consumed = true;
         }
     }

applications/plugins/picopass/scenes/picopass_scene_read_card_success.c

@@ -15,6 +15,7 @@ void picopass_scene_read_card_success_widget_callback(
 
 void picopass_scene_read_card_success_on_enter(void* context) {
     Picopass* picopass = context;
+
     FuriString* csn_str = furi_string_alloc_set("CSN:");
     FuriString* credential_str = furi_string_alloc();
     FuriString* wiegand_str = furi_string_alloc();
@@ -30,27 +31,31 @@ void picopass_scene_read_card_success_on_enter(void* context) {
     PicopassPacs* pacs = &picopass->dev->dev_data.pacs;
     Widget* widget = picopass->widget;
 
-    uint8_t csn[PICOPASS_BLOCK_LEN];
-    memcpy(csn, &AA1->data[PICOPASS_CSN_BLOCK_INDEX], PICOPASS_BLOCK_LEN);
+    uint8_t csn[PICOPASS_BLOCK_LEN] = {0};
+    memcpy(csn, AA1[PICOPASS_CSN_BLOCK_INDEX].data, PICOPASS_BLOCK_LEN);
     for(uint8_t i = 0; i < PICOPASS_BLOCK_LEN; i++) {
         furi_string_cat_printf(csn_str, "%02X ", csn[i]);
     }
 
-    // Neither of these are valid.  Indicates the block was all 0x00 or all 0xff
-    if(pacs->record.bitLength == 0 || pacs->record.bitLength == 255) {
+    bool no_key = picopass_is_memset(pacs->key, 0x00, PICOPASS_BLOCK_LEN);
+    bool empty =
+        picopass_is_memset(AA1[PICOPASS_PACS_CFG_BLOCK_INDEX].data, 0xFF, PICOPASS_BLOCK_LEN);
+
+    if(no_key) {
         furi_string_cat_printf(wiegand_str, "Read Failed");
 
         if(pacs->se_enabled) {
             furi_string_cat_printf(credential_str, "SE enabled");
         }
+    } else if(empty) {
+        furi_string_cat_printf(wiegand_str, "Empty");
+    } else if(pacs->record.bitLength == 0 || pacs->record.bitLength == 255) {
+        // Neither of these are valid.  Indicates the block was all 0x00 or all 0xff
+        furi_string_cat_printf(wiegand_str, "Invalid PACS");
 
-        widget_add_button_element(
-            widget,
-            GuiButtonTypeLeft,
-            "Retry",
-            picopass_scene_read_card_success_widget_callback,
-            picopass);
-
+        if(pacs->se_enabled) {
+            furi_string_cat_printf(credential_str, "SE enabled");
+        }
     } else {
         size_t bytesLength = 1 + pacs->record.bitLength / 8;
         furi_string_set(credential_str, "");
@@ -82,13 +87,6 @@ void picopass_scene_read_card_success_on_enter(void* context) {
             }
         }
 
-        widget_add_button_element(
-            widget,
-            GuiButtonTypeLeft,
-            "Retry",
-            picopass_scene_read_card_success_widget_callback,
-            picopass);
-
         widget_add_button_element(
             widget,
             GuiButtonTypeRight,
@@ -97,6 +95,13 @@ void picopass_scene_read_card_success_on_enter(void* context) {
             picopass);
     }
 
+    widget_add_button_element(
+        widget,
+        GuiButtonTypeLeft,
+        "Retry",
+        picopass_scene_read_card_success_widget_callback,
+        picopass);
+
     widget_add_string_element(
         widget, 64, 5, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(csn_str));
     widget_add_string_element(

applications/plugins/picopass/scenes/picopass_scene_read_factory_success.c

@@ -0,0 +1,78 @@
+#include "../picopass_i.h"
+#include <dolphin/dolphin.h>
+
+void picopass_scene_read_factory_success_widget_callback(
+    GuiButtonType result,
+    InputType type,
+    void* context) {
+    furi_assert(context);
+    Picopass* picopass = context;
+
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(picopass->view_dispatcher, result);
+    }
+}
+
+void picopass_scene_read_factory_success_on_enter(void* context) {
+    Picopass* picopass = context;
+    FuriString* title = furi_string_alloc_set("Factory Default");
+    FuriString* subtitle = furi_string_alloc_set("");
+
+    DOLPHIN_DEED(DolphinDeedNfcReadSuccess);
+
+    // Send notification
+    notification_message(picopass->notifications, &sequence_success);
+
+    // Setup view
+    Widget* widget = picopass->widget;
+    //PicopassPacs* pacs = &picopass->dev->dev_data.pacs;
+    PicopassBlock* AA1 = picopass->dev->dev_data.AA1;
+
+    uint8_t* configBlock = AA1[PICOPASS_CONFIG_BLOCK_INDEX].data;
+    uint8_t fuses = configBlock[7];
+
+    if((fuses & 0x80) == 0x80) {
+        furi_string_cat_printf(subtitle, "Personalization mode");
+    } else {
+        furi_string_cat_printf(subtitle, "Application mode");
+    }
+
+    widget_add_button_element(
+        widget,
+        GuiButtonTypeCenter,
+        "Write Standard iClass Key",
+        picopass_scene_read_factory_success_widget_callback,
+        picopass);
+
+    widget_add_string_element(
+        widget, 64, 5, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(title));
+    widget_add_string_element(
+        widget, 64, 20, AlignCenter, AlignCenter, FontPrimary, furi_string_get_cstr(subtitle));
+
+    furi_string_free(title);
+    furi_string_free(subtitle);
+
+    view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewWidget);
+}
+
+bool picopass_scene_read_factory_success_on_event(void* context, SceneManagerEvent event) {
+    Picopass* picopass = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeLeft) {
+            consumed = scene_manager_previous_scene(picopass->scene_manager);
+        } else if(event.event == GuiButtonTypeCenter) {
+            scene_manager_next_scene(picopass->scene_manager, PicopassSceneWriteKey);
+            consumed = true;
+        }
+    }
+    return consumed;
+}
+
+void picopass_scene_read_factory_success_on_exit(void* context) {
+    Picopass* picopass = context;
+
+    // Clear view
+    widget_reset(picopass->widget);
+}

applications/plugins/picopass/scenes/picopass_scene_write_card_success.c

@@ -16,6 +16,7 @@ void picopass_scene_write_card_success_widget_callback(
 void picopass_scene_write_card_success_on_enter(void* context) {
     Picopass* picopass = context;
     Widget* widget = picopass->widget;
+    FuriString* str = furi_string_alloc_set("Write Success!");
 
     DOLPHIN_DEED(DolphinDeedNfcReadSuccess);
 
@@ -29,6 +30,18 @@ void picopass_scene_write_card_success_on_enter(void* context) {
         picopass_scene_write_card_success_widget_callback,
         picopass);
 
+    widget_add_button_element(
+        widget,
+        GuiButtonTypeRight,
+        "Menu",
+        picopass_scene_write_card_success_widget_callback,
+        picopass);
+
+    widget_add_string_element(
+        widget, 64, 5, AlignCenter, AlignCenter, FontSecondary, furi_string_get_cstr(str));
+
+    furi_string_free(str);
+
     view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewWidget);
 }
 

applications/plugins/picopass/scenes/picopass_scene_write_key.c

@@ -0,0 +1,53 @@
+#include "../picopass_i.h"
+#include <dolphin/dolphin.h>
+
+void picopass_write_key_worker_callback(PicopassWorkerEvent event, void* context) {
+    UNUSED(event);
+    Picopass* picopass = context;
+    view_dispatcher_send_custom_event(picopass->view_dispatcher, PicopassCustomEventWorkerExit);
+}
+
+void picopass_scene_write_key_on_enter(void* context) {
+    Picopass* picopass = context;
+    DOLPHIN_DEED(DolphinDeedNfcSave);
+
+    // Setup view
+    Popup* popup = picopass->popup;
+    popup_set_header(popup, "Writing\niClass\nkey", 68, 30, AlignLeft, AlignTop);
+    popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
+
+    // Start worker
+    view_dispatcher_switch_to_view(picopass->view_dispatcher, PicopassViewPopup);
+    picopass_worker_start(
+        picopass->worker,
+        PicopassWorkerStateWriteStandardKey,
+        &picopass->dev->dev_data,
+        picopass_write_key_worker_callback,
+        picopass);
+
+    picopass_blink_start(picopass);
+}
+
+bool picopass_scene_write_key_on_event(void* context, SceneManagerEvent event) {
+    Picopass* picopass = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == PicopassCustomEventWorkerExit) {
+            scene_manager_next_scene(picopass->scene_manager, PicopassSceneWriteCardSuccess);
+            consumed = true;
+        }
+    }
+    return consumed;
+}
+
+void picopass_scene_write_key_on_exit(void* context) {
+    Picopass* picopass = context;
+
+    // Stop worker
+    picopass_worker_stop(picopass->worker);
+    // Clear view
+    popup_reset(picopass->popup);
+
+    picopass_blink_stop(picopass);
+}

applications/plugins/playlist/application.fam

@@ -8,6 +8,6 @@ App(
     stack_size=2 * 1024,
     order=14,
     fap_icon="playlist_10px.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
     fap_icon_assets="images",
 )

applications/plugins/pocsag_pager/application.fam

@@ -8,6 +8,6 @@ App(
     stack_size=4 * 1024,
     order=50,
     fap_icon="pocsag_pager_10px.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
     fap_icon_assets="images",
 )

applications/plugins/protoview/application.fam

@@ -8,5 +8,5 @@ App(
     stack_size=8*1024,
     order=50,
     fap_icon="appicon.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
 )

applications/plugins/signal_generator/application.fam

@@ -8,6 +8,6 @@ App(
     stack_size=1 * 1024,
     order=50,
     fap_icon="signal_gen_10px.png",
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_icon_assets="icons",
 )

applications/plugins/spectrum_analyzer/application.fam

@@ -8,5 +8,5 @@ App(
     stack_size=2 * 1024,
     order=12,
     fap_icon="spectrum_10px.png",
-    fap_category="Tools",
+    fap_category="Sub-GHz",
 )

applications/plugins/spi_mem_manager/application.fam

@@ -7,7 +7,7 @@ App(
     stack_size=1 * 2048,
     order=30,
     fap_icon="images/Dip8_10px.png",
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_icon_assets="images",
     fap_private_libs=[
         Lib(

applications/plugins/swd_probe/.gitignore

@@ -0,0 +1,52 @@
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf

applications/plugins/swd_probe/LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.