Merge branch 'dev' into release

DarkFlippers · May 24, 2024 · cb5eafb · cb5eafb
2 parents 619aeac + 83d85ec
commit cb5eafb
Show file tree

Hide file tree

Showing 242 changed files with 4,404 additions and 1,829 deletions.
diff --git a/.ci_files/anims_ofw.txt b/.ci_files/anims_ofw.txt
@@ -189,3 +189,10 @@ Max butthurt: 12
 Min level: 3
 Max level: 3
 Weight: 5
+
+Name: L1_Akira_128x64
+Min butthurt: 0
+Max butthurt: 8
+Min level: 1
+Max level: 3
+Weight: 5
diff --git a/.vscode/example/clangd/extensions.json b/.vscode/example/clangd/extensions.json
@@ -8,12 +8,13 @@
  "amiralizadeh9480.cpp-helper",
  "marus25.cortex-debug",
  "zxh404.vscode-proto3",
- "augustocdias.tasks-shell-input"
+ "augustocdias.tasks-shell-input",
+ "rioj7.command-variable"
  ],
  // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
  "unwantedRecommendations": [
  "twxs.cmake",
  "ms-vscode.cpptools",
  "ms-vscode.cmake-tools"
  ]
-}
+}
diff --git a/.vscode/example/cpptools/c_cpp_properties.json b/.vscode/example/cpptools/c_cpp_properties.json
@@ -2,23 +2,23 @@
  "configurations": [
  {
  "name": "Win32",
- "compilerPath": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gcc.exe",
+ "compilerPath": "${workspaceFolder}/toolchain/current/bin/arm-none-eabi-gcc.exe",
  "intelliSenseMode": "gcc-arm",
  "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
  "cStandard": "gnu23",
  "cppStandard": "c++20"
  },
  {
  "name": "Linux",
- "compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
+ "compilerPath": "${workspaceFolder}/toolchain/current/bin/arm-none-eabi-gcc",
  "intelliSenseMode": "gcc-arm",
  "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
  "cStandard": "gnu23",
  "cppStandard": "c++20"
  },
  {
  "name": "Mac",
- "compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
+ "compilerPath": "${workspaceFolder}/toolchain/current/bin/arm-none-eabi-gcc",
  "intelliSenseMode": "gcc-arm",
  "compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
  "cStandard": "gnu23",

diff --git a/.vscode/example/tasks.json b/.vscode/example/tasks.json
@@ -91,7 +91,7 @@
  "label": "[Debug:unit_tests] Flash (USB)",
  "group": "build",
  "type": "shell",
- "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb"
+ "command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb_full"
  },
  {
  "label": "[Debug] Flash (USB, with resources)",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,75 +1,42 @@
 ## New changes
-* LFRFID: **Electra intercom protocol support** (Romania) (by @Leptopt1los | PR #750)
-* NFC: Temp fix for `iso14443_4_layer_decode_block` crash
-* NFC: CharlieCard parser (by @zacharyweiss)
-* SubGHz: FAAC RC XT - add 0xB button code on arrow buttons for programming mode
-* SubGHz: Add Manually - Sommer FM fixes
-* SubGHz: Enabled tx-rx state on unused gpio pin by default (**external amp option was removed and is enabled by default now**)
-* SubGHz: **Status output !TX/RX on the GDO2 CC1101 pin** (by @quen0n | PR #742)
-* SubGHz: Reworked saved settings (by @xMasterX and @Willy-JL)
-* Desktop: Fixes for animation unload (by @Willy-JL)
-* iButton: Updated DS1420 for latest ibutton changes
-* Misc: Allow no prefix usage of name_generator_make_detailed_datetime
-* Misc: Allow setting view dispatcher callbacks to NULL
-* Misc: Added `void` due to `-Wstrict-prototypes`
-* Misc: Some code cleanup and proper log levels in nfc parsers
-* Infrared: Allow external apps to use infrared settings (by @Willy-JL)
-* JS & HAL: Various fixes and FURI_HAL_RANDOM_MAX define added (by @Willy-JL)
-* JS: **BadUSB layout support** (by @Willy-JL)
-* JS: New Modules `widget`, `vgm` and path globals (by @jamisonderek)
-* Apps: Enhance Random Interval and Movement Functionality in HID Mouse Jiggler for Improved Stealth and Human-Like Behavior (by @gushmazuko | PR #746)
-* Apps: NFC Magic - **Gen2 writing support, Gen4 NTAG password and PACK fixes** (by @Astrrra)
-* Apps: MFKey - **fixed crashes**, add more free ram (by @noproto & @Willy-JL) 
-* Apps: **Check out Apps updates by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
-* OFW PR 3616: NFC: Mf Desfire fix reading big files (by gornekich)
-* OFW: iButton: fix crash when deleting some keys
-* OFW: Desktop: cleanup error popups
-* OFW: Troika parser visual fixes 
-* OFW: Fix the retry/exit confirmation prompts in iButton
-* OFW: nfc app: add legacy keys for plantain cards
-* OFW: GUI: Fix array out of bounds in menu exit 
-* OFW: add support for S(WTX) request in iso14443_4a_poller
-* OFW: Mosgortrans parser output fixes
-* OFW: BLE: Add GapPairingNone support 
-* OFW: iButton new UI 
-* OFW: FuriHal: add ADC API
-* OFW: Mf Desfire multiple file rights support
-* OFW: **Felica poller** (NFC-F)
-* OFW: Desktop/Loader: Unload animations before loading FAPs
-* OFW: JS Documentation
-* OFW: **Update radio stack to v1.19.0**
-* OFW: **Move crypto1 to helpers, add it to the public API**
-* OFW: Explain RNG differences, add FURI_HAL_RANDOM_MAX
-* OFW: Furi: Add "out of memory" and "malloc(0)" crash messages
-* OFW: IR: Fix crash on duty_cycle=1
-* OFW: **Desktop: ensure that animation is unloaded before app start (fixes some out of memory crashes)**
-* OFW: Hide unlock with reader for MFU-C 
-* OFW: fbt: fixed missing FBT_FAP_DEBUG_ELF_ROOT to dist env
-* OFW: fbt: added -Wstrict-prototypes for main firmware
-* OFW: Mifare Ultralight naming fix 
-* OFW: IR: Remember OTG state
-* OFW: Bad USB: fix crash when selecting a keyboard layout
-* OFW: L1_Mods animation update : adding VGM visual 
-* OFW: RFID Improvements 
-* OFW: Fixed plugins and UI 
-* OFW: **NFC: Fix mf desfire detect**
-* OFW: infrared_transmit.h was missing `#pragma once`
-* OFW: Show the wrong PIN Attempt count on the login screen
-* OFW: SavedStruct: Introduce saved_struct_get_metadata
-* OFW: JS CLI command
-* OFW: Add ChromeOS Bad USB demo
-* OFW: **Configurable Infrared TX output** (previous UL version is replaced with OFW version, new features added "AutoDetect" and saving settings)
-* OFW: BadUSB: BLE, media keys, Fn/Globe key commands
-* OFW: NFC: Slix privacy password reveal ->(was included in previous UL release) and **Desfire detect fix**
-* OFW: github: additional pre-upload checks for doxygen workflow
-* OFW: NFC UI fixes
-* OFW: Gui: unicode support, new canvas API
-* OFW: **Api Symbols: replace asserts with checks**
+* Apps: **Mifare Nested - ported to latest API** using old nfc lib (by @xMasterX) (+ mem management fix by @Willy-JL) 
+* LFRFID: **Electra fix** non-initialized encoded epilogue on render (by @Leptopt1los)
+* JS: Move examples to subfolder `js_examples`
+* Apps: HID app improvements and fixes<br>
+`- Move new mouse jiggler into mouse jiggler stealth and bring back previous version of mouse jiggler too`<br>
+`- Set stealth jiggler max time default value to 4 min and min value to 1 min`<br>
+`- Merge OFW changes`<br>
+`- More OFW merge fixes` (by @Willy-JL | PR #753)<br>
+* Apps: **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev)
+* OFW (TLSF branch): SubGHz: fix memory corrupt in read raw view
+* OFW: **NFC App: fix changing UID**
+* OFW: Replaced obsolete-format delay
+* OFW: **Archive: fix condition race on exit**
+* OFW: Text Box: fix displaying text with end text focus
+* OFW: FuriHal: add flash ops stats, workaround bug in SHCI_C2_SetSystemClock
+* OFW: Icons: compression fixes & larger dimension support
+* OFW: **Text Box rework**
+* OFW: Fix calling both `view_free_model()` and `view_free()`
+* OFW: JS: Add textbox module
+* OFW: JS: Add math module
+* OFW: **NFC: add Slix capabilities**
+* OFW: Settings refactor fixes
+* OFW: JS: Add submenu module
+* OFW: **Skylanders plugin**
+* OFW: Settings menu refactoring 
+* OFW: NFC: Mf Desfire fix reading big files 
+* OFW: Infrared: Add Toshiba RAS-2518D 
+* OFW: **vscode: config fixes**
+* OFW: Ble: new connection parameters negotiation scheme
+* OFW: FuriHal: move version init to early stage 
+* OFW: Add support for R_ARM_REL32 relocations.
+* OFW: Remove unused DolphinWait_61x59 icon
+* OFW: Add the Akira animation
+* OFW: **Desktop: fix crash on autolock after restart in locked state**
 <br><br>
 #### Known NFC post-refactor regressions list: 
 - Mifare Mini clones reading is broken (original mini working fine) (OFW)
 - NFC CLI was removed with refactoring (OFW) (will be back soon)
-- Mifare Nested not ported to latest API yet, `unlshd-065` is the latest version on old NFC API that works with "nested app"
 
 ----
 
@@ -95,7 +62,7 @@
 |TON||`UQCOqcnYkvzOZUV_9bPE_8oTbOrOF03MnF-VcJyjisTZmsxa`|
 
 #### Thanks to our sponsors who supported project in the past and special thanks to sponsors who supports us on regular basis:
-ClaraCrazy, Pathfinder [Count Zero cDc], callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
+@mishamyte, ClaraCrazy, Pathfinder [Count Zero cDc], callmezimbra, Quen0n, MERRON, grvpvl (lvpvrg), art_col, ThurstonWaffles, Moneron, UterGrooll, LUCFER, Northpirate, zloepuzo, T.Rat, Alexey B., ionelife, ...
 and all other great people who supported our project and me (xMasterX), thanks to you all!
 
 

diff --git a/applications/debug/text_box_element_test/application.fam b/applications/debug/text_box_element_test/application.fam
@@ -0,0 +1,10 @@
+App(
+ appid="text_box_element_test",
+ name="Text Box Element Test",
+ apptype=FlipperAppType.DEBUG,
+ entry_point="text_box_element_test_app",
+ requires=["gui"],
+ stack_size=1 * 1024,
+ order=140,
+ fap_category="Debug",
+)
diff --git a/...tions/debug/text_box_test/text_box_test.c → ..._box_element_test/text_box_element_test.c b/...tions/debug/text_box_test/text_box_test.c → ..._box_element_test/text_box_element_test.c
@@ -71,7 +71,7 @@ static void text_box_test_input_callback(InputEvent* input_event, void* ctx) {
  furi_message_queue_put(event_queue, input_event, FuriWaitForever);
 }
 
-int32_t text_box_test_app(void* p) {
+int32_t text_box_element_test_app(void* p) {
  UNUSED(p);
  FuriMessageQueue* event_queue = furi_message_queue_alloc(32, sizeof(InputEvent));
  furi_check(event_queue);

diff --git a/...tions/debug/text_box_test/application.fam → .../debug/text_box_view_test/application.fam b/...tions/debug/text_box_test/application.fam → .../debug/text_box_view_test/application.fam
@@ -1,8 +1,8 @@
 App(
- appid="text_box_test",
- name="Text Box Test",
+ appid="text_box_view_test",
+ name="Text Box View Test",
  apptype=FlipperAppType.DEBUG,
- entry_point="text_box_test_app",
+ entry_point="text_box_view_test_app",
  requires=["gui"],
  stack_size=1 * 1024,
  order=140,