Gornek/merge dev #2827

gornekich · 2023-07-01T20:56:31Z

What's new

[ Describe changes here ]

Verification

[ Describe how to verify changes ]

Checklist (For Reviewer)

PR has description of feature/bug or link to Confluence/Jira task
Description contains actions to verify feature/bugfix
I've built this code, uploaded it to the device and verified feature/bugfix

…2672)

* fbt: Fix tar uid overflow when packaging * Fix trailing spaces

* Storage: common_rename is now POSIX compliant * storage: check for success on storage_common_remove in file rename --------- Co-authored-by: hedger <[email protected]>

Co-authored-by: hedger <[email protected]>

* Storage, common_rename: check that old path is exists * Storage, common_rename: return correct status

* Desktop,Rpc: desktop status subscription * Desktop,RPC: properly handle unsubscribe Co-authored-by: Sergey Gavrilov <[email protected]>

Co-authored-by: あく <[email protected]>

…#2677) * Make infrared_worker respect carrier frequency and duty cycle * Update comments Co-authored-by: あく <[email protected]>

Co-authored-by: あく <[email protected]>

…on (#2687) * desktop: Refactor favorites settings and allow app browser in selection * desktop: Gate app browser entry add, just in case * Desktop: simplify favorite application selection * Desktop: refactor favorite application opening routine and cleanup code * Desktop: handle exit from external application selection Co-authored-by: hedger <[email protected]> Co-authored-by: あく <[email protected]>

* NFC: gen4 gtu detect in magic app * NFC: more support for GTU card * NFC: Fix Gen1 in Magic * Allow double UIDs for MFClassic on GTU cards * NFC: Small magic app tweaks * nfc magic: notify card event on wiping * nfc magic: fix power consumption * nfc magic: disable i2c writing and fix wipe loop * NfcMagic: correct formatting in printf * NfcMagic: correct formatting in printf, proper version * nfc_magic: rework card found notification and gen4 wiping Co-authored-by: あく <[email protected]>

Co-authored-by: gornekich <[email protected]>

Co-authored-by: あく <[email protected]>

* nfc: Add Mifare Ultralight C detection * nfc: Add display name for MFUL C and hide menu items MFUL C unlock and emulation currently not supported, so hide from menu if current card is MFUL C * nfc: Also check response when probing 3DES auth * nfc: Hide emulate option in saved menu for MFUL if not supported * nfc: Remove unlock options from saved menu if Ultralight C Co-authored-by: gornekich <[email protected]> Co-authored-by: あく <[email protected]>

* [LRFID] Add support for Nexkey/Nexwatch * Update protocol_nexwatch.c: Remove unnecessary check Co-authored-by: SG <[email protected]> Co-authored-by: あく <[email protected]>

Co-authored-by: あく <[email protected]>

* Implement support for reading Opal card (Sydney, Australia) * stub_parser_verify_read: used UNUSED macro * furi_hal_rtc: expose calendaring as functions * opal: use bit-packed struct to parse, rather than manually shifting about * Update f18 api symbols Co-authored-by: あく <[email protected]>

* FuriHal: add bus abstraction and port some subsystem to it * Make PVS happy, cleanup code * Update API symbols for f18 * F18: backport bus changes from f7 * Revert to STOP2 sleep mode * Fix downgrading the firmware via updater * Port iButton TIM1 to furi_hal_bus * Port Infrared TIM1 and TIM2 to furi_hal_bus * Just enable the timer bus * Port furi_hal_pwm to bus API * Fix include statement * Port furi_hal_rfid to bus API * Port furi_hal_subghz and others to bus API * Remove unneeded include * Improve furi_hal_infrared defines * Reset LPTIM1 via furi_hal_bus API * Crash when trying to enable an already enabled peripheral * Better defines * Improved checks * Lots of macro wrappers * Copy spi changes for f18 * Fix crashes in LFRFID system * Fix crashes in NFC system * Improve comments * Create FuriHalBus.md * Update FuriHalBus.md * Fix crash when launching updater * Documentation: couple small fixes in FuriHalBus * FuriHal: fix copypaste in furi_hal_rfid_tim_reset * FuriHal: reset radio core related peripherals on restart * FuriHalBus: is enabled routine and bug fix for uart * RFID HAL: accomodate furi hal bus Co-authored-by: Georgii Surkov <[email protected]> Co-authored-by: Georgii Surkov <[email protected]> Co-authored-by: SG <[email protected]>

…IGIN_* macro for apps & SDK (#2705) * fbt: added hooks for build & dist environments * Moved env hooks to an optional file * Fixed var name * Added fw origin to device info * Bumped device info version * fbt: added FIRMWARE_ORIGIN option. Different implementation for FW_ORIGIN_* C macro. * api: bumped versions * fbt: added fbt_options_local.py * gitignore: cleanup Co-authored-by: あく <[email protected]>

…g message and crash cli (#2714)

Co-authored-by: あく <[email protected]>

Tested by me, i just asked if I can get the remote. Tested with the universal remote before and thought you would like to add the button data Co-authored-by: あく <[email protected]>

Ability to write gen1b tags (ignore 0x43) Ability to write gen1 7 byte UID tags Fix detection of non magic cards Co-authored-by: あく <[email protected]>

cherry pick from: * https://github.com/DarkFlippers/unleashed-firmware/pull/428/files * https://github.com/DarkFlippers/unleashed-firmware/pull/524/files Co-authored-by: * MX <[email protected]> * gid9798 <[email protected]> Co-authored-by: MX <[email protected]> Co-authored-by: あく <[email protected]>

* improve digital_signal for longer packets, also clean up code * added SLIX2 specific features like signature and unknown keys (for issue #2781), added WRITE_PASSWORD handling * fix NfcV AFI selection * when NFCV_CMD_READ_MULTI_BLOCK reads beyond memory end, return the maximum possible block's content * added SLIX2 reading * fix NXP SYSTEMINFO response check size * capture the first received password if none was set before * clear stored data before reading SLIX details renamed slix2_dump functions to slix2_read * display card block size values as decimal Co-authored-by: あく <[email protected]>

* NFC: Fix key invalidation logic * NFC: Fix crash in CLI with empty response * Fix incorrect key conversions * Proper call to nfc_util Co-authored-by: あく <[email protected]> Co-authored-by: Astra <[email protected]>

* Music player: move music_worker to library * Music player: drop cli * Debug: speaker debug app * Debug: baudrate arg in uart_echo app * Libs: add music_worker to api * Libs: add music_worker to targets linker_dependencies Co-authored-by: あく <[email protected]>

Co-authored-by: doomwastaken <[email protected]>

* Lib: adjust default contrast for ERC displays * Furi: various improvements in check module * Format Sources * FurHal: ble early hardfault detection --------- Co-authored-by: hedger <[email protected]>

* SubGhz: add CC1101 Ext driver * SubGhz: move TIM2 -> TIM17 use cc1101_ext * FuriHal: SPI move channel DMA 3,4 -> 6.7 * Documentation: fix font * SubGhz: add work with SubGhz devices by link to device * SubGhz: add support switching external/internal cc1101 "subghz chat" * SubGhz: add support switching external/internal cc1101 "subghz tx" and "subghz rx" * SubGhz: add "Radio Settings" scene * SubGhz: add icon * SubGhz: add supported CC1101 external module in SubGhz app * SubGhz: fix check frequency supported radio device * SubGhz: fix clang-formatted * Sughz: move dirver CC1101_Ext to lib , compile cmd ./fbt launch_app APPSRC=radio_device_cc1101_ext * SubGhz: fix CLI * SubGhz: fix PVS * SubGhz: delete comments * SubGhz: fix unit_test * Format sources * Update api symbols and drivers targets * Drivers: find proper place for target option * SubGhz: external device connected method naming * Format sources * SubGhz: fix module selection menu, when external is not connected * SubGhz: fix furi_assert(device); * SubGhz: fix split h and c * SubGhz: furi_hal_subghz remove preset load function by name * SubGhz: deleted comments * Format Sources * SubGhz: add some consts and fix unit tests * Sync API Symbols Co-authored-by: Aleksandr Kutuzov <[email protected]>

* fix width of submenu items on vertical view * Gui: slightly better canvas width handling in submenu * Gui: remove unused include Co-authored-by: あく <[email protected]>

github-actions · 2023-07-01T22:02:43Z

PVS-Studio report for commit f1b67f91:

Report

suspicious-pineapple and others added 30 commits May 14, 2023 15:12

fix typo in FuriHalDebuging.md (#2667)

c496962

[FL-3317] fbt: allow strings for fap_version field in app manifests (#…

8d1f5b0

…2672)

[FL-3312] fix PIN retry count reset on reboot (#2671)

341cd5e

api: added lib/nfc/protocols/nfc_util.h (#2674)

9dedcd0

Add new indexer (#2681)

d062ce7

fbt: Use union for old py (#2685)

d9fc408

fbt: Fix tar uid overflow when packaging (#2689)

5f1ac6e

* fbt: Fix tar uid overflow when packaging * Fix trailing spaces

[FL-3328] Removed user-specific data from tar artifacts (#2691)

a821a2f

[FL-3327] Storage: common_rename is now POSIX compliant (#2693)

711f0fe

* Storage: common_rename is now POSIX compliant * storage: check for success on storage_common_remove in file rename --------- Co-authored-by: hedger <[email protected]>

Services: remove deallocator for persistent services (#2692)

3217f28

Co-authored-by: hedger <[email protected]>

Storage, common_rename: check that old path is exists (#2698)

88f0b63

* Storage, common_rename: check that old path is exists * Storage, common_rename: return correct status

[FL-3315] Desktop,Rpc: desktop status subscription (#2696)

080324f

* Desktop,Rpc: desktop status subscription * Desktop,RPC: properly handle unsubscribe Co-authored-by: Sergey Gavrilov <[email protected]>

✨ Add fr-FR-mac key layout (#2666)

faa14cf

Co-authored-by: あく <[email protected]>

[FL-3322] Infrared: respect carrier frequency and duty cycle settings (…

ed1ebf9

…#2677) * Make infrared_worker respect carrier frequency and duty cycle * Update comments Co-authored-by: あく <[email protected]>

USB HID report timeout (#2682)

12dc5b1

Co-authored-by: あく <[email protected]>

Add Airwell Prime DCI Series and match file style (#2686)

a472ff7

Co-authored-by: あく <[email protected]>

nfc: Fix MFUL tearing flags read (#2669)

5a7cd20

Co-authored-by: gornekich <[email protected]>

api: added toolbox/api_lock.h (#2702)

4f054ed

Co-authored-by: あく <[email protected]>

Update ac.ir (#2701)

cce0485

Co-authored-by: あく <[email protected]>

[LRFID] Add support for Nexkey/Nexwatch (#2680)

44426c7

* [LRFID] Add support for Nexkey/Nexwatch * Update protocol_nexwatch.c: Remove unnecessary check Co-authored-by: SG <[email protected]> Co-authored-by: あく <[email protected]>

Add Carrier 42QHB12D8S (#2707)

f9390e0

Co-authored-by: あく <[email protected]>

BadUSB: script execution pause (#2700)

66961da

Co-authored-by: あく <[email protected]>

[FL-3335] Dolphin: new animation (#2713)

a76c189

[FL-3340] SubGhz: fix flipper crashes after exiting broadcast blockin…

d09c59f

…g message and crash cli (#2714)

FelixLgr and others added 15 commits June 28, 2023 18:36

Fix fr-FR-mac keylayout (#2809)

6f1c46e

Co-authored-by: あく <[email protected]>

Fix roll-over in file browser and archive (#2811)

bf975ad

Add Mitsubishi MSZ-AP25VGK universal ac remote (#2800)

a595231

Co-authored-by: あく <[email protected]>

Added Power Button for an unknown Sharp Model (#2787)

dcf1059

Tested by me, i just asked if I can get the remote. Tested with the universal remote before and thought you would like to add the button data Co-authored-by: あく <[email protected]>

NFC: Improvements to NFC Magic app (#2760)

feebf2c

Ability to write gen1b tags (ignore 0x43) Ability to write gen1 7 byte UID tags Fix detection of non magic cards Co-authored-by: あく <[email protected]>

NFC: Fix key invalidation logic (#2782)

e5ae3e2

* NFC: Fix key invalidation logic * NFC: Fix crash in CLI with empty response * Fix incorrect key conversions * Proper call to nfc_util Co-authored-by: あく <[email protected]> Co-authored-by: Astra <[email protected]>

increased timeouts (#2816)

5d40193

Co-authored-by: doomwastaken <[email protected]>

Furi,FuriHal: various improvements (#2819)

6d9de25

* Lib: adjust default contrast for ERC displays * Furi: various improvements in check module * Format Sources * FurHal: ble early hardfault detection --------- Co-authored-by: hedger <[email protected]>

fix width of submenu items on Vertical orientation (#2306)

88f8f68

* fix width of submenu items on vertical view * Gui: slightly better canvas width handling in submenu * Gui: remove unused include Co-authored-by: あく <[email protected]>

SubGHz: properly working with missing external driver (#2821)

e7bd547

Merge remote-tracking branch 'origin/dev' into gornek/nfc_refactoring

5e8cd9c

gornekich requested review from skotopes, DrZlo13, hedger, Skorpionm, Astrrra, nminaylov and gsurkov as code owners July 1, 2023 20:56

gornekich added 3 commits July 2, 2023 01:22

all: revert incorrect changes

aeac53c

nfc app: apply correct changes

0bbdb7b

nfc: build fixes

f1b67f9

gornekich changed the base branch from dev to gornek/nfc_refactoring July 1, 2023 22:04

gornekich requested a review from drunkbatya as a code owner July 1, 2023 22:04

gornekich merged commit 39b87f7 into gornek/nfc_refactoring Jul 1, 2023

gornekich deleted the gornek/merge_dev branch July 1, 2023 22:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gornek/merge dev #2827

Gornek/merge dev #2827

gornekich commented Jul 1, 2023

github-actions bot commented Jul 1, 2023

Gornek/merge dev #2827

Gornek/merge dev #2827

Conversation

gornekich commented Jul 1, 2023

What's new

Verification

Checklist (For Reviewer)

github-actions bot commented Jul 1, 2023