|
4 | 4 | #include "SPI.h" |
5 | 5 | #include "Adafruit_GFX.h" |
6 | 6 | #include "Adafruit_ILI9341.h" |
7 | | -#include "Adafruit_QSPI_GD25Q.h" |
| 7 | +#include "Adafruit_QSPI_Flash.h" |
8 | 8 | #include "Adafruit_ADT7410.h" |
9 | 9 | #include "TouchScreen.h" |
10 | 10 | #include <SD.h> |
|
28 | 28 | // ILI9341 with 8-bit parallel interface: |
29 | 29 | Adafruit_ILI9341 tft = Adafruit_ILI9341(tft8bitbus, TFT_D0, TFT_WR, TFT_DC, TFT_CS, TFT_RST, TFT_RD); |
30 | 30 |
|
31 | | -Adafruit_QSPI_GD25Q flash; |
| 31 | +Adafruit_QSPI_Flash flash; |
| 32 | + |
32 | 33 | Adafruit_ADT7410 tempsensor = Adafruit_ADT7410(); |
33 | 34 |
|
34 | 35 | #define YP A4 // must be an analog pin, use "An" notation! |
@@ -76,20 +77,22 @@ void setup() { |
76 | 77 | tft.println("FAILED"); |
77 | 78 | while (1); |
78 | 79 | } |
79 | | - uint8_t manid, devid; |
| 80 | + uint8_t manid[512]; |
| 81 | + uint8_t devid[512]; |
80 | 82 | Serial.println("Reading Manuf iD"); |
81 | | - devid = flash.readDeviceID(); |
82 | | - manid = flash.readManufacturerID(); |
83 | | - Serial.print("Manuf: "); Serial.println(manid, HEX); |
84 | | - Serial.print("Device: "); Serial.println(devid, HEX); |
85 | | - if (devid != 0x16) { |
| 83 | + flash.GetManufacturerInfo(manid, devid); |
| 84 | + Serial.print("Manuf: "); |
| 85 | + Serial.println(*manid, HEX); |
| 86 | + Serial.print("Device: "); |
| 87 | + Serial.println(*devid, HEX); |
| 88 | + if (*devid != 0x16) { |
86 | 89 | tft.setTextColor(ILI9341_RED); |
87 | 90 | tft.println("FAILED"); |
88 | 91 | Serial.println("QSPI Flash not found!"); |
89 | 92 | while (1); |
90 | 93 | } |
91 | | - tft.print("OK\n\tManuf: 0x"); tft.println(manid, HEX); |
92 | | - tft.print("\tDev: 0x"); tft.println(devid, HEX); |
| 94 | + tft.print("OK\n\tManuf: 0x"); tft.println(*manid, HEX); |
| 95 | + tft.print("\tDev: 0x"); tft.println(*devid, HEX); |
93 | 96 |
|
94 | 97 | /*************** SD CARD */ |
95 | 98 | tft.setCursor(0, 48); |
|
0 commit comments