DM: add x25Q64 filesystem info and make GD25Q work with all size vari…

…ants
adafruit · Oct 11, 2018 · 1d43acb · 1d43acb
1 parent d47f147
commit 1d43acb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Adafruit_QSPI_GD25Q.cpp b/Adafruit_QSPI_GD25Q.cpp
@@ -39,7 +39,7 @@ bool Adafruit_QSPI_GD25Q::begin()
 	// read device ids
 	uint8_t ids[3];
 	QSPI0.runInstruction(&cmdSetGD25Q[GD25Q_READ_IDS], 0, NULL, ids, 3);
-	if (ids[0] != 0xC8 || ids[2] != 0x15 )
+	if (ids[0] != 0xC8)
 		 return false;
 
 	_status.reg = 0;

diff --git a/Adafruit_QSPI_Generic.cpp b/Adafruit_QSPI_Generic.cpp
@@ -83,6 +83,11 @@ bool Adafruit_QSPI_Generic::setFlashType(spiflash_type_t t){
     addrsize = 24;
     pages = 4096;
     totalsize = pages * pagesize;  // 1 MBytes
+  } else if (type == SPIFLASHTYPE_W25Q64) {
+	  pagesize = 256;
+	  addrsize = 24;
+	  pages = 32768;
+	  totalsize = pages * pagesize; // 8 MBytes
   }
   else {
     pagesize = 0;