Willy-JL
2eaf1ffc95
New formatting
2024-07-15 22:32:17 +01:00
Willy-JL
8a02a2c8dd
Empty line after TAGs as per new formatting
2024-07-15 22:29:41 +01:00
Willy-JL
02f7207d28
Merge remote-tracking branch 'ofw/dev' into mntm-dev
2024-07-15 22:18:35 +01:00
hedger
ffa3996a5e
[FL-3867] Code formatting update ( #3765 )
...
* clang-format: AllowShortEnumsOnASingleLine: false
* clang-format: InsertNewlineAtEOF: true
* clang-format: Standard: c++20
* clang-format: AlignConsecutiveBitFields
* clang-format: AlignConsecutiveMacros
* clang-format: RemoveParentheses: ReturnStatement
* clang-format: RemoveSemicolon: true
* Restored RemoveParentheses: Leave, retained general changes for it
* formatting: fixed logging TAGs
* Formatting update for dev
Co-authored-by: あく <alleteam@gmail.com >
2024-07-15 13:38:49 +09:00
Zinong Li
79d8b12c5e
NFC: Add parser for CSC Service Works Reloadable Cash Card ( #137 )
...
* csc parser
* Added verification through keys. Recognize new cards.
* Correct typo, add comments
* Updated output word choice
* Added verify key in csc_parse to avoid false positive
* Format
* updated verification process
- Deleted key-based verification
- Added memory based checksum and backup block checks to ensure better verification performance
* Formatting and More Verify Steps
Added card type checks and verify for csc specific memory format
Formatted the code (indentation etc.)
* Update csc.c
* Test cleanup parser a bit
* Update changelog
---------
Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com >
2024-07-10 11:43:38 +01:00
Willy-JL
b9c648f7d2
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev --nobuild
2024-06-11 23:30:50 +02:00
MX
d4d5b1b55a
fix typo
2024-06-11 16:15:18 +03:00
Astra
cf8c82c451
[FL-3746] Mifare Plus detection support ( #3607 )
...
* Initial MFPlus draft
* Proper detection (WIP)
* Mifare Plus detection done
* Bump F18 API
* Alloc takes no arguments
* Fixes from code review
* Remove leftover logging
* Remove stray reminder comment
* Review changes and extra logging
* Fix atqa detection
* Fix incorrect comparison
* ATQA byte swap fix
* mf plus: code clean up
* mf plus: remove unused code
* mf plus: fix read fail event handling
* mf plus: fix return error codes
* mf plus: handle load and save errors
* mf plus: assert -> check in public API funxtion
* Bump API Symbols version
* Fix wrong feature mask
* Skylanders plugin separation
* Fix navigation
* Fix info box size
Co-authored-by: gornekich <n.gorbadey@gmail.com >
Co-authored-by: あく <alleteam@gmail.com >
2024-06-10 20:36:46 +01:00
Willy-JL
aa3db97e9d
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev
2024-06-06 02:19:54 +01:00
MX
05457b41e4
Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into nfc_mfplus
2024-06-06 01:12:34 +03:00
MX
17dbb4105d
Merge remote-tracking branch 'OFW/dev' into dev
2024-06-06 00:35:40 +03:00
Astra
6db3c0c6bc
Merge branch 'dev' into astra/3746-mfp-detect
2024-06-05 18:55:41 +09:00
Astra
4357a1e9d2
Skylanders plugin separation
2024-06-05 18:11:57 +09:00
Willy-JL
23da827361
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev
2024-06-04 03:03:23 +01:00
hedger
03196fa110
cleanup of various warnings from clangd ( #3682 )
...
* cleanup of various warnings from clangs
* lfrfid_debug: cast fixes
* subghz: binraw: round->roundf
* furi: thread: updated internal stack size variable to size_t
* github: fail faster on unsuccessful build
* unit_tests: double trouble
2024-06-03 14:43:23 +01:00
Willy-JL
54d2763177
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev
2024-05-16 21:47:58 +01:00
MX
7c5111e29f
Merge remote-tracking branch 'OFW/dev' into dev
2024-05-16 23:37:03 +03:00
あく
7c63bf7574
Revert "TLSF memory allocator. Less free flash, moar free ram. ( #3572 )" ( #3651 )
...
* Revert "TLSF memory allocator. Less free flash, moar free ram. (#3572 )"
This reverts commit 1d17206e23 .
* Fix PVS warnings
* github: logging for ticket number checks to stdout
* memgr: removed offending todo
---------
Co-authored-by: hedger <hedger@nanode.su >
2024-05-16 18:43:27 +04:00
Willy-JL
c2b7b9c60f
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev
2024-05-16 04:54:24 +01:00
Eric Betts
6d1a5c71e6
Skylanders plugin ( #3315 )
...
* PoC skylanders plugin
* based on db0c7e4fad
* More figures
* Fix util methods
Co-authored-by: あく <alleteam@gmail.com >
Co-authored-by: gornekich <n.gorbadey@gmail.com >
2024-05-16 03:44:40 +03:00
Eric Betts
50bee67748
Skylanders plugin ( #3315 )
...
* PoC skylanders plugin
* based on db0c7e4fad
* More figures
* Fix util methods
Co-authored-by: あく <alleteam@gmail.com >
Co-authored-by: gornekich <n.gorbadey@gmail.com >
2024-05-15 19:09:08 +01:00
MX
4965215c8d
Merge remote-tracking branch 'OFW/dev' into dev
2024-04-27 14:44:18 +03:00
Willy-JL
41e0b478a3
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev --nobuild
2024-04-25 22:20:39 +01:00
Astra
1559ee6293
[Fl-3809] Troika parser visual fixes ( #3614 )
...
Co-authored-by: あく <alleteam@gmail.com >
2024-04-24 21:47:40 +09:00
MX
f88a916ccc
Merge remote-tracking branch 'OFW/dev' into dev [ci skip]
2024-04-21 11:42:57 +03:00
Willy-JL
e3cc377b56
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev
2024-04-19 22:40:41 +01:00
gornekich
c87683596a
nfc app: add legacy keys for plantain cards ( #3602 )
...
Co-authored-by: あく <alleteam@gmail.com >
2024-04-19 23:22:07 +09:00
Astra
0d73a58123
Mosgortrans parser output fixes ( #3554 )
...
* Fix mosgortrans/troika newlines and mark unused variables
* Supress warnings for TODOs that don't need a ticket
Co-authored-by: あく <alleteam@gmail.com >
2024-04-19 21:01:57 +09:00
MX
8eba6e18ff
Merge remote-tracking branch 'OFW/dev' into dev
2024-04-18 17:24:48 +03:00
MX
4422a03ae9
Merge remote-tracking branch 'OFW/dev' into dev
2024-04-18 17:22:36 +03:00
gornekich
be43e49869
nfc app: fix false positive verification in bip plugin ( #3595 )
...
Co-authored-by: あく <alleteam@gmail.com >
2024-04-18 09:56:39 +09:00
MX
2443a702c9
update nfc parser
...
by zacharyweiss
2024-04-10 15:38:57 +03:00
Zachary Weiss
c056127e99
Merge branch 'Next-Flip:dev' into dev
2024-04-09 22:07:10 -04:00
Zachary Weiss
66f1558b07
Typo
2024-04-09 21:14:57 -04:00
Zachary Weiss
905c33a08b
Only print end validity when present
...
Same might be worth doing for type & balance, keeping those as is for now; expiry/EV specifically given the switching logic as it has most potential for misinterpretation of null/0 value
2024-04-09 21:12:46 -04:00
Zachary Weiss
2150f18496
Struct&var refactor for clarity
2024-04-09 20:19:27 -04:00
Zachary Weiss
33cfd6340a
More cleanup, pass testing
2024-04-08 22:14:46 -04:00
Zachary Weiss
3ea6d46c79
Parsing function readability refactor
2024-04-07 22:10:46 -04:00
Zachary Weiss
3af66c7815
ASCII of known layouts, pass testing
2024-04-07 20:49:06 -04:00
Zachary Weiss
07f63f9512
Misc cleanup/refactor + passes testing
2024-04-07 16:20:08 -04:00
Willy-JL
e607147378
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev
2024-04-05 04:52:23 +01:00
MX
7787845479
cleanup unused debug, set proper log levels
2024-04-05 06:41:31 +03:00
MX
ec4b8b8f5e
Various fixes
...
fixes by Willy-JL
nfc parser by zacharyweiss
js widget and path globals by jamisonderek
2024-04-05 01:25:03 +03:00
Zachary Weiss
23c8c23051
Minor gate ID mapping corrections
2024-03-31 17:31:00 -04:00
Zachary Weiss
d008c95aa0
Notes / comments
2024-03-31 13:51:53 -04:00
Zachary Weiss
91cb48e1ed
Key B parse check, minor cleanup
2024-03-31 10:03:41 -04:00
Willy-JL
2f064a0f34
Follow date format convention
...
Thanks Leptopt1los!
2024-03-31 12:54:38 +01:00
Zachary Weiss
5a471e02eb
Comment cruft cleanup, one edge case, TODO list
2024-03-31 02:50:55 -04:00
Zachary Weiss
270bd273db
Fix lazy comment to make earlier version compile
2024-03-31 01:00:47 -04:00
Zachary Weiss
5be873fa19
NFC MBTA CharlieCard parsing plugin
2024-03-30 20:53:02 -04:00