Commit Graph

281 Commits

Author SHA1 Message Date
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
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
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
Yukai Li
14681cdcc0 Format code 2022-11-23 09:04:15 -07:00
g3gg0
1344f8f667 fix log truncation 2022-11-19 13:01:04 +01:00
g3gg0
08a5fee128 log code updates, showing the last entries only 2022-11-19 12:28:58 +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
Yukai Li
90c362708e 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
2022-11-15 01:17:54 -07:00
Yukai Li
3624ebf643 nfc: Revise MFUL unlock UI flow 2022-11-15 00:44:11 -07:00
g3gg0
bcd33ca125 added NfcV emulation 2022-11-14 21:12:18 +01:00
Yukai Li
508f52b1c0 nfc: Add faster auth callback patch 2022-11-14 10:26:30 -07:00
Yukai Li
ccced311d7 Merge branch 'dev' into ntag-auto-pwd-capture 2022-11-14 10:25:19 -07:00
RogueMaster
4b9f353c78 fmt 2022-11-12 08:37:29 -05:00
MX
930b369812 Merge branch 'fz-dev' into dev 2022-11-10 21:38:03 +03:00
RogueMaster
7d67cd958b Update nfc_scene_mf_ultralight_emulate.c 2022-11-10 13:12:45 -05:00
RogueMaster
a411305a5f Update nfc_scene_mf_ultralight_emulate.c 2022-11-10 13:11:53 -05: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
g3gg0
8d2daa7986 rename file to match scene name 2022-11-09 21:20:33 +01:00
g3gg0
fa74fc9541 fix naming ReadAuth->Unlock 2022-11-09 21:19:12 +01:00
g3gg0
c840e9ad49 added ISO15693 reading, saving and revealing from privacy mode (unlock) 2022-11-09 14:10:05 +01:00
RogueMaster
30dbaea2e8 Merge branch 'ofwdev' into 420 2022-11-05 14:23:42 -04:00
あく
e8913f2e33 Code cleanup: srand, PVS warnings (#1974)
* Remove srand invocation

* PVS High priority fixes

* PVS High errors part 2

* Furi: heap tracing inheritance

* Furi add __builtin_unreachable to furi_thread_catch
2022-11-05 18:07:24 +03: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
MX
4c0c70ff64 Merge branch 'fz-dev' into dev 2022-10-28 14:39:14 +03:00
Chris van Marle
0a044d6416 MRTD Select auth&read after load 2022-10-28 11:25:59 +02:00
Chris van Marle
131578ab42 MRTD Use u2f icon in load params 2022-10-28 10:17:13 +02:00
RogueMaster
51286c21dd Merge branch 'ofwdev' into 420 2022-10-28 04:06:11 -04:00
Georgii Surkov
f11df49468 [FL-2828] Dolphin score update take 2 (#1929)
* Move DolphinDeedNfcRead
* Move DolphinDeedNfcReadSuccess
* Move DolphinDeedNfcSave
* Move DolphinDeedNfcDetectReader
* Move DolphinDeedNfcEmulate
* Count DolphinDeedNfcEmulate when launched from file browser
* Implement most of the score accounting for NFC
* Fully update Nfc icounter handling
* Move DolphinDeedSubGhzFrequencyAnalyzer
* Update the rest of icounter in SubGHz
* Adjust SubGHz icounter handling
* Adjust LFRFID icounter handling
* Adjust Infrared icounter handling
* Don't count renaming RFID tags as saving
* Don't count renaming SubGHz signals as saving
* Don't count renaming NFC tags as saving
* Adjust iButton icounter handling
* Minor code refactoring
* Correct formatting
* Account for emulating iButton keys from file manager/rpc

Co-authored-by: あく <alleteam@gmail.com>
2022-10-28 16:18:41 +09:00
Chris van Marle
fc31ddc447 MRTD Load params as menu option 2022-10-28 08:22:35 +02:00
Chris van Marle
16ed3cb7c6 MRTD reset auth on retry 2022-10-27 16:33:38 +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
5119eaf2f7 MRTD remove auth failed TODO 2022-10-27 15:33:07 +02:00
Chris van Marle
496c059e39 MRTD save/load BAC params 2022-10-27 15:19:20 +02:00