Merge branch 'dev' into release

.ci_files/anims_ofw.txt

@@ -140,3 +140,10 @@ Max butthurt: 10
 Min level: 3
 Max level: 3
 Weight: 3
+
+Name: L1_Sleigh_ride_128x64
+Min butthurt: 0
+Max butthurt: 14
+Min level: 1
+Max level: 3
+Weight: 4

.drone.yml

@@ -2,6 +2,10 @@ kind: pipeline
 type: docker
 name: "Release firmware"
 
+platform:
+  os: linux
+  arch: amd64
+
 steps:
   - name: "Update submodules"
     image: alpine/git
@@ -92,7 +96,7 @@ steps:
       - ls -laS ${DRONE_TAG}
 
   - name: "Upload default to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -113,7 +117,7 @@ steps:
         - ${DRONE_TAG}/*.bin
 
   - name: "Upload no-anims to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -128,7 +132,7 @@ steps:
       source: flipper-z-f7-update-${DRONE_TAG}n.tgz
 
   - name: "Upload extra apps version to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -249,6 +253,10 @@ kind: pipeline
 type: docker
 name: "Dev build"
 
+platform:
+  os: linux
+  arch: amd64
+
 steps:
   - name: "Update submodules"
     image: alpine/git
@@ -273,17 +281,38 @@ steps:
       FBT_TOOLS_CUSTOM_LINK:
         from_secret: fbt_link
 
+  - name: "Build dev with extra apps"
+    image: hfdj/fztools
+    pull: never
+    commands:
+      - git clone https://github.com/xMasterX/unleashed-extra-pack.git
+      - cp -R unleashed-extra-pack/apps/* assets/resources/apps/
+      - rm -rf unleashed-extra-pack
+      - export DIST_SUFFIX=${DRONE_BUILD_NUMBER}e
+      - export WORKFLOW_BRANCH_OR_TAG=dev-cfw
+      - export FORCE_NO_DIRTY=yes
+      - rm -f build/f7-firmware-C/toolbox/version.*
+      - ./fbt COMPACT=1 DEBUG=0 updater_package
+      - mkdir artifacts-extra-apps
+      - mv dist/f7-C/* artifacts-extra-apps/
+      - ls -laS artifacts-extra-apps
+      - ls -laS artifacts-extra-apps/f7-update-${DRONE_BUILD_NUMBER}e
+    environment:
+      FBT_TOOLS_CUSTOM_LINK:
+        from_secret: fbt_link
+
   - name: "Bundle self-update packages"
     image: kramos/alpine-zip
     commands:
+      - cp artifacts-extra-apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz .
       - cp artifacts-default/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz .
       - rm -rf artifacts-default/f7-update-${DRONE_BUILD_NUMBER}
       - ls -laS artifacts-default
       - mv artifacts-default/ dev
       - ls -laS dev
 
   - name: "Clean dev folder"
-    image: appleboy/drone-ssh
+    image: appleboy/drone-ssh:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -298,7 +327,7 @@ steps:
         - cd web/unleashedflip.com/public_html/fw/dev && rm -f ./*
 
   - name: "Upload default to updates srv"
-    image: appleboy/drone-scp
+    image: appleboy/drone-scp:linux-amd64
     settings:
       host:
         from_secret: dep_host
@@ -318,6 +347,21 @@ steps:
         - dev/*.dfu
         - dev/*.bin
 
+  - name: "Upload extra apps version to updates srv"
+    image: appleboy/drone-scp:linux-amd64
+    settings:
+      host:
+        from_secret: dep_host
+      username:
+        from_secret: dep_user
+      password:
+        from_secret: dep_passwd
+      port:
+        from_secret: dep_port
+      target:
+        from_secret: dep_target_extra
+      source: flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz
+
   - name: "Trigger update server reindex"
     image: hfdj/fztools
     pull: never
@@ -348,6 +392,9 @@ steps:
         Commit: {{commit.message}}
 
 
+        [-Version with extra apps - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_extra_apps/flipper-z-f7-update-${DRONE_BUILD_NUMBER}e.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER}e)
+
+
         [-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER})"
       document:
         - dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz

.github/FUNDING.yml

@@ -1,2 +1,7 @@
 ko_fi: masterx
-custom: ['https://boosty.to/mmxdev', 'https://destream.net/live/MMX/donate', 'https://pay.cloudtips.ru/p/7b3e9d65', 'https://yoomoney.ru/fundraise/XA49mgQLPA0.221209']
+custom:
+  [
+    "https://boosty.to/mmxdev",
+    "https://pay.cloudtips.ru/p/7b3e9d65",
+    "https://yoomoney.ru/fundraise/XA49mgQLPA0.221209",
+  ]

.gitignore

@@ -30,6 +30,10 @@ Brewfile.lock.json
 # Visual Studio Code
 .vscode/
 
+# Kate
+.kateproject
+.kateconfig
+
 # legendary cmake's
 build
 CMakeLists.txt

.pvsoptions

@@ -1 +1 @@
---rules-config .pvsconfig -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/ST25RFAL002 -e lib/STM32CubeWB -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/* -e applications/plugins/dap_link/lib/free-dap
+--ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/ST25RFAL002 -e lib/STM32CubeWB -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/* -e applications/plugins/dap_link/lib/free-dap

.vscode/example/tasks.json

@@ -105,6 +105,12 @@
             "type": "shell",
             "command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full"
         },
+        {
+            "label": "[Debug] Create PVS-Studio report",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt firmware_pvs"
+        },
         {
             "label": "[Debug] Build FAPs",
             "group": "build",
@@ -138,14 +144,26 @@
                 "Serial Console"
             ]
         },
+        {
+            "label": "[Debug] Build and upload all FAPs to Flipper over USB",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt fap_deploy"
+        },
+        {
+            "label": "[Release] Build and upload all FAPs to Flipper over USB",
+            "group": "build",
+            "type": "shell",
+            "command": "./fbt COMPACT=1 DEBUG=0 fap_deploy"
+        },
         {
             // Press Ctrl+] to quit
             "label": "Serial Console",
             "type": "shell",
             "command": "./fbt cli",
             "group": "none",
             "isBackground": true,
-			"options": {
+            "options": {
                 "env": {
                     "FBT_NO_SYNC": "0"
                 }
@@ -162,4 +180,4 @@
             }
         }
     ]
-}
+}

CHANGELOG.md

@@ -1,50 +1,28 @@
 ### New changes
-* CI/CD: Builds with extra apps pack included, see new option below
-* SubGHz: Allow manual creation of Nice Flor S, Nice Smilo
-* LF RFID: Allow removing password from T5577 to make it operational (PR #225 | by @TQMatvey & Tobirg (grvpvl))
-* Plugins -> Barcode Generator: Save last used barcode, and load on app start
-* Plugins -> Barcode Generator: Add EAN-13 support (PR #234 | by @gid9798)
-* Plugins -> Arkanoid: Fix bug with unability to continue game after first level
-* Plugins -> Morse Code: Fixed crashes, fixed known issues (PR #249 | by @gid9798)
-* Plugins -> USB Keyboard & Mouse: Added ESCAPE key (PR #243 | by @huuck)
-* Plugins -> USB Keyboard & Mouse: Added Delete key
-* Plugins -> SubGHz Bruteforcer: Add holtek HT12X protocol support
-* Plugins -> POCSAG Pager: Fix UI bug
-* Plugins -> Wifi Marauder: Enable +5volt on plugin start, to allow usage with custom boards
-* Plugins: Add 2048 Game (PR #233 | by @eugene-kirzhanov)
-* Plugins: Update TOTP, UniTemp, Wifi marauder to latest commits from their repo's
-* Infrared: Universal remote assets updates (by @amec0e | PRs #246 #242)
-* Readme fixes (PR #247 | by @Kavitate)
-* New Year update slideshow (by @Svaarich)
-* Show OTP flipper region on debug and about screens
-* OFW: Add float_tools to SDK api
-* OFW: Gui: change data ownership model in submenu, own text by default 
-* OFW: Gui: Direct Draw API
-* OFW: Mifare dictionary attack performance improvements.
-* OFW: SubGhz: CAME 12 bit encoder fix guard time
-* OFW: Fix MFC bruteforce progress bar 
-* OFW: Docs and readme's updates
-* OFW: Picopass read bug fixes
-* OFW: OpenOCD scripts
-* OFW: New MFC Bruteforce animation
-* OFW: File browser: Empty folder label
-* OFW: SubGhz: add Holtek_ht12x protocol
-* OFW: USB/BLE HID Remote icon fix
-* OFW: Fix quoted error for macOS bad-usb
-* OFW: Modules: locking view model
-* OFW: Fix PVS-Studio warnings 
-* OFW: Fix unit tests
-* OFW: WeatherStation: fix incorrect history index increment
-* OFW: File format docs: RFID, iButton, BadUSB
-* OFW: SubGhz: fix start navigation
-* OFW: iButton: fixed notification on successful read 
-* OFW: Archive browser delete fix
-* OFW: Fixes: correct scrolling text
-* OFW: SubGhz: fix Hormann HSM
-* OFW: Rework BLE key storage
-* OFW: Gui: scrollable long file names in FileBrowser and Archive Browser
-* OFW: Untangle NFC_APP_FOLDER from nfc_device
-* OFW: WS: add choice fahrenheit/celsius (can be set from flipper settings -> system)
+* SubGHz: **Somfy Telis Encoder** (PR #289 | by @assasinfil & @TQMatvey)
+* SubGHz: Add 350Mhz to default range
+* Plugins -> Solitaire: Fix for solitaire card placement bug (PR #253 | by @teeebor)
+* Plugins -> UniTemp (New sensors added), TOTP - Updated to latest commits
+* Plugins -> Added Text Viewer [(by kowalski7cc & kyhwana)](https://github.com/kowalski7cc/flipper-zero-text-viewer/tree/refactor-text-app)
+* Plugins -> Added **UART Terminal** [(by cool4uma)](https://github.com/cool4uma/UART_Terminal/tree/main)
+* Plugins -> Added **ProtoView** [(by antirez)](https://github.com/antirez/protoview)
+* Plugins -> WAV Player - Replaced with fixed and improved version by [@LTVA1](https://github.com/LTVA1/wav_player)
+* Clock: Fix 12AM was displaying as 00 AM (PR #288 | by @Smileycathy1128)
+* Infrared: Allow disabling automatic signal decoding (aka Learn RAW) - works only when debug enabled (PR #273 | by @darmiel)
+* Infrared: Update universal remote assets (by @amec0e)
+* Desktop: New battery display (Bar %) - (PR #278 | by @Fasjeit)
+* BadUSB: Adding CZ keyboard layout (PR #255 | by @peoblouk)
+* OFW: Various improvements: Toolbox, Updater and Unit Tests. 
+* OFW: Fix typos in source code
+* OFW: Add the sleigh ride animation
+* OFW: Documentation: edit texts, markdown linting 
+* OFW: Change broken BadUSB link to Hak5 duckyscript quick reference webpage
+* OFW: **Per protocol signal repeat count** - **Fixes issues with Sony remotes with SIRC protocol (bruteforce also fixed now!)**
+* OFW: Add the ability to turn pages in infrared 
+* OFW: **BadUSB backspace/delete fix**
+* OFW: relocate R_ARM_CALL
+* OFW: fbt: PVS support
+* OFW: fbt: removed DEBUG_TOOLS & FAP_EXAMPLES flags
 
 #### [🎲 Download latest extra apps pack](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps)
 
@@ -55,7 +33,6 @@
 ## Please support development of the project
 * Boosty: https://boosty.to/mmxdev
 * Ko-Fi: https://ko-fi.com/masterx
-* destream (100 EUR min): https://destream.net/live/MMX/donate
 * cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
 * YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
 * USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`

ReadMe.md

@@ -71,6 +71,7 @@ Also check the changelog in releases for latest updates!
 - BFT Mitto [External seed calculation required (For info contact me in Discord: Nano#8998)] 
 - Security+ v1 & v2
 - Star Line
+- Somfy Telis (by @assasinfil & @TQMatvey)
 
 ## Please support development of the project
 The majority of this project is developed and maintained by me, @xMasterX.
@@ -86,7 +87,6 @@ Also, regarding our releases, every build has and always will be free and open-s
 You can support us by using links or addresses below:
 * Boosty: https://boosty.to/mmxdev
 * Ko-Fi: https://ko-fi.com/masterx
-* destream (100 EUR min): https://destream.net/live/MMX/donate
 * cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
 * YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
 * USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`
@@ -100,34 +100,36 @@ You can support us by using links or addresses below:
 
 ### Community apps included:
 
-- RFID Fuzzer plugin [(by Ganapati & @xMasterX)](https://github.com/DarkFlippers/unleashed-firmware/pull/54) & New protocols by @mvanzanten
-- Sub-GHz bruteforce plugin [(by @derskythe & xMasterX)](https://github.com/derskythe/flipperzero-subbrute) [(original by Ganapati & xMasterX)](https://github.com/DarkFlippers/unleashed-firmware/pull/57)
-- Sub-GHz playlist plugin [(by darmiel)](https://github.com/DarkFlippers/unleashed-firmware/pull/62)
+- **RFID Fuzzer** [(by Ganapati & @xMasterX)](https://github.com/DarkFlippers/unleashed-firmware/pull/54) & New protocols by @mvanzanten
+- **Sub-GHz bruteforcer** [(by @derskythe & xMasterX)](https://github.com/derskythe/flipperzero-subbrute) [(original by Ganapati & xMasterX)](https://github.com/DarkFlippers/unleashed-firmware/pull/57)
+- **Sub-GHz playlist** [(by darmiel)](https://github.com/DarkFlippers/unleashed-firmware/pull/62)
 - 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 plugin (fixed) [(OFW: DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player)
+- 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)
 - ESP32: WiFi Marauder companion plugin [(by 0xchocolate)](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion)
 - NRF24: Sniffer & MouseJacker (with changes) [(by mothball187)](https://github.com/mothball187/flipperzero-nrf24/tree/main/mousejacker)
 - Simple Clock (timer by GMMan / settings by kowalski7cc) [(original by CompaqDisc)](https://gist.github.com/CompaqDisc/4e329c501bd03c1e801849b81f48ea61)
-- UniversalRF Remix / Sub-GHz Remote [(by @darmiel & @xMasterX)](https://github.com/darmiel/flipper-playlist/tree/feat/unirf-protocols) (original by @ESurge)
+- **Sub-GHz Remote** (UniversalRF Remix) [(by @darmiel & @xMasterX)](https://github.com/darmiel/flipper-playlist/tree/feat/unirf-protocols) (original by @ESurge)
 - Spectrum Analyzer (with changes) [(by jolcese)](https://github.com/jolcese/flipperzero-firmware/tree/spectrum/applications/spectrum_analyzer) - [Ultra Narrow mode & scan channels non-consecutively](https://github.com/theY4Kman/flipperzero-firmware/commits?author=theY4Kman)
 - Metronome [(by panki27)](https://github.com/panki27/Metronome)
 - DTMF Dolphin [(by litui)](https://github.com/litui/dtmf_dolphin)
 - **TOTP (Authenticator)** [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
 - GPS [(by ezod)](https://github.com/ezod/flipperzero-gps) works with module `NMEA 0183` via UART (13TX, 14RX, GND pins on Flipper)
 - i2c Tools [(by NaejEL)](https://github.com/NaejEL/flipperzero-i2ctools) - C0 -> SCL / C1 -> SDA / GND -> GND | 3v3 logic levels only!
-- Temperature Sensor Plugin - HTU2xD, SHT2x, SI702x, SI700x, SI701x, AM2320 [(by Mywk)](https://github.com/Mywk/FlipperTemperatureSensor) - [How to Connect](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/htu21d_temp_sensor/Readme.md)
 - HC-SR04 Distance sensor - Ported and modified by @xMasterX [(original by Sanqui)](https://github.com/Sanqui/flipperzero-firmware/tree/hc_sr04) - How to connect -> (5V -> VCC) / (GND -> GND) / (13|TX -> Trig) / (14|RX -> Echo)
 - Morse Code [(by wh00hw)](https://github.com/wh00hw/MorseCodeFAP)
-- (UniTemp) Temp sensor reader [(by quen0n)](https://github.com/quen0n/unitemp-flipperzero)
+- **Unitemp - Temperature sensors reader** (DHT11/22, DS18B20, BMP280, HTU21x and more) [(by quen0n)](https://github.com/quen0n/unitemp-flipperzero)
 - BH1750 - Lightmeter [(by oleksiikutuzov)](https://github.com/oleksiikutuzov/flipperzero-lightmeter)
-- iButton Fuzzer [(by xMasterX)](https://github.com/xMasterX/ibutton-fuzzer)
+- **iButton Fuzzer** [(by xMasterX)](https://github.com/xMasterX/ibutton-fuzzer)
 - HEX Viewer [(by QtRoS)](https://github.com/QtRoS/flipper-zero-hex-viewer)
 - POCSAG Pager [(by xMasterX & Shmuma)](https://github.com/xMasterX/flipper-pager)
+- 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)
 
 Games:
 - DOOM (fixed) [(by p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
@@ -180,11 +182,7 @@ Games:
 
 ### **Plugins that works with external hardware**
 
-## [- How to use: Temperature Sensor Plugin - HTU21D / SI7021](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/htu21d_temp_sensor/Readme.md)
-
-## [- How to use: DHT11/22 Temp. Sensor Monitor](https://github.com/quen0n/FipperZero-DHT-Monitor#readme)
-
-## [- How to use: AM2320/AM2321 Temp. Sensor plugin](https://github.com/xMasterX/AM2320_Flipper_Plugin)
+## [- How to use: Unitemp - Temperature sensors reader](https://github.com/quen0n/unitemp-flipperzero#readme)
 
 ## [- How to use: [NMEA] GPS](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/plugins/gps_nmea_uart/README.md)
 

SConstruct

@@ -148,9 +148,12 @@ fap_dist = [
             for app_artifact in firmware_env["FW_EXTAPPS"].applications.values()
         ),
     ),
-    distenv.Install(
-        f"#/dist/{dist_dir}/apps",
-        "#/assets/resources/apps",
+    *(
+        distenv.Install(
+            f"#/dist/{dist_dir}/apps/{app_artifact.app.fap_category}",
+            app_artifact.compact[0],
+        )
+        for app_artifact in firmware_env["FW_EXTAPPS"].applications.values()
     ),
 ]
 Depends(
@@ -165,6 +168,14 @@ Alias("fap_dist", fap_dist)
 
 distenv.Depends(firmware_env["FW_RESOURCES"], firmware_env["FW_EXTAPPS"].resources_dist)
 
+# Copy all faps to device
+
+fap_deploy = distenv.PhonyTarget(
+    "fap_deploy",
+    "${PYTHON3} ${ROOT_DIR}/scripts/storage.py send ${SOURCE} /ext/apps",
+    source=Dir("#/assets/resources/apps"),
+)
+
 
 # Target for bundling core2 package for qFlipper
 copro_dist = distenv.CoproBuilder(