Skip to content

Commit 3dab29c

Browse files
Merge pull request #333 from rgiese/master
Fix compiler errors thrown by recent Particle cloud compiler updates
2 parents b53849e + 347b134 commit 3dab29c

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Adafruit_SPITFT.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) {
560560
if (
561561
#if !defined(SPI_INTERFACES_COUNT)
562562
1
563-
#endif
563+
#else
564564
#if SPI_INTERFACES_COUNT > 0
565565
(hwspi._spi == &SPI)
566566
#endif
@@ -579,6 +579,7 @@ void Adafruit_SPITFT::initSPI(uint32_t freq, uint8_t spiMode) {
579579
#if SPI_INTERFACES_COUNT > 5
580580
|| (hwspi._spi == &SPI5)
581581
#endif
582+
#endif // end SPI_INTERFACES_COUNT
582583
) {
583584
hwspi._spi->begin();
584585
}

Adafruit_SPITFT.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ class Adafruit_SPITFT : public Adafruit_GFX {
154154
int8_t wr, int8_t dc, int8_t cs = -1, int8_t rst = -1,
155155
int8_t rd = -1);
156156

157+
// DESTRUCTOR ----------------------------------------------------------
158+
159+
~Adafruit_SPITFT(){};
160+
157161
// CLASS MEMBER FUNCTIONS ----------------------------------------------
158162

159163
// These first two functions MUST be declared by subclasses:

0 commit comments

Comments
 (0)