mirror of
https://github.com/DarkFlippers/unleashed-firmware
synced 2024-11-27 06:50:21 +00:00
Merge branch 'fz-dev' into dev
This commit is contained in:
commit
e0905597fc
2 changed files with 4 additions and 0 deletions
|
@ -167,6 +167,8 @@ static bool picopass_device_load_data(PicopassDevice* dev, FuriString* path, boo
|
|||
}
|
||||
|
||||
size_t app_limit = AA1[PICOPASS_CONFIG_BLOCK_INDEX].data[0];
|
||||
// Fix for unpersonalized cards that have app_limit set to 0xFF
|
||||
if(app_limit > PICOPASS_MAX_APP_LIMIT) app_limit = PICOPASS_MAX_APP_LIMIT;
|
||||
for(size_t i = 6; i < app_limit; i++) {
|
||||
furi_string_printf(temp_str, "Block %d", i);
|
||||
if(!flipper_format_read_hex(
|
||||
|
|
|
@ -585,6 +585,8 @@ static SdSpiStatus sd_spi_get_cid(SD_CID* Cid) {
|
|||
Cid->ProdSN |= cid_data[12];
|
||||
Cid->Reserved1 = (cid_data[13] & 0xF0) >> 4;
|
||||
Cid->ManufactYear = (cid_data[13] & 0x0F) << 4;
|
||||
Cid->ManufactYear |= (cid_data[14] & 0xF0) >> 4;
|
||||
Cid->ManufactMonth = (cid_data[14] & 0x0F);
|
||||
Cid->CID_CRC = (cid_data[15] & 0xFE) >> 1;
|
||||
Cid->Reserved2 = 1;
|
||||
|
||||
|
|
Loading…
Reference in a new issue