Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

Display FLASH JEDEC ID in status and flash_info (#12051)

Browse source
This commit is contained in:
Steve Evans 2022-12-15 14:06:11 +00:00 • committed by GitHub
parent 103f238eea
commit bcfe335bd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main/drivers/flash.c
View file

@ -121,6 +121,9 @@ static bool flashQuadSpiInit(const flashConfig_t *flashConfig)
phase++;
} while (phase != BAIL && !detected);
if (detected) {
flashDevice.geometry.jedecId = chipID;
}
return detected;
}
#endif // USE_QUADSPI
@ -134,6 +137,7 @@ void flashPreInit(const flashConfig_t *flashConfig)
static bool flashSpiInit(const flashConfig_t *flashConfig)
{
bool detected = false;
// Read chip identification and send it to device detect
dev = &devInstance;
@ -179,31 +183,38 @@ static bool flashSpiInit(const flashConfig_t *flashConfig)
#ifdef USE_FLASH_M25P16
if (m25p16_detect(&flashDevice, chipID)) {
return true;
detected = true;
}
#endif
#if defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25M)
if (w25m_detect(&flashDevice, chipID)) {
return true;
if (!detected && w25m_detect(&flashDevice, chipID)) {
detected = true;
}
#endif
// Newer chips
chipID = (readIdResponse[1] << 16) | (readIdResponse[2] << 8) | (readIdResponse[3]);
if (!detected) {
// Newer chips
chipID = (readIdResponse[1] << 16) | (readIdResponse[2] << 8) | (readIdResponse[3]);
}
#ifdef USE_FLASH_W25N01G
if (w25n01g_detect(&flashDevice, chipID)) {
return true;
if (!detected && w25n01g_detect(&flashDevice, chipID)) {
detected = true;
}
#endif
#ifdef USE_FLASH_W25M02G
if (w25m_detect(&flashDevice, chipID)) {
return true;
if (!detected && w25m_detect(&flashDevice, chipID)) {
detected = true;
}
#endif
if (detected) {
flashDevice.geometry.jedecId = chipID;
return detected;
}
spiPreinitByTag(flashConfig->csTag);
return false;