Commit Graph

398 Commits

Author SHA1 Message Date
g3gg0
24f8db3c27 temporary DMA based timer capturing 2022-11-19 00:22:41 +01:00
g3gg0
d6903a4a06 some more comments
updated API file
2022-11-17 21:58:17 +01:00
g3gg0
971e0093c4 cleaned up SLIX code
fixed byte order mixup
read larger cards
2022-11-17 21:49:29 +01:00
g3gg0
b4802247df always save file even when tag was not locked 2022-11-17 01:45:22 +01:00
g3gg0
75f5e6604b separate ISO15693 basic and SLIX extensions a bit more
changed save format to reflect this
executing emulation from browser now also works
2022-11-17 01:35:39 +01:00
g3gg0
bcd33ca125 added NfcV emulation 2022-11-14 21:12:18 +01:00
MX
950dee48a0 Merge branch 'fz-dev' into dev 2022-11-12 16:43:12 +03:00
RogueMaster
4b9f353c78 fmt 2022-11-12 08:37:29 -05:00
RogueMaster
ffbbc7ecde Merge branch 'ofwdev' into 420 2022-11-12 08:35:37 -05:00
hedger
f9730bcafe fbt: lint fixes (#2008)
* lint: exclude "lib" subfolder from naming checks; fbt: moved LINT_SOURCES from literal strings to Dir() nodes
* lint: also exclude hidden directories

Co-authored-by: あく <alleteam@gmail.com>
2022-11-12 19:03:22 +09:00
MX
930b369812 Merge branch 'fz-dev' into dev 2022-11-10 21:38:03 +03:00
RogueMaster
2ce7b4bdcc Merge branch 'ofwdev' into 420 2022-11-10 11:44:55 -05:00
Astra
e7c4b40dbe Force card types in extra actions (#1961)
* Mifare Classic forced read
* Add all the needed card types
* nfc: remove unused scene
* nfc: remove unused worker state
* nfc: fix read card type scene state usage
* nfc: move NfcReadMode to NfcDevData struct
* nfc: fix bank card reading and scene navigation
* nfc magic: fix magic deactifate function

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2022-11-11 01:29:57 +09:00
Astra
820afd2aec NFC Unit tests part 1.1 (#1927)
* Mifare Classic 1/4K, 4/7b uid, NFC-A: NFC-A is not complete yet, as there are no 4b uid tests. Also, Mifare Classic tests don't cover the key cache yet.
* NFC unit tests require access to the NFC app
* Made nfc_device_save accept full path as an argument
* Move from cstrs to furi strings and fix logic
* nfc tests: fix memory leak
* nfc: add mf_classic_get_total_blocks() to API
* nfc tests: simplify nfc tests
* nfc: fix memory leak in shadow file saving
* nfc: fix set uid scene
* nfc: fix saving files
* nfc: fix preload nfc file path
* nfc: remove comments

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-11-11 01:20:35 +09:00
MX
684fdc632f Merge branch 'fz-dev' into dev 2022-11-10 06:57:08 +03:00
g3gg0
fe216b4ddd implemented unlock, read, save sequence 2022-11-09 22:59:09 +01:00
RogueMaster
1c23a2e0ea Merge branch 'ofwdev' into 420 2022-11-09 15:49:35 -05:00
g3gg0
fa74fc9541 fix naming ReadAuth->Unlock 2022-11-09 21:19:12 +01:00
gornekich
3985b456c3 NFC: fix crash on MFC read (#1993)
* nfc: fix nfc_worker_stop logic
* nfc: fix stop order

Co-authored-by: あく <alleteam@gmail.com>
2022-11-10 03:12:55 +09:00
g3gg0
c840e9ad49 added ISO15693 reading, saving and revealing from privacy mode (unlock) 2022-11-09 14:10:05 +01:00
RogueMaster
17db1286a8 fix issue? 2022-11-04 13:37:07 -04:00
RogueMaster
2cc4dadf19 Merge branch 'pr/401' into 420 2022-11-04 13:18:52 -04:00
RogueMaster
e00002f7b1 nfc magic stuff 2022-11-04 13:08:12 -04:00
MX
0ab400a27e Merge branch 'fz-dev' into dev 2022-11-04 14:34:34 +03:00
RogueMaster
5f86fe47d4 Revert "Merge branch 'ofwdev' into 420"
This reverts commit 430a9be02a, reversing
changes made to e2faf2e0e7.
2022-11-04 05:07:52 -04:00
RogueMaster
430a9be02a Merge branch 'ofwdev' into 420 2022-11-04 05:01:32 -04:00
gornekich
bf8fd71c00 NFC magic cards support (#1966)
* nfc magic: introduce nfc app to work with magic cards
* nfc: add nfc device functions to API
* nfc magic: add bacis scenes
* nfc magic: add wrong card and write confirm scenes
* nfc magic: introduce magic lib
* nfc magic: write magic lib
* nfc magic: add write commands to magic lib
* nfc magic: work on worker
* furi_hal_nfc: add bits data exchage method to API
* nfc magic: rework with new API
* nfc magic: add check and wipe scenes
* nfc magic: add icons, gui fixes
* nfc: format python src

Co-authored-by: あく <alleteam@gmail.com>
2022-11-04 16:01:44 +09:00
RogueMaster
3c085436b8 Merge branch 'UNLEASHED' into 420 2022-10-29 12:04:49 -04:00
MX
8e4595e4f7 fix nfc worker merge issues 2022-10-29 17:21:30 +03:00
RogueMaster
5c219ee7e9 fmt 2022-10-28 23:06:17 -04:00
RogueMaster
f18e7725b4 Merge branch 'UNLEASHED' into 420 2022-10-28 13:09:03 -04:00
MX
4da3f9cf15 Merge branch 'fz-dev' into dev 2022-10-28 19:43:22 +03:00
gornekich
93a6e17ce5 [FL-2933] Mf Classic initial write, update, detect reader (#1941)
* nfc: introduce nfc write
* nfc: add write logic
* nfc worker: add write state
* nfc: add mfc update logic
* nfc: add update success logic
* nfc: add custom card for detect reader
* nfc: update write logic
* nfc: add halt command, add notifications
* nfc: add write fail scene
* nfc: fixes and clean up
* nfc: fix navigation ad notifications
* nfc: fix detect reader nfc data setter

Co-authored-by: あく <alleteam@gmail.com>
2022-10-29 01:10:16 +09:00
Chris van Marle
a629a39017 MRTD Reference MrtdData from MrtdApplication 2022-10-28 11:48:09 +02:00
Chris van Marle
bd5b0da361 MRTD Move MrtdData to helper .h 2022-10-28 11:30:14 +02:00
Chris van Marle
ab3c74bbf0 Merge remote-tracking branch 'upstream/dev' into mrtd 2022-10-27 15:54:40 +02:00
Chris van Marle
7778904a39 MRTD move mrtd_helpers to nfc/helpers/ 2022-10-27 15:33:11 +02:00
Chris van Marle
496c059e39 MRTD save/load BAC params 2022-10-27 15:19:20 +02:00
Chris van Marle
46878d1526 MRTD show auth method used 2022-10-26 13:04:53 +02:00
Chris van Marle
c3d7417c25 MRTD show auth failure message 2022-10-25 10:33:36 +02:00
Chris van Marle
fe2b5fa21e MRTD recognize MRTDs properly 2022-10-25 10:05:59 +02:00
RogueMaster
e5c35e6b26 Merge pull request #376 from qistoph/mrtd
MRTD Support NFC-B documents
2022-10-24 02:43:25 -04:00
RogueMaster
b7e039c6f3 Merge branch 'UNLEASHED' into 420 2022-10-21 15:22:11 -04:00
MX
12bbe3e68e return saving of emv 2022-10-21 21:58:59 +03:00
Chris van Marle
49ab1f99d1 MRTD Support NFC-B documents 2022-10-21 11:23:11 +02:00
RogueMaster
03524b97f1 Update mifare_ultralight.h 2022-10-18 02:53:50 -04:00
RogueMaster
39f8fd50c1 Merge branch 'pr/371' into 420 2022-10-18 02:52:53 -04:00
RogueMaster
4d350eda4e Merge pull request #369 from qistoph/mrtd
Mrtd TEST PR
2022-10-18 02:32:57 -04:00
Zeus Ricote
a7c897a09f nfc related changes 2022-10-18 05:46:20 +02:00
RogueMaster
b09d84e876 Merge branch 'DarkFlippers:dev' into 420 2022-10-17 14:28:28 -04:00