Willy-JL
4c5a37b34e
Merge branch 'nfcf' of https://github.com/nullableVoidPtr/flipperzero-firmware into xfw-dev
2023-03-28 22:16:01 +01:00
Willy-JL
6ebbbcc306
Reset NFC stuff
2023-03-28 21:32:00 +01:00
Willy-JL
b30109dee1
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev
2023-03-26 21:03:05 +01:00
MX
22406f8aca
MF Classic dict - Fix key delete, now works properly
2023-03-25 07:04:28 +03:00
nullableVoidPtr
b521761990
Merge branch 'dev' into nfcf
2023-02-05 03:24:24 +08:00
VerstreuteSeele
cb2d92ec6c
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev
2023-02-03 11:35:09 +01:00
MX
7edf90c2e5
Merge branch 'fz-dev' into dev
2023-02-02 18:28:52 +03:00
AloneLiberty
46fb86265c
NFC: fix creating MF Classic tags from "Add Manually" menu (BCC calulation and ATQA/SAK writing) ( #2342 )
...
* NFC: fix creating MF Classic cards from "Add Manually" menu (BCC calculation and AQTA/SAK writing)
* NFC: Fix BCC/SAK/ATQA in unit_tests and SAK in nfc_generate_mf_classic
Co-authored-by: gornekich <n.gorbadey@gmail.com >
2023-02-02 22:18:39 +07:00
MX
16f8f2c2df
Merge branch 'fz-dev' into dev
2023-02-02 11:54:20 +03:00
Giacomo Ferretti
eee5c35400
NFC: add MIFARE MINI support ( #2307 )
...
* NFC: add MIFARE MINI support
* Move new value to end of enum
* nfc: added missing unit test
Co-authored-by: gornekich <n.gorbadey@gmail.com >
Co-authored-by: あく <alleteam@gmail.com >
2023-01-27 12:51:47 +07:00
VerstreuteSeele
0f6068837b
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev
2023-01-26 20:31:49 +01:00
Krzysztof Haładyn (krzys_h)
5134f44c09
nfc: Fix crash when using debug PCAP trace ( #2338 )
2023-01-26 15:28:36 +07:00
VerstreuteSeele
280b83c32d
Add Mifare Mini, fix char type & fix sector reads in edge-cases
2023-01-16 03:09:40 +01:00
nullableVoidPtr
94558df627
Merge branch 'dev' into nfcf
2022-12-28 17:23:43 +08:00
RogueMaster
ed74859225
Merge branch 'UNLEASHED' into 420
2022-12-27 09:31:33 -05:00
MX
473f9c0e44
Merge branch 'fz-dev' into dev
2022-12-27 16:06:27 +03:00
Astra
ded7e727d0
[FL-3060] New MFC Bruteforce animation ( #2190 )
...
* Change the wording in the headers
* Add support for text in the progress bar
* New MFC key bruteforce screen
* Typo fix
* nfc: rename Flipper Dict to System Dict
* elements: fix types
* Display the correct key attack sector
Co-authored-by: gornekich <n.gorbadey@gmail.com >
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com >
2022-12-27 18:14:03 +09:00
RogueMaster
c361305a10
Merge branch 'UNLEASHED' into 420
2022-12-26 16:14:07 -05:00
MX
6d368c3e3a
Merge branch 'fz-dev' into dev
2022-12-26 22:42:21 +03:00
Georgii Surkov
8582670a34
[FL-2811] Fix PVS-Studio warnings ( #2142 )
...
Co-authored-by: あく <alleteam@gmail.com >
Co-authored-by: gornekich <n.gorbadey@gmail.com >
2022-12-26 21:13:30 +09:00
nullableVoidPtr
82387bfb01
Merge remote-tracking branch 'origin/dev' into nfcf
2022-12-11 11:46:44 +11:00
RogueMaster
5adfd734e3
Merge branch 'UNLEASHED' into 420
2022-12-10 16:18:41 -05:00
MX
35a4eef3fc
Merge branch 'fz-dev' into dev
2022-12-10 19:30:20 +03:00
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
68b3cc233b
NFC: add specific FeliCa type read option
2022-12-06 03:02:36 +08:00
nullableVoidPtr
eaa2dea075
NFC: initial support for NFC-F (FeliCa)
2022-12-06 02:31:25 +08:00
RogueMaster
4a8c814daf
Merge branch 'UNLEASHED' into 420
2022-11-23 15:28:31 -05:00
MX
7829428455
Merge branch 'fz-dev' into dev
2022-11-23 19:21:50 +03:00
Sergey Gavrilov
c511c67e71
Core: thread allocation shortcut ( #2007 )
...
* Core: thread alloc+set shortcut
* Apps: use thread allocation shortcut
* Mark some service threads as services
* Init BT as soon as possible
Co-authored-by: あく <alleteam@gmail.com >
2022-11-23 21:49:17 +09:00
RogueMaster
4b9f353c78
fmt
2022-11-12 08:37:29 -05: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
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
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
RogueMaster
4d350eda4e
Merge pull request #369 from qistoph/mrtd
...
Mrtd TEST PR
2022-10-18 02:32:57 -04:00
MX
4f7ca617cc
Merge branch 'fz-dev' into dev
2022-10-17 21:20:28 +03:00
gornekich
dfbe21e720
NFC fixes part 3 ( #1885 )
...
* nfc: fix read next key
* nfc: verify new line ending in user dictionary file
* nfc: fix cache save
* nfc: add unit test for dict load
* nfc: fix total key count in dictionary
Co-authored-by: あく <alleteam@gmail.com >
2022-10-18 02:10:41 +09:00
Chris van Marle
5d0025dae3
Merge remote-tracking branch 'upstream/dev' into mrtd
2022-10-11 22:14:40 +02:00
Chris van Marle
00d674f222
Fix indention
2022-10-11 22:13:33 +02:00
Chris van Marle
69ff30e86a
MRTD TLV parsing (and select)
2022-10-11 22:13:32 +02:00
Chris van Marle
59efc2701d
Merge branch 'dev' into mrtd
2022-10-11 22:13:13 +02:00
Chris van Marle
b412843566
MRTD BAC support and some other improvements
2022-10-11 22:13:10 +02:00
Chris van Marle
66a507ba53
Add ISO7816 tester
2022-10-11 22:13:08 +02:00
MX
184b467f62
add nfc feature back, bug seems to be fixed
2022-10-08 00:03:06 +03:00
MX
bdd052937b
Merge branch 'fz-dev' into dev
2022-10-07 17:24:20 +03:00
