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
bde889c338
Reapply "Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into dev"
...
This reverts commit 6bfa383cea .
2024-06-06 00:55:29 +03:00
MX
528636c814
Merge remote-tracking branch 'RebornedBrain/reborned/infinite_dict_attack_fix' into dev
2024-06-06 00:49:26 +03:00
MX
373f61459a
Merge remote-tracking branch 'RebornedBrain/reborned/ultralight_write' into dev
2024-06-06 00:48:46 +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
9bcd2ecd9b
Fix navigation
2024-06-05 18:51:15 +09:00
Astra
4357a1e9d2
Skylanders plugin separation
2024-06-05 18:11:57 +09:00
RebornedBrain
bbece015e0
Fixed infinite loop in dictionary attack scene
2024-06-04 15:37:31 +03: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
RebornedBrain
78f8835cac
Merge branch 'dev' into reborned/ultralight_write
2024-06-03 19:38:15 +03: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
RebornedBrain
06d44550d9
Enabled write menu item also for Ultralight 11 and 21
2024-06-03 16:26:39 +03:00
Astra
8decc8052e
Fix wrong feature mask
2024-06-03 19:28:25 +09:00
gornekich
bf41cc43a1
mf plus: fix read fail event handling
2024-05-29 18:23:34 +01:00
gornekich
8cdb8aafac
Merge branch 'dev' into astra/3746-mfp-detect
2024-05-28 17:11:43 +01:00
Willy-JL
1f1c05d81a
Remove redundant extra API
2024-05-28 05:03:20 +01:00
Willy-JL
17a4fe5106
GUI: Some text and UI fixes
2024-05-26 09:21:05 +01:00
Willy-JL
dc209ab43c
Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev --nobuild
2024-05-26 07:45:13 +01:00
MX
e8cbce6e1d
Merge remote-tracking branch 'OFW/dev' into dev [ci skip]
2024-05-24 20:25:40 +03:00
gornekich
ab2fcaf4ab
[FL-3829] NFC App: fix changing UID ( #3663 )
...
* nfc app: fix changing uid on each byte change
* nfc app: remove unused code
2024-05-23 13:46:00 +01:00
Astra
915304b986
Merge branch 'dev' into astra/3746-mfp-detect
2024-05-20 19:14:30 +09: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 https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/db0c7e4fad5c214c36aa8753d27befe49676a985
* 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 https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/db0c7e4fad5c214c36aa8753d27befe49676a985
* 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
gornekich
988b9cf155
Merge branch 'dev' into astra/3746-mfp-detect
2024-05-14 17:12:37 +01:00
gornekich
5f9b300ab2
NFC: Mf Desfire fix reading big files ( #3616 )
...
* mf desfire: fix incorrect long files reading
* nfc app: trim record size for mf desfire render
* mf desfire: rework reading long record files
* mf desfire: more robust size check
Co-authored-by: あく <alleteam@gmail.com >
2024-05-14 13:34:27 +01:00
Willy-JL
f04975f50d
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev --nobuild
2024-05-04 03:41:44 +01:00
MX
6bfa383cea
Revert "Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into dev"
...
This reverts commit 9b377e6f80 , reversing
changes made to 1736a8a7c2 .
2024-05-03 14:50:58 +03:00
Willy-JL
9d2b4d1dfa
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev
2024-05-01 23:35:55 +01:00
MX
9b377e6f80
Merge remote-tracking branch 'OFW/astra/3746-mfp-detect' into dev
2024-05-01 16:49:53 +03:00
Willy-JL
441fe9f032
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into mntm-dev --nobuild
2024-04-29 21:31:18 +01:00
MX
c157ca9879
Merge remote-tracking branch 'OFW/gornek/desfire_long_files' into dev
2024-04-27 15:09:21 +03: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
gornekich
d13017a7fe
Merge branch 'dev' into gornek/desfire_long_files
2024-04-25 20:13:20 +01:00
gornekich
f544aa8eb6
nfc app: trim record size for mf desfire render
2024-04-25 19:55:35 +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
Willy-JL
2c015b0121
NFC: Allow backlight off in dict attack
...
It already turns on backlight when it finishes
Lets atleast let the poor guy focus on the task at hand )
2024-04-23 03:41:35 +01:00
Astra
85fc0a2dd3
Merge branch 'dev' into astra/3746-mfp-detect
2024-04-23 10:39:34 +09:00
Astra
83ff6fb8bf
Mifare Plus detection done
2024-04-22 21:09:06 +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