fix for SPIFlash - also need to use SdFat instead of SD

This commit is contained in:
ladyada 2019-08-07 13:41:21 -04:00
parent 1bcc622c84
commit a03ba6a283

View file

@ -4,10 +4,10 @@
#include "SPI.h"
#include "Adafruit_GFX.h"
#include "Adafruit_ILI9341.h"
#include "Adafruit_QSPI_Flash.h"
#include <Adafruit_SPIFlash.h>
#include "Adafruit_ADT7410.h"
#include "TouchScreen.h"
#include <SD.h>
#include <SdFat.h>
#include <WiFiNINA.h>
#include "coin.h"
@ -28,7 +28,8 @@
// ILI9341 with 8-bit parallel interface:
Adafruit_ILI9341 tft = Adafruit_ILI9341(tft8bitbus, TFT_D0, TFT_WR, TFT_DC, TFT_CS, TFT_RST, TFT_RD);
Adafruit_QSPI_Flash flash;
Adafruit_FlashTransport_QSPI flashTransport(PIN_QSPI_SCK, PIN_QSPI_CS, PIN_QSPI_IO0, PIN_QSPI_IO1, PIN_QSPI_IO2, PIN_QSPI_IO3);
Adafruit_SPIFlash flash(&flashTransport);
Adafruit_ADT7410 tempsensor = Adafruit_ADT7410();
@ -43,6 +44,7 @@ TouchScreen ts = TouchScreen(XP, YP, XM, YM, 300);
#define Y_MAX 240
Adafruit_GFX_Button coin = Adafruit_GFX_Button();
SdFat SD;
void setup() {
Serial.begin(115200);
@ -77,21 +79,10 @@ void setup() {
tft.println("FAILED");
while (1);
}
uint8_t manid, devid;
Serial.println("Reading Manuf iD");
flash.GetManufacturerInfo(&manid, &devid);
Serial.print("Manuf: ");
Serial.println(manid, HEX);
Serial.print("Device: ");
Serial.println(devid, HEX);
if (devid != 0x17) {
tft.setTextColor(ILI9341_RED);
tft.println("FAILED");
Serial.println("QSPI Flash not found!");
while (1);
}
tft.print("OK\n\tManuf: 0x"); tft.println(manid, HEX);
tft.print("\tDev: 0x"); tft.println(devid, HEX);
Serial.println("Reading QSPI ID");
Serial.print("JEDEC ID: 0x"); Serial.println(flash.getJEDECID(), HEX);
tft.setTextColor(ILI9341_GREEN);
tft.print("QSPI Flash JEDEC 0x"); tft.println(flash.getJEDECID(), HEX);
/*************** SD CARD */
tft.setCursor(0, 48);