Merge pull request #333 from rgiese/master

Fix compiler errors thrown by recent Particle cloud compiler updates
This commit is contained in:
Paint Your Dragon
2021-02-01 10:06:48 -08:00
committed by GitHub
2 changed files with 6 additions and 1 deletions
+2 -1
View File
@@ -560,7 +560,7 @@ void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) {
if (
#if !defined(SPI_INTERFACES_COUNT)
1
#endif
#else
#if SPI_INTERFACES_COUNT > 0
(hwspi._spi == &SPI)
#endif
@@ -579,6 +579,7 @@ void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) {
#if SPI_INTERFACES_COUNT > 5
|| (hwspi._spi == &SPI5)
#endif
#endif // end SPI_INTERFACES_COUNT
) {
hwspi._spi->begin();
}
+4
View File
@@ -154,6 +154,10 @@ public:
int8_t wr, int8_t dc, int8_t cs = -1, int8_t rst = -1,
int8_t rd = -1);
// DESTRUCTOR ----------------------------------------------------------
~Adafruit_SPITFT(){};
// CLASS MEMBER FUNCTIONS ----------------------------------------------
// These first two functions MUST be declared by subclasses: