Commit Graph

141 Commits

Author SHA1 Message Date
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 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
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
g3gg0
674a5c6f48 added ISO14443 tag emulator code, receiving only yet 2022-11-24 01:43:23 +01:00
g3gg0
73111c4ac1 optimized ISO15693 code 2022-11-23 21:25:36 +01:00
g3gg0
b1cd358bfb reworked nfca signal generation, added idle time before sending response 2022-11-23 02:17:18 +01:00
g3gg0
9d07f8db29 minimal speedups for mifare_classic.c
included missing nfcv.c API update
2022-11-23 02:16:52 +01:00
g3gg0
021695b2a3 use sequences, but bake them before sending. required for shorter signal sequences, causing higher setup time 2022-11-22 02:11:09 +01:00
g3gg0
116528f871 sync bit phases 2022-11-22 01:39:46 +01:00
g3gg0
eb98c7b246 rework NfcA and simplify a bit
digital_sequence_bake added for testing purpose
2022-11-22 00:34:09 +01:00
g3gg0
ae80d06e93 properly initialize DigitalSequence for NfcA 2022-11-21 18:40:54 +01:00
g3gg0
8b4e6de56e fix NfcA 2022-11-21 17:38:13 +01:00
g3gg0
a1ae1ed515 switch NfcA to digital sequence also
updated DigitalSequence API
2022-11-21 15:25:12 +01:00
g3gg0
aad093a4b5 smaller code cleanups 2022-11-21 13:49:19 +01:00
g3gg0
cd241a2901 switch to DigitalSequence 2022-11-21 13:36:16 +01:00
g3gg0
820ccb9775 switch to signal sequence (nonfunc) 2022-11-21 01:21:15 +01:00
g3gg0
f2457b6ee5 switch to scalable timebase for digital reader to prevent overflows
added yielding to emulation loop
2022-11-19 17:03:55 +01:00
g3gg0
01137a5b6e added pulse_reader for DMA based NFC signal reading
updated nfcv to use pulse_reader instead of bitbanging
2022-11-19 02:45:33 +01:00
g3gg0
24f8db3c27 temporary DMA based timer capturing 2022-11-19 00:22:41 +01:00
g3gg0
971e0093c4 cleaned up SLIX code
fixed byte order mixup
read larger cards
2022-11-17 21:49:29 +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
RogueMaster
4b9f353c78 fmt 2022-11-12 08:37:29 -05:00
RogueMaster
2ce7b4bdcc Merge branch 'ofwdev' into 420 2022-11-10 11:44:55 -05: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
g3gg0
fe216b4ddd implemented unlock, read, save sequence 2022-11-09 22:59:09 +01:00
g3gg0
c840e9ad49 added ISO15693 reading, saving and revealing from privacy mode (unlock) 2022-11-09 14:10:05 +01:00
RogueMaster
2cc4dadf19 Merge branch 'pr/401' into 420 2022-11-04 13:18:52 -04: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
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
fe2b5fa21e MRTD recognize MRTDs properly 2022-10-25 10:05:59 +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
8e3e72288c Merge branch 'UNLEASHED' into 420 2022-10-13 13:44:38 -04:00
Astra
55f8beef9f [FL-2876] MFC Improvements Part 2/2 (#1868)
* Remove keys incorrectly added by the key cache
* Improve responsiveness while checking for re-used keys and fix skipping keys when card is removed
* Actually check if the card is completely read
* Discard incorrect keys on a lower level
* nfc: clean up

Co-authored-by: gornekich <n.gorbadey@gmail.com>
2022-10-14 01:23:29 +09:00
RogueMaster
8d2dc1e689 Merge branch 'UNLEASHED' into 420 2022-10-12 00:13:02 -04:00
MX
6b5631e5b0 MFC Improvements Part 2/2
OFW PR 1868 by Astrrra
2022-10-12 05:29:42 +03:00
RogueMaster
0286a175b7 Merge branch 'ofwdev' into 420 2022-10-11 20:07:00 -04:00