Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-23 05:24:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
MX
2023-03-07 13:09:06 +03:00
parent 6511252140 9dd1fb64b7
commit e0905597fc
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/plugins/picopass/picopass_device.c
View File

@@ -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]; 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++) { for(size_t i = 6; i < app_limit; i++) {
furi_string_printf(temp_str, "Block %d", i); furi_string_printf(temp_str, "Block %d", i);
if(!flipper_format_read_hex( if(!flipper_format_read_hex(

2
firmware/targets/f7/fatfs/sd_spi_io.c
View File

@@ -585,6 +585,8 @@ static SdSpiStatus sd_spi_get_cid(SD_CID* Cid) {
Cid->ProdSN |= cid_data[12]; Cid->ProdSN |= cid_data[12];
Cid->Reserved1 = (cid_data[13] & 0xF0) >> 4; Cid->Reserved1 = (cid_data[13] & 0xF0) >> 4;
Cid->ManufactYear = (cid_data[13] & 0x0F) << 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->CID_CRC = (cid_data[15] & 0xFE) >> 1;
Cid->Reserved2 = 1; Cid->Reserved2 = 1;