Commit Graph

198 Commits

Author SHA1 Message Date
Willy-JL
2fcc3d1ae2 Format 2023-05-02 14:29:30 +01:00
Willy-JL
74a30f919d Merge branch 'ISO15693' of https://github.com/g3gg0/flipperzero-firmware into dev 2023-05-02 14:28:51 +01:00
Willy-JL
66b1152499 Merge branch 'nfcf' of https://github.com/nullableVoidPtr/flipperzero-firmware into xfw-dev 2023-05-02 14:06:00 +01:00
Willy-JL
58af523332 Merge branch 'ul-dev' into xfw-dev 2023-05-02 04:44:43 +01:00
MX
fe6bf3c7d6 Revert some changes 2023-05-02 02:25:52 +03:00
Tiernan Messmer
48e7c67359 fix debug print warnings 2023-05-01 13:07:33 +10:00
g3gg0.de
1d4ce4e78a scale NfcV frequency a bit, add echo mode, fix signal level at the end 2023-05-01 12:54:08 +10:00
g3gg0.de
af7d21a020 increase sniff log size 2023-05-01 12:54:08 +10:00
g3gg0.de
64badf124a also added DSFID/AFI handling and locking 2023-05-01 12:54:08 +10:00
g3gg0.de
4f4eca1dd7 added "Listen NfcV Reader" to sniff traffic from reader to card 2023-05-01 12:54:05 +10:00
g3gg0.de
f03d31b647 increased maximum memory size to match standard
added security status handling/load/save
added SELECT/QUIET handling
more fine grained allocation routines and checks
fix memset sizes
2023-05-01 12:53:14 +10:00
g3gg0.de
aa7ead724a respond with block security status when option flag is set 2023-05-01 12:53:14 +10:00
g3gg0.de
fecc686a3e further code cleanups 2023-05-01 12:52:51 +10:00
g3gg0.de
a34a186bba ISO15693: reduce latency on state machine reset 2023-05-01 12:52:50 +10:00
g3gg0.de
9f5a10a2e3 ISO15693: further cleanup 2023-05-01 12:52:37 +10:00
g3gg0.de
75d7246657 ISO15693: further optimizations of allocation and free code 2023-05-01 12:52:36 +10:00
g3gg0.de
d52432970b optimize allocation size for signals 2023-05-01 12:52:36 +10:00
g3gg0.de
423c551cf1 SLIX: fixed crash situation when an invalid password was requested 2023-05-01 12:52:35 +10:00
g3gg0.de
6a95f8010f added support for ISO15693 (NfcV) emulation, added support for reading SLIX tags 2023-05-01 12:52:32 +10:00
Willy-JL
bbddb2ac8e Merge branch 'ul-dev' into xfw-dev 2023-04-28 21:43:56 +01:00
Astra
102dd690b7 Fix emulating empty keys as 0s 2023-04-27 00:28:21 +03:00
nullableVoidPtr
b30ecb61f6 Merge remote-tracking branch 'dogtopus/nfcf' into nfcf 2023-03-29 10:34:29 +11:00
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
c2c9257999 Format 2023-03-28 22:02:15 +01:00
Willy-JL
7c0875b54c Merge branch 'ISO15693' of https://github.com/g3gg0/flipperzero-firmware into xfw-dev 2023-03-28 21:49:19 +01:00
Willy-JL
6ebbbcc306 Reset NFC stuff 2023-03-28 21:32:00 +01:00
nullableVoidPtr
c1cb656be3 Merge branch 'dev' into nfcf 2023-03-24 18:55:58 +11:00
dogtopus
43341980cc Array use refactor
Move all arrays to allocating actual data rather than pointers to simplify construction and destruction. Also moved to M_EACH for iterating over arrays for less boilerplate code.

Also did some function renaming for extra clarity.

root_area is now a node type for simplified area traversal (coming soon).
2023-03-18 03:08:38 -03:00
Willy-JL
09bc580497 Merge branch 'ul-dev' into xfw-dev 2023-03-17 23:52:05 +00:00
Astra
e90042368f [FL-3156] Mark keys as not found when they couldn't auth successfully (#2476)
* Mark keys as not found when they couldn't auth successfully
* Improve logging and fix the reading bug

Co-authored-by: あく <alleteam@gmail.com>
2023-03-16 17:58:07 +09:00
Willy-JL
39ddf75f91 Merge branch 'ul-dev' into xfw-dev 2023-03-14 01:07:01 +00:00
dogtopus
a2cd122f78 Move FeliCa IDm/PMm display to the new NFC-F info screen
The goal is to gradually split out NfcWorkerEventReadFelica into more specific decoders, and have the generic NFC-F info screen display info for tags that don't have a specific decoder, similar to how NFC-A works currently.
2023-03-09 22:12:32 -04:00
AloneLiberty
0190a161ba NFC: Fix 0 block write possibility in Mifare Classic emulation (#2474)
Co-authored-by: あく <alleteam@gmail.com>
2023-03-10 02:50:25 +09:00
Willy-JL
f53b962722 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-03-08 22:16:39 +00:00
AloneLiberty
eb5dae1cda NFC: Support reading Mifare Classic key B from sector trailer, reading sector with B key where A key can't read block, Nfc Magic app not using NFC folder by default (in file select) (#2437)
* NFC: Support reading Mifare Classic key B from sector trailer and reusing it for other sectors
* NFC: Fix my pointer typo
* NFC: Fix reading sector with B key where A key can't read block (fixes #2413) and fix Nfc Magic app not using NFC folder by default (in file select)
* NFC: Fix strange bug

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-03-08 03:33:59 +09:00
VerstreuteSeele
9b81f93fd2 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-02-07 19:12:13 +01:00
hedger
224d0aefe4 [FL-2733] multitarget support for fbt (#2209)
* First part of multitarget porting
* Delete firmware/targets/f7/Inc directory
* Delete firmware/targets/f7/Src directory
* gpio: cli fixes; about: using version from HAL
* sdk: path fixes
* gui: include fixes
* applications: more include fixes
* gpio: ported to new apis
* hal: introduced furi_hal_target_hw.h; libs: added one_wire
* hal: f18 target
* github: also build f18 by default
* typo fix
* fbt: removed extra checks on app list
* api: explicitly bundling select mlib headers with sdk
* hal: f18: changed INPUT_DEBOUNCE_TICKS to match f7
* cleaned up commented out code
* docs: added info on hw targets
* docs: targets: formatting fixes
* f18: fixed link error
* f18: fixed API version to match f7
* docs: hardware: minor wording fixes
* faploader: added fw target check
* docs: typo fixes
* github: not building komi target by default
* fbt: support for `targets` field for built-in apps
* github: reworked build flow to exclude app_set; fbt: removed komi-specific appset; added additional target buildset check
* github: fixed build; nfc: fixed pvs warnings
* attempt to fix target id
* f7, f18: removed certain HAL function from public API
* apps: debug: enabled bt_debug_app for f18
* Targets: backport input pins configuration routine from F7 to F18

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2023-02-08 01:33:05 +09:00
あく
1eda913367 [FL-3075] Pin Reset (#2367)
* Nfc: fix PVS warnings
* Factory reset combo, initial version
* Recovery screen and correct input pin initialization
* Better pin and factory reset message
* Down to cancel factory reset
2023-02-08 01:35:49 +10:00
Krzysztof Zdulski
d035872cf6 nfc: Add mifare classic value block commands (#2317)
Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-02-07 12:21:25 +09:00
nullableVoidPtr
b521761990 Merge branch 'dev' into nfcf 2023-02-05 03:24:24 +08:00
g3gg0.de
437d26615a scale NfcV frequency a bit, add echo mode, fix signal level at the end 2023-02-04 01:43:04 +01:00
g3gg0.de
095595c55a Merge branch 'DigitalSequence_PulseReader' into ISO15693 2023-02-01 23:57:34 +01:00
VerstreuteSeele
1407551d98 Update mifare_classic.h 2023-01-27 12:58:24 +01:00
VerstreuteSeele
b15fbfd618 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-01-27 12:38:44 +01:00
Giacomo Ferretti
126a9efd09 NFC: change from int8_t to uint8_t (#2302)
Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-01-27 15:21:52 +07: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
Emily Trau
4dc4d34d04 emv: parse track1&2 equivalent data (#2332)
* emv: parse track1&2 equivalent data
* emv: alternate expiry parser
* nfc: log EMV track1&2 data to trace output

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-01-27 12:10:08 +07:00
Krzysztof Zdulski
8fc834090d nfc: Fix sector reads when one block is unreadable for MIFARE Classic (#2296)
* Fix sector reads when one block is unreadable
* Auth on the correct block instead of first
* Fix in sector reader as well
* Apply patch by @gornekich

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-01-27 12:00:25 +07:00
g3gg0.de
c1430bd97e increase sniff log size 2023-01-21 01:51:36 +01:00
g3gg0.de
00f8365954 also added DSFID/AFI handling and locking 2023-01-21 01:49:02 +01:00