From ce8e6b2947f936a1a50687795d27961ec84d3c72 Mon Sep 17 00:00:00 2001 From: jflyper Date: Mon, 20 Jan 2020 16:35:23 +0900 Subject: [PATCH] [FLASH] Include W25M02G in QuadSPI detection --- src/main/drivers/flash.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/drivers/flash.c b/src/main/drivers/flash.c index 6318bdb2b..520a423f4 100644 --- a/src/main/drivers/flash.c +++ b/src/main/drivers/flash.c @@ -65,12 +65,21 @@ static bool flashQuadSpiInit(const flashConfig_t *flashConfig) // Manufacturer, memory type, and capacity uint32_t chipID = (readIdResponse[0] << 16) | (readIdResponse[1] << 8) | (readIdResponse[2]); -#ifdef USE_FLASH_W25N01G +#if defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25M02G) quadSpiSetDivisor(quadSpiInstance, QUADSPI_CLOCK_ULTRAFAST); +#if defined(USE_FLASH_W25N01G) if (w25n01g_detect(&flashDevice, chipID)) { return true; } +#endif + +#if defined(USE_FLASH_W25M02G) + if (w25m_detect(&flashDevice, chipID)) { + return true; + } +#endif + #endif return false;