Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev --nobuild

ChangeLog.md

@@ -58,7 +58,9 @@
 - OFW: Loader: Fix crash on locked via cli loader (by @DrZlo13)
 - OFW: Archive: Fix memory leak in favorites add/remove (by @skotopes)
 - OFW: Accessor: Disable expansion service on start (by @skotopes)
+- OFW: Debug: Backup openocd work area, fix crash after fresh debugger connect and continue (by @skotopes)
 - OFW: Cleanup of various warnings from clangd (by @hedger)
+- OFW: ReadMe: update outdated bits and pieces (by @skotopes)
 
 ### Removed:
 - Furi: Temp disabled `FURI_TRACE` due to DFU size, some crashes will say "furi_check failed" instead of source path

lib/ReadMe.md

@@ -1,17 +1,18 @@
 # Structure
 
-- `FreeRTOS-Kernel`     - FreeRTOS kernel source code
-- `FreeRTOS-glue`       - Extra glue to hold together FreeRTOS kernel and flipper firmware
 - `app-scened-template` - C++ app library
 - `bit_lib`             - library for working with bits/bytes directly
-- `callback-connector`  - Callback connector library
+- `ble_profile`         - BLE Profiles source code
 - `cmsis_core`          - CMSIS Core package, contain cortex-m core headers
 - `cxxheaderparser`     - C++ headers parser, used by SDK bundler
+- `datetime`            - DateTime library
 - `digital_signal`      - Digital signal library: used by NFC for software implemented protocols
 - `drivers`             - Various flipper drivers
 - `fatfs`               - FatFS file system driver
 - `flipper_application` - Flipper application library, used for FAPs
 - `flipper_format`      - Flipper File Format library
+- `FreeRTOS-glue`       - Extra glue to hold together FreeRTOS kernel and flipper firmware
+- `FreeRTOS-Kernel`     - FreeRTOS kernel source code
 - `heatshrink`          - Heatshrink compression library
 - `ibutton`             - ibutton library, used by iButton application
 - `infrared`            - Infrared library, used by Infrared application
@@ -20,7 +21,9 @@
 - `littlefs`            - LittleFS file system driver, used by internal storage
 - `mbedtls`             - MbedTLS cryptography library
 - `microtar`            - MicroTAR library
+- `mjs`                 - MJs, javascript engine library
 - `mlib`                - M-Lib C containers library
+- `music_worker`        - MusicWorker library for playing midi and RTTTL files
 - `nanopb`              - NanoPB library, protobuf implementation for MCU
 - `nfc`                 - NFC library, used by NFC application
 - `one_wire`            - OneWire library, used by iButton application
@@ -33,4 +36,4 @@
 - `subghz`              - Subghz library, used by SubGhz application
 - `toolbox`             - Toolbox library, contains various things that is used by Flipper firmware
 - `u8g2`                - u8g2 graphics library, used by GUI subsystem
-- `update_util`         - update utilities library, used by updater
+- `update_util`         - update utilities library, used by updater

scripts/debug/stm32wbx.cfg

@@ -44,7 +44,7 @@ if {[using_jtag]} {
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 
-$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
+$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 1
 
 set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME

targets/ReadMe.md

@@ -1,22 +1,5 @@
-# Flipper firmware
-
-What does it do?
-
-- [x] RTOS
-- [x] FuriHAL
-- [x] FuriCore
-- [x] Services
-- [x] Applications
-
 # Targets
 
-| Name      | Firmware Address  | Reset Combo           | DFU Combo             |
-|-----------|-------------------|-----------------------|-----------------------|
-| f7        | 0x08000000        | L+Back, release both  | L+Back, release Back  |
-
-Also, there is a "hardware" ST bootloader combo available even on a bricked or empty device: L+Ok+Back, release Back, Left.
-Target independent code and headers in `target/include` folders. More details in `documentation/KeyCombo.md`
-
-# Building
-
-Check out `documentation/fbt.md` on how to build and flash firmware.
+- f18               - Not Flipper Zero
+- f7                - Flipper Zero
+- furi_hal_include  - Global Furi HAL includes, common for all targets