diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-02-02 09:47:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 09:47:52 -0800 |
| commit | dfd57e4ad470bcf510bf3347b53e3ff47c279632 (patch) | |
| tree | 74ddc5d7f552ef2a82d497920f09c9ef53b8c81c | |
| parent | 544b9e4ba01acf1252d63444266e91bf17600b04 (diff) | |
| parent | 448d13e7b45a1edf4f290f800427db8a5890b814 (diff) | |
Merge pull request #571 from ladyada/fix_itsybitsy_flash
memory type for alt flash fix
| -rw-r--r-- | atmel-samd/spi_flash.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/atmel-samd/spi_flash.c b/atmel-samd/spi_flash.c index d74007a83..8b0030b6b 100644 --- a/atmel-samd/spi_flash.c +++ b/atmel-samd/spi_flash.c @@ -281,7 +281,11 @@ void spi_flash_init(void) { || response[1] == SPI_FLASH_JEDEC_MANUFACTURER_2 #endif ) && - response[2] == SPI_FLASH_JEDEC_MEMORY_TYPE && + (response[2] == SPI_FLASH_JEDEC_MEMORY_TYPE + #ifdef SPI_FLASH_JEDEC_MANUFACTURER_2 + || response[2] == SPI_FLASH_JEDEC_MEMORY_TYPE_2 + #endif + ) && response[3] == SPI_FLASH_JEDEC_CAPACITY) { spi_flash_is_initialised = true; } else { |