Skip to content

Commit 1b03380

Browse files
committed
turns out having two things named tft8 makes subclassing very :(
1 parent 3505566 commit 1b03380

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Adafruit_SPITFT.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass,
330330
@param busWidth If tft16 (enumeration in header file), is a 16-bit
331331
parallel connection, else 8-bit.
332332
16-bit isn't fully implemented or tested yet so
333-
applications should pass "tft8" for now...needed to
333+
applications should pass "tft8bitbus" for now...needed to
334334
stick a required enum argument in there to
335335
disambiguate this constructor from the soft-SPI case.
336336
Argument is ignored on 8-bit architectures (no 'wide'
@@ -361,7 +361,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth,
361361
tft8._d0 = d0;
362362
tft8._wr = wr;
363363
tft8._rd = rd;
364-
tft8.wide = (busWidth == tft16);
364+
tft8.wide = (busWidth == tft16bitbus);
365365
#if defined(USE_FAST_PINIO)
366366
#if defined(HAS_PORT_SET_CLR)
367367
#if defined(CORE_TEENSY)

Adafruit_SPITFT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ typedef volatile PORT_t* PORTreg_t; ///< PORT register type
9494
// an enumerated type as the first argument: tft8 (for 8-bit parallel) or
9595
// tft16 (for 16-bit)...even though 16-bit isn't fully implemented or tested
9696
// and might never be, still needed that disambiguation from soft SPI.
97-
enum tftBusWidth { tft8, tft16 }; ///< For first arg to parallel constructor
97+
enum tftBusWidth { tft8bitbus, tft16bitbus }; ///< For first arg to parallel constructor
9898

9999
// CLASS DEFINITION --------------------------------------------------------
100100

0 commit comments

Comments
 (0)