Commit Graph

69 Commits

Author SHA1 Message Date
Willy-JL a139ebfb82 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev --nobuild 2024-01-05 23:11:54 +00:00
Methodius d2549b3b1a Code cleanup 2024-01-06 03:18:32 +09:00
Methodius 1bae3d19ee Merge remote-tracking branch 'upstream/dev' into nfc-washcity 2024-01-06 03:13:07 +09:00
Willy-JL 8872cd8f9d Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-30 00:24:26 +01:00
Methodius 4d5e096437 parsers cleanup 2023-12-30 00:55:13 +09:00
MX e5ceef3422 Merge branch 'ofw_dev' into dev 2023-12-29 16:57:23 +03:00
YaBa 35e74c07d1 Added NFC plugin; parser for WashCity cards. (#3319)
* Added NFC plugin; parser for WashCity cards.
* Fixed file to the correct path
* Added demo file Demo_WC_20E.nfc
* Fixed clang format
* fixed typo (balance_cents)
* Removed demo file as requested.

Co-authored-by: あく <alleteam@gmail.com>
2023-12-28 14:23:12 +09:00
Eric Betts 76ed466eb4 Nfc: HID MFC Plugin (#3312)
Co-authored-by: あく <alleteam@gmail.com>
2023-12-28 14:03:50 +09:00
YaBa ca62254ee7 Fixed clang format and typo in var balance_cents 2023-12-26 23:19:48 +00:00
YaBa a6bfc27530 Added plugin to read WashCity card balance 2023-12-26 21:45:36 +00:00
Methodius c53f5aa5b5 Zolotaya Korona transport card parser added 2023-12-17 04:58:07 +09:00
Methodius ebe1a8f55f parsers cleanup for new api 2023-12-16 23:57:46 +09:00
Willy-JL 5653ae52c3 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-16 01:06:37 +00:00
MX db57ff947b Merge branch 'ofw_dev' into dev 2023-12-16 02:16:46 +03:00
gornekich 09540929c3 [FL-3717] MFC emulation fix (#3291)
* mf classic listener: reset state before sleep and after nack
* Fix PVS warnings
* Fix PVS and compiler disagree on builtins

Co-authored-by: あく <alleteam@gmail.com>
2023-12-15 17:51:20 +00:00
Willy-JL cd3ab082c8 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-15 01:24:57 +00:00
Leptopt1los 0af74fb755 Umarsh transport cards parser (#3277)
* Umarsh transport card parser added
* Volna transport cards keys added

Co-authored-by: あく <alleteam@gmail.com>
2023-12-14 14:02:40 +00:00
Augusto Zanellato 78b7310057 Add MyKey parser (#3262)
Co-authored-by: あく <alleteam@gmail.com>
2023-12-14 13:54:58 +00:00
WillyJL 9205884a83 Added Mizip & Microel support + parser to NFC (#481) 2023-12-13 01:56:06 +00:00
Willy-JL a6a749b76f Consistency with do..while blocks usage 2023-12-13 01:36:19 +00:00
Willy-JL 4c6eb896ed Format 2023-12-13 01:33:08 +00:00
Nathan N b080160451 Fix edge case -- 0.5% of UIDs got wrong result 2023-12-12 11:21:09 -05:00
Nathan N 3dde112676 Fix edge case -- 0.5% of UIDs got wrong result 2023-12-12 11:17:33 -05:00
47LeCoste d47bbfeef3 Add files via upload 2023-12-09 13:32:16 +01:00
Willy-JL 4eaad9fd56 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev --nobuild 2023-12-08 13:32:25 +00:00
Willy-JL fe3f0c08e2 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-12-08 13:29:47 +00:00
Methodius 2e7bb26eef Merge branch 'dev' into nfc-parsers 2023-12-07 22:22:29 +09:00
Methodius 5d28939c28 social_moscow parser verification collisions fix 2023-12-07 21:59:27 +09:00
MX 15a29e1483 format 2023-12-07 08:21:32 +03:00
MX c22b3b57bd Merge branch 'nfc-parsers' into dev 2023-12-07 08:03:43 +03:00
MX 1daa2fa377 Merge branch 'ofw_dev' into dev 2023-12-07 08:03:18 +03:00
Methodius 1b45b8a17d Kazan parser: adult social tariff added 2023-12-06 18:25:47 +09:00
Methodius e94beff204 Kazan parser: basic tariffs parsing added 2023-12-06 18:08:20 +09:00
gornekich 82baf1e923 [FL-3701] NFC fixes (#3264)
* nfc app: fix unlock with manual password crash
* nfc app: preserve card detected state
* nfc app: fix mf keys scene switch
* nfc app: fix multiple protocol tag detect notification
* nfc plugin: fix retrun in function body in aime parser
* iso14443-3b poller: rework ATTRIB response check
* nfc app: fix navigation after file load failur
* iso14443-3b poller: fix PVS warning
* mfc listener: add crutch in mfc emulation
2023-12-05 22:40:06 +09:00
noproto dc25bfb831 Add Saflok and MyKey KDFs 2023-12-04 16:03:32 -05:00
Willy-JL 1726ad4b94 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev 2023-12-04 17:48:40 +00:00
Willy-JL 4c401cacc4 Format 2023-12-04 17:34:09 +00:00
noproto c3e52ad4bd Add Saflok and MyKey KDFs 2023-12-04 12:07:58 -05:00
MX d6fcb04aa8 Merge branch 'ofw_dev' into dev 2023-12-03 18:42:11 +03:00
Honghao Zeng c477d1321a nfc: m1k-based Aime (non-AIC) card support (#3241)
Co-authored-by: gornekich <n.gorbadey@gmail.com>
2023-12-03 20:00:46 +09:00
Willy-JL 4bb0984b46 Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into dev 2023-12-02 06:10:19 +00:00
MX 99d657fcfb merge fixes 2023-12-01 20:33:14 +03:00
Willy-JL 32f54632ea Refactor sonicare check --nobuild 2023-11-28 20:40:38 +00:00
Sil333033 2dc9e1b873 i forgor --nobuild 2023-11-28 21:09:58 +01:00
Sil333033 707d87aadc Add NFC Philips Sonicare parser --nobuild
uwu :3
2023-11-28 21:02:23 +01:00
Willy-JL af00cc4e0a Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev 2023-11-26 18:49:04 +00:00
Methodius 8c5f28d6a0 Kazan parser: Type: abonnement fix 2023-11-23 23:59:06 +09:00
Methodius 6c2e332638 Kazan transport cards parser added 2023-11-23 22:19:26 +09:00
Methodius 5f18532a59 Umarsh code cleanup 2023-11-23 22:11:12 +09:00
Methodius 63f072a819 Umarsh header check rework reworked. Thanks J for idea! 2023-11-22 17:26:10 +09:00