Commit Graph

560 Commits

Author SHA1 Message Date
RogueMaster 7a5596358a Merge branch 'UNLEASHED' into 420 2022-12-02 17:00:08 -05:00
MX 196fc562d8 Merge branch 'fz-dev' into dev 2022-12-02 23:05:30 +03:00
gornekich e40376bc63 NFC: fix NTAG203 info scene #2078 2022-12-02 21:41:34 +09:00
RogueMaster f6e65139ea Merge branch 'UNLEASHED' into 420 2022-12-01 16:15:43 -05:00
MX 1ce591a6c5 Partially fix strange issue with subghz decode raw 2022-12-01 03:18:41 +03:00
RogueMaster 11ba083862 Merge branch 'UNLEASHED' into 420 2022-11-30 15:10:14 -05:00
MX 0b9d632363 Misc improvements 2022-11-30 20:03:55 +03:00
RogueMaster b4656d801b Merge branch 'UNLEASHED' into 420 2022-11-29 12:38:01 -05:00
MX eec21b073b Merge branch 'fz-dev' into dev 2022-11-29 16:11:13 +03:00
Никита Тимофеев b70395eba9 Allow "Detect reader" for unsaved card (#2045)
* Allow "Detect reader" for unsaved card
* Add missed detect reader deed

Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 22:10:02 +09:00
Sergey Gavrilov 297f185ef4 Blocking USB driver API (#2009)
* invalidate memmgt thread dict
* Core: rollback memmgt thread dict invalidation
* Dialogs: move api lock to toolbox
* HAL: blocking usb API
* HAL usb: fix api return data
* HAL usb: api optimization
* api lock: test results
* Fix build errors
* DAP Link: fix imports
* Crash when malloc in ISR
* Fix dap-link copypaste error
* Moar memory management crashes.
* Crash when malloc in IRQ, not ISR
* USB-UART: Blocking VCP mode switch

Co-authored-by: nminaylov <nm29719@gmail.com>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2022-11-29 21:50:55 +09:00
RogueMaster d0a29e2544 fmt 2022-11-29 01:01:12 -05:00
RogueMaster aa8e7d93ff Merge branch 'pr/456' into 420 2022-11-29 00:56:39 -05:00
g3gg0 1b6b4b6522 cleaned up SLIX code
added callbacks for card-specific ISO15693-3 handling
2022-11-29 01:00:41 +01:00
RogueMaster a2bc900fd3 Merge branch 'UNLEASHED' into 420 2022-11-28 17:05:56 -05:00
MX 60cd7b8b32 Fix merge issues 2022-11-28 23:20:37 +03:00
RogueMaster f73b5c104f fix muck up wtf 2022-11-28 15:18:47 -05:00
RogueMaster a7124ae299 Merge branch 'ofwdev' into 420 2022-11-28 15:18:28 -05:00
MX 3d36105142 Merge branch 'fz-dev' into dev 2022-11-28 23:12:17 +03:00
Georgii Surkov 849afc8798 [FL-2998] IR TV Universal Remote refactor and docs (#2052)
* Rename signals for IR TV universal remote
* Update UniversalRemotes.md

Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 04:49:51 +09:00
あく 769c53b6da [FL-2977] Gui: better navigation in file browser dialog (#2014)
* Gui: proper navigation in file browser dialog
* Trim file name from start path
* File list loading fix
* File list offset fix

Co-authored-by: nminaylov <nm29719@gmail.com>
Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com>
2022-11-29 03:59:24 +09:00
RogueMaster 72bd6bc865 Merge branch 'ofwdev' into 420 2022-11-28 13:26:36 -05:00
Yukai Li 6b47bc1af4 Nfc: NTAG password auto capture (and other password-related changes) (#1843)
* nfc: MFUL minor cleanup
* nfc: Add mechanism to pass event data
* nfc: Add NTAG authentication event to emulation
* nfc: Rename enum member to align with existing convention
* nfc: Add function to determine whether MFUL is fully captured
* nfc: Fix emulation of incompletely-read password-protected MFUL
* nfc: Add reader password capture scene
* nfc: Set default MFUL password input to 0xFFFFFFFF
* nfc: Fix MFUL auth counter loading
* nfc: Be explicit about using manual auth method when using auto unlock
* nfc: Fill in MFUL has_auth when loading file
* nfc: Fix MFUL auth success usage, remove unused variable
* nfc: Display PWD and PACK in MFUL info if available
* nfc: Remove unnecessary include
* nfc: Add unlock options to loaded MFUL menu
* nfc: Move set default MFUL password. This way it can be edited if needed instead of reentered
* nfc: Fix unlock menu not maintaining selection index
* nfc: Move captured MFUL auth data from worker to device data
* nfc: Attempt to authenticate with default PWD when possible when reading NTAG
* nfc: Don't try to auth NTAG on read if we already authed
* nfc: Add title for all pages read but failed auth for NTAG auth
* nfc: Add faster auth callback patch
* lib: Remove scons submodule from index
* nfc: Revise MFUL unlock UI flow
* nfc: Disallow MFUL unlock with reader if card not read yet. Trying to read first results in either needing to make a new scene or badly jury rigging other scenes, so let's just not do that
* f7: Bump API symbols
* Format code

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 03:16:22 +09:00
RogueMaster a486cc898a Merge branch 'ofwdev' into 420 2022-11-28 12:12:22 -05:00
Stephen Kent a82c3ccc22 NFC: Fix MIFARE DESfire info action to open app menu (#2058)
When examining a MIFARE DESfire card, selecting "More >" currently leads
to the file menu for a single application even if the scanned card
contains multiple applications.

On examining the source code, a MIFARE DESfire application selection
menu is present as `NfcSceneMfDesfireData`. This change updates the
MIFARE DESfire Info "More >" action to open the application selection
menu. That menu may then be used to open the file selection menu for any
application in the read MIFARE DESfire card data.

Tested interactively with
https://github.com/flipperdevices/flipperzero-sd-card-examples/blob/c4cbdcd94706836fe0e3cda42587814237b1cfde/nfc/Desfire.nfc

Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 02:05:24 +09:00
Maksim Derbasov e121e6a287 Fix for spelling (#2051)
* Fix for spelling
* Review iteration

Co-authored-by: あく <alleteam@gmail.com>
2022-11-29 01:51:51 +09:00
RogueMaster 50cb45cc29 Merge branch 'pr/454' into 420 2022-11-26 22:14:27 -05:00
RogueMaster 68f51411a1 fmt 2022-11-26 02:23:03 -05:00
RogueMaster b2958cf679 Merge pull request #449 from flipperdevices/aku/browser_navigation
Aku/browser navigation
2022-11-26 01:25:36 -05:00
RogueMaster 41e9c09fba Merge branch 'pr/448' into 420 2022-11-25 21:43:35 -05:00
RogueMaster a15ee2ea7d Revert "Revert "Merge branch 'pr/446' into 420""
This reverts commit 28cc99ad2d.
2022-11-25 21:41:55 -05:00
nminaylov 536eb93fd3 File list offset fix 2022-11-25 17:44:23 +03:00
g3gg0 c1b5394b0f further mergability updates 2022-11-25 11:42:29 +01:00
RogueMaster 28cc99ad2d Revert "Merge branch 'pr/446' into 420"
This reverts commit 761dc48b3e, reversing
changes made to 91f037c63f.
2022-11-25 03:08:53 -05:00
RogueMaster 761dc48b3e Merge branch 'pr/446' into 420 2022-11-25 01:40:03 -05:00
RogueMaster 23dd7a20b7 Merge pull request #443 from niki-timofe/mf-unsaved-detect-reader
Mf unsaved detect reader
2022-11-25 01:25:52 -05:00
Никита Тимофеев 7afaeed553 Add missed detect reader deed 2022-11-24 13:23:40 +03:00
Никита Тимофеев d5a9bfbcd2 Allow "Detect reader" for unsaved card 2022-11-24 05:04:13 +03:00
RogueMaster a9fa226cea Merge branch 'UNLEASHED' into 420 2022-11-23 20:59:05 -05:00
MX f086d5b7a3 Merge pull request #180 from TQMatvey/dev
SubGhz: Allow setting RSSI trigger to beggining
2022-11-24 03:25:41 +03:00
MX 757b218397 Revert SubGhz FA changes 2022-11-24 03:16:31 +03:00
TQMatvey 2a5d629318 SubGhz: Allow setting RSSI trigger to beggining 2022-11-24 06:52:44 +07:00
RogueMaster 4a8c814daf Merge branch 'UNLEASHED' into 420 2022-11-23 15:28:31 -05:00
MX 8e14291363 Merge branch 'fz-dev' into dev 2022-11-23 21:30:59 +03:00
Nikolay Minaylov ffa6249b64 [FL-2985] Fix U2F HID vulnerability #2042
Co-authored-by: あく <alleteam@gmail.com>
2022-11-24 03:12:53 +09:00
MX daea8a963d Apply subghz FA changes from OFW, update API symbols 2022-11-23 19:46:31 +03:00
Yukai Li dc76b523c5 Merge branch 'dev' into ntag-auto-pwd-capture 2022-11-23 09:34:18 -07:00
MX 7829428455 Merge branch 'fz-dev' into dev 2022-11-23 19:21:50 +03:00
Yukai Li 14681cdcc0 Format code 2022-11-23 09:04:15 -07:00
Skorpionm 9bb0dbaa3e SubGhz: frequency analyzer. 2dbi desensitization, rssi averaging to reduce jitter, new rssi indicators in log_mode, GUI fix (#2020)
Co-authored-by: あく <alleteam@gmail.com>
2022-11-23 22:31:39 +09:00