Commit Graph

326 Commits

Author SHA1 Message Date
Willy-JL
decce5aa8d Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-26 19:33:56 +01:00
MX
3c452e6ddb Merge branch 'ofw-dev' into dev 2023-05-26 16:51:11 +03:00
Yukai Li
5f52382098 nfc: Mifare Ultralight C detection (#2668)
* nfc: Add Mifare Ultralight C detection
* nfc: Add display name for MFUL C and hide menu items
    MFUL C unlock and emulation currently not supported, so hide from menu
    if current card is MFUL C
* nfc: Also check response when probing 3DES auth
* nfc: Hide emulate option in saved menu for MFUL if not supported
* nfc: Remove unlock options from saved menu if Ultralight C


Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-05-26 22:19:10 +09:00
Willy-JL
7f19e16d47 Use stock system icons instead of assets 2023-05-20 20:00:02 +01:00
Willy-JL
9ddff2a259 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-20 01:20:34 +01:00
MX
51ba8b66b6 Save a little bit (~2k) of space 2023-05-17 23:05:44 +03:00
MX
c760bca4a9 OFW PR 2316: NFC V support
https://github.com/g3gg0/flipperzero-firmware/tree/ISO15693
2023-05-17 19:45:30 +03:00
Willy-JL
ee0212d05d Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-05-10 15:59:20 +01:00
MX
face4bd3c7 Merge branch 'fz-dev' into dev 2023-05-09 18:28:46 +03:00
Nathan Nye
d5403a089c Add Mfkey32 application (#2517)
* Add Mfkey32 application
* Fine tune RAM requirements, use FZ notification service API
* Fix PVS security warnings, fix issue with cracking keys on the FZ
* Prefer on-device or Flipper mobile app (seamless)
* Mfkey32: change app category to NFC
* Mfkey32: set target to f7 only
* Silence PVS false positives
* Correct PVS codes

Co-authored-by: あく <alleteam@gmail.com>
2023-05-09 10:45:59 +09:00
Willy-JL
2fcc3d1ae2 Format 2023-05-02 14:29:30 +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
01a3385369 Add favorite timeout setting 2023-05-02 03:39:50 +01:00
Willy-JL
a6bc7f8abb Rework xtreme settings and assets implementation 2023-05-01 15:28:59 +01:00
nullableVoidPtr
f36beec01b WIP 2023-04-29 08:24:45 +08:00
nullableVoidPtr
3235c2115c Merge remote-tracking branch 'upstream/dev' into nfcf 2023-04-22 11:12:47 +08:00
gornekich
7ac7b70884 [FL-3241] NFC disable EMV support (#2571)
* nfc: remove read emv from extra actions
* nfc: remove read emv

Co-authored-by: あく <alleteam@gmail.com>
2023-04-10 23:51:55 +08:00
nullableVoidPtr
b30ecb61f6 Merge remote-tracking branch 'dogtopus/nfcf' into nfcf 2023-03-29 10:34:29 +11:00
Willy-JL
cb3afc2600 Format 2023-03-28 23:27:07 +01: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
638f0fc6f1 Use locked submenu for nfc debug options 2023-03-28 21:56:08 +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
Willy-JL
79976f460c Show debug options by default as locked 2023-03-20 21:36:42 +00: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
MX
49378f0893 Merge branch 'fz-dev' into dev 2023-03-16 13:49:24 +03:00
Astra
6aa0c08f3a [FL-3064] Skip the read when the card is not present (#2494)
Co-authored-by: あく <alleteam@gmail.com>
2023-03-16 18:06:11 +09:00
MX
2a040f245f Merge branch 'fz-dev' into dev 2023-03-15 21:25:06 +03:00
Leopold
a69ae93871 Add new nfc apdu cli command (#2482)
Co-authored-by: あく <alleteam@gmail.com>
2023-03-15 22:52:32 +09: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
Willy-JL
f53b962722 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-03-08 22:16:39 +00:00
MX
5d9174ac9d Merge branch 'fz-dev' into dev 2023-03-08 22:52:11 +03:00
Liam Hays
90958a6d23 More UI fixes and improvements (#2419)
* Unify spelling of confirm exit/retry across apps.
* Unify infrared exit/retry confirm menus?
* "Keyboard Layout", not "Keyboard layout".
* Make iButton read scene prompt less awkward.
* "Detect Reader" in MF Classic saved menu instead of "Detect reader"
* NFC menu spelling changes only.
* Remove \n in strings in widget_add_string_element() calls.

Co-authored-by: あく <alleteam@gmail.com>
2023-03-08 20:27:21 +09:00
Astra
42d27d04f6 [FL-3127] Fix navigation on unsupported card types (#2440)
Co-authored-by: あく <alleteam@gmail.com>
2023-03-03 19:55:51 +09:00
Willy-JL
8e5be2403b Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-03-01 00:51:43 +00:00
Astra
cc52253e22 Exit to the main menu on pressing BACK 2023-03-01 02:14:56 +03:00
Willy-JL
991d49733f Format 2023-02-26 01:44:32 +00:00
Willy-JL
d3f3bf1e11 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-02-24 01:05:31 +00:00
MX
5132b16305 Merge branch 'dev' into dev2 2023-02-21 23:23:07 +03:00
MX
a0b02b0110 Merge branch 'fz-dev' into dev 2023-02-21 23:10:51 +03:00
Liam Hays
663eb6cd6d Display Mifare Classic data in NFC app (#2389)
* Add data display for Mifare Classic cards.
* Clean up log statements and data display.

Co-authored-by: あく <alleteam@gmail.com>
2023-02-21 16:15:48 +09:00
Round-Pi
b89902942b typo combing 2023-02-20 10:55:53 -05:00
Willy-JL
3ed7caf27d Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev 2023-02-17 23:47:39 +00:00
MX
80a64d8e1a Merge branch 'fz-dev' into dev 2023-02-17 21:55:32 +03:00
Mathie
009c9b1b71 Update nfc_cli.c (#2402)
Modified the f to a capital F, looks cleaner.

Co-authored-by: あく <alleteam@gmail.com>
2023-02-17 20:43:06 +09:00
Willy-JL
efb11dfcbd Properly integrate xtreme apis and headers 2023-02-11 05:19:37 +00:00
MX
6c768f2019 Merge branch 'fz-dev' into dev 2023-02-08 12:09:57 +03:00