Merge remote-tracking branch 'ofw/dev' into mntm-dev --nobuild

This commit is contained in:
Willy-JL
2024-09-02 22:05:21 +02:00
3 changed files with 3 additions and 3 deletions
+1
View File
@@ -8,6 +8,7 @@
- Apps:
- Picopass: CVE-2024-41566, When keys are unknown emulate with a dummy MAC and ignore reader MACs (by @nvx)
- Seader: Card parsing and saving UI and logic improvements (by @bettse)
- API: Publishing T5577 page 1 block count macro (by @zinongli)
### Fixed:
- Desktop:
-3
View File
@@ -13,9 +13,6 @@
#define T5577_OPCODE_PAGE_1 0b11
#define T5577_OPCODE_RESET 0b00
#define T5577_BLOCKS_IN_PAGE_0 8
#define T5577_BLOCKS_IN_PAGE_1 4
static void t5577_start(void) {
furi_hal_rfid_tim_read_start(125000, 0.5);
+2
View File
@@ -7,6 +7,8 @@ extern "C" {
#endif
#define LFRFID_T5577_BLOCK_COUNT 8
#define T5577_BLOCKS_IN_PAGE_0 8
#define T5577_BLOCKS_IN_PAGE_1 4
// T5577 block 0 definitions, thanks proxmark3!
#define LFRFID_T5577_POR_DELAY 0x00000001