djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #571 from ladyada/fix_itsybitsy_flash

Browse Source 
memory type for alt flash fix
This commit is contained in:
Dan Halbert 2018-02-02 09:47:52 -08:00 committed by GitHub
commit dfd57e4ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atmel-samd/spi_flash.c
View File

@ -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 {