Astra
7fb1af07b8
[FL- 3014] Untangle NFC from Unit Tests ( #2106 )
...
* Untangle NFC from Unit Tests
* nfc tests: add log error
Co-authored-by: Sergey Gavrilov <who.just.the.doctor@gmail.com >
Co-authored-by: gornekich <n.gorbadey@gmail.com >
Co-authored-by: あく <alleteam@gmail.com >
2022-12-10 22:02:34 +09:00
nullableVoidPtr
c41ce0b782
Merge branch 'nfcf' of github.com:erakem/flipperzero-firmware into erakem-nfcf
2022-12-10 12:32:17 +11:00
nullableVoidPtr
eaf72348a6
Merge branch 'dev' into nfcf
2022-12-10 12:21:54 +11:00
nullableVoidPtr
6c7cd0960c
NFC: Add Felica info scenes and properly clear felica_data
2022-12-10 12:15:09 +11:00
MX
1fc67f76a2
Merge branch 'fz-dev' into dev
2022-12-08 08:58:39 +03:00
RogueMaster
1e3eb7a429
fmt changes
2022-12-07 23:32:34 -05:00
RogueMaster
9261e3cdcf
Merge branch 'ofwdev' into 420
2022-12-07 19:16:33 -05:00
Mekare
2871759877
use FuriHalNfcADevData instead of using each of its fields in function calls
2022-12-07 22:24:44 +01:00
Mekare
72d9ad83dc
mf_classic_get_classic_type: ATQA1 is used
2022-12-07 21:31:55 +01:00
Mekare
c7d60e5f11
mf_classic_check_card_type: ATQA1 is used
2022-12-07 21:19:35 +01:00
Nikolay Minaylov
2daf39018b
[FL-3001] File browser base folder ( #2091 )
...
* File browser base folder
* Format sources
* FuriHal: bump api version
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com >
2022-12-07 23:17:41 +09:00
gornekich
9a21dae29c
[FL-3008], [FL-2734], [FL-2766], [FL-2898] NFC bug fixes ( #2098 )
...
* nfc: rework mf classic update
* nfc: rename cache folder to .cache
* nfc: fix ATQA order bytes in nfc files
* file browser: add hide dot files option
* nfc: fix iso-14443-4 uid cards emulation
* nfc: fix unit tests
Co-authored-by: あく <alleteam@gmail.com >
2022-12-07 19:52:44 +09:00
RogueMaster
4414b6451a
Merge branch 'pr/462' into 420
2022-12-06 19:38:40 -05:00
gornekich
79140829b3
file browser: add hide dot files option
2022-12-06 15:22:03 +04:00
gornekich
c08f23ef07
nfc: fix ATQA order bytes in nfc files
2022-12-06 14:14:37 +04:00
gornekich
95d02923de
nfc: rename cache folder to .cache
2022-12-06 13:16:01 +04:00
nullableVoidPtr
68b3cc233b
NFC: add specific FeliCa type read option
2022-12-06 03:02:36 +08:00
gornekich
4cfcdff57c
nfc: rework mf classic update
2022-12-05 23:00:12 +04:00
nullableVoidPtr
eaa2dea075
NFC: initial support for NFC-F (FeliCa)
2022-12-06 02:31:25 +08:00
RogueMaster
d0a29e2544
fmt
2022-11-29 01:01:12 -05:00
RogueMaster
557ed1ca8c
Update nfcv.c
2022-11-29 00:59:25 -05:00
RogueMaster
aa8e7d93ff
Merge branch 'pr/456' into 420
2022-11-29 00:56:39 -05:00
g3gg0
1489e3e676
better layer separation for ISO15693
2022-11-29 02:15:20 +01:00
g3gg0
1b6b4b6522
cleaned up SLIX code
...
added callbacks for card-specific ISO15693-3 handling
2022-11-29 01:00:41 +01:00
MX
3d36105142
Merge branch 'fz-dev' into dev
2022-11-28 23:12:17 +03: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
Michael Huebler
1b3156521c
NFC: Accept non-parsed apps in Mifare DESFire. ( #2041 )
...
* NFC: Accept non-parsed apps in Mifare DESFire. Fixes #2040
Co-authored-by: gornekich <n.gorbadey@gmail.com >
Co-authored-by: あく <alleteam@gmail.com >
2022-11-29 02:14:13 +09:00
RogueMaster
ce26d9eae5
Update mifare_ultralight.h
2022-11-26 22:15:53 -05:00
RogueMaster
569a6fe6c3
fmt
2022-11-26 17:11:53 -05:00
RogueMaster
eb5ad7fb49
Update nfcv.c
2022-11-26 17:10:16 -05:00
RogueMaster
16a037fc4e
Revert "Revert "Merge branch 'pr/450' into 420""
...
This reverts commit 076b11e872
2022-11-26 17:05:26 -05:00
RogueMaster
076b11e872
Revert "Merge branch 'pr/450' into 420"
...
This reverts commit 17ba83f20e7484e573d0
2022-11-26 17:02:32 -05:00
RogueMaster
17ba83f20e
Merge branch 'pr/450' into 420
2022-11-26 17:00:36 -05:00
g3gg0
67f8f5a014
added NfcVSendFlags to choose fields to send
2022-11-26 16:54:32 +01:00
g3gg0
4b18370dfa
fix SLIX/SLIX2 type indicator bits
2022-11-26 16:31:32 +01:00
RogueMaster
68f51411a1
fmt
2022-11-26 02:23:03 -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
g3gg0
0cb784aadd
undo NfcA changes which might have looked better, but brought no reliability improvement
2022-11-25 12:08:36 +01:00
g3gg0
c1b5394b0f
further mergability updates
2022-11-25 11:42:29 +01:00
g3gg0
27b99e15a4
further cleanups towards a proper merge
...
SLIX-L accepts all passwords when password is zero
2022-11-25 11:31:19 +01:00
g3gg0
4b554c5f9e
code cleanup for ISO15693
...
added logging code for ISO15693
2022-11-25 10:31:17 +01:00
RogueMaster
28cc99ad2d
Revert "Merge branch 'pr/446' into 420"
...
This reverts commit 761dc48b3e91f037c63f
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
d1caca1894
Merge pull request #442 from mh-/dev
...
NFC: Accept non-parsed apps in Mifare DESFire
2022-11-25 01:24:02 -05:00
g3gg0
013e88154f
implement ISO14433-A fully in software for pointless experimenting reasons and improving the DigitalReader / SignalSequence code in performance
2022-11-25 02:46:49 +01:00
gornekich
ea5840462b
Merge branch 'dev' into dev
2022-11-24 20:42:15 +04:00
Michael Huebler
bf54016553
NFC: Accept non-parsed apps in Mifare DESFire.
...
Fixes #2040
Minor editorial changes
2022-11-24 12:06:27 +01:00
g3gg0
674a5c6f48
added ISO14443 tag emulator code, receiving only yet
2022-11-24 01:43:23 +01:00
