From c0e0403b44f6fd3a2d1420eb48db663ef4d57d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Such=C3=A1nek?= Date: Mon, 6 Mar 2023 08:44:26 +0100 Subject: [PATCH] Fix SD card CID parsing (#2463) The recent SD rewrite dropped a couple of lines from the CID parsing function resulting in zero manufacturing date displayed. Signed-off-by: Michal Suchanek --- firmware/targets/f7/fatfs/sd_spi_io.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/firmware/targets/f7/fatfs/sd_spi_io.c b/firmware/targets/f7/fatfs/sd_spi_io.c index 68903acf..e8e542b3 100644 --- a/firmware/targets/f7/fatfs/sd_spi_io.c +++ b/firmware/targets/f7/fatfs/sd_spi_io.c @@ -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;