From 1cd971149e95cdc115379d6676f3ce6fc512a776 Mon Sep 17 00:00:00 2001 From: Asuki Kono Date: Tue, 6 Sep 2022 15:12:23 +0900 Subject: [PATCH 1/2] Use int16_t for pins instead of int8_t --- Adafruit_SPITFT.cpp | 20 ++++++++++---------- Adafruit_SPITFT.h | 36 ++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Adafruit_SPITFT.cpp b/Adafruit_SPITFT.cpp index 2c8ef01b..b680a5db 100644 --- a/Adafruit_SPITFT.cpp +++ b/Adafruit_SPITFT.cpp @@ -114,9 +114,9 @@ static const struct { need to call subclass' begin() function, which in turn calls this library's initSPI() function to initialize pins. */ -Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, - int8_t mosi, int8_t sck, int8_t rst, - int8_t miso) +Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc, + int16_t mosi, int16_t sck, int16_t rst, + int16_t miso) : Adafruit_GFX(w, h), connection(TFT_SOFT_SPI), _rst(rst), _cs(cs), _dc(dc) { swspi._sck = sck; @@ -235,15 +235,15 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, this library's initSPI() function to initialize pins. */ #if defined(ESP8266) // See notes below -Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, - int8_t rst) +Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc, + int16_t rst) : Adafruit_GFX(w, h), connection(TFT_HARD_SPI), _rst(rst), _cs(cs), _dc(dc) { hwspi._spi = &SPI; } #else // !ESP8266 -Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, - int8_t rst) +Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc, + int16_t rst) : Adafruit_SPITFT(w, h, &SPI, cs, dc, rst) { // This just invokes the hardware SPI constructor below, // passing the default SPI device (&SPI). @@ -279,7 +279,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, begin or init function. Unfortunate but unavoidable. */ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, - int8_t cs, int8_t dc, int8_t rst) + int16_t cs, int16_t dc, int16_t rst) : Adafruit_GFX(w, h), connection(TFT_HARD_SPI), _rst(rst), _cs(cs), _dc(dc) { hwspi._spi = spiClass; @@ -375,8 +375,8 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, wanting to break existing code). */ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth, - int8_t d0, int8_t wr, int8_t dc, int8_t cs, - int8_t rst, int8_t rd) + int16_t d0, int16_t wr, int16_t dc, int16_t cs, + int16_t rst, int16_t rd) : Adafruit_GFX(w, h), connection(TFT_PARALLEL), _rst(rst), _cs(cs), _dc(dc) { tft8._d0 = d0; diff --git a/Adafruit_SPITFT.h b/Adafruit_SPITFT.h index 8064a742..219962fb 100644 --- a/Adafruit_SPITFT.h +++ b/Adafruit_SPITFT.h @@ -127,23 +127,23 @@ class Adafruit_SPITFT : public Adafruit_GFX { // (reset, miso). cs argument is required but can be -1 if unused -- // rather than moving it to the optional arguments, it was done this way // to avoid breaking existing code (-1 option was a later addition). - Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, int8_t mosi, - int8_t sck, int8_t rst = -1, int8_t miso = -1); + Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc, int16_t mosi, + int16_t sck, int16_t rst = -1, int16_t miso = -1); // Hardware SPI constructor using the default SPI port: expects width & // height (at default rotation setting 0), 2 signal pins (cs, dc), // optional reset pin. cs is required but can be -1 if unused -- rather // than moving it to the optional arguments, it was done this way to // avoid breaking existing code (-1 option was a later addition). - Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, - int8_t rst = -1); + Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc, + int16_t rst = -1); #if !defined(ESP8266) // See notes in .cpp // Hardware SPI constructor using an arbitrary SPI peripheral: expects // width & height (rotation 0), SPIClass pointer, 2 signal pins (cs, dc) // and optional reset pin. cs is required but can be -1 if unused. - Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, int8_t cs, - int8_t dc, int8_t rst = -1); + Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, int16_t cs, + int16_t dc, int16_t rst = -1); #endif // end !ESP8266 // Parallel constructor: expects width & height (rotation 0), flag @@ -151,9 +151,9 @@ class Adafruit_SPITFT : public Adafruit_GFX { // pins (d0, wr, dc), 3 optional pins (cs, rst, rd). 16-bit parallel // isn't even fully implemented but the 'wide' flag was added as a // required argument to avoid ambiguity with other constructors. - Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth, int8_t d0, - int8_t wr, int8_t dc, int8_t cs = -1, int8_t rst = -1, - int8_t rd = -1); + Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth, int16_t d0, + int16_t wr, int16_t dc, int16_t cs = -1, int16_t rst = -1, + int16_t rd = -1); // DESTRUCTOR ---------------------------------------------------------- @@ -436,9 +436,9 @@ class Adafruit_SPITFT : public Adafruit_GFX { ADAGFX_PORT_t misoPinMask; ///< Bitmask for MISO #endif // end !KINETISK #endif // end USE_FAST_PINIO - int8_t _mosi; ///< MOSI pin # - int8_t _miso; ///< MISO pin # - int8_t _sck; ///< SCK pin # + int16_t _mosi; ///< MOSI pin # + int16_t _miso; ///< MISO pin # + int16_t _sck; ///< SCK pin # } swspi; ///< Software SPI values struct { // Values specific to 8-bit parallel: #if defined(USE_FAST_PINIO) @@ -480,9 +480,9 @@ class Adafruit_SPITFT : public Adafruit_GFX { ADAGFX_PORT_t rdPinMaskClr; ///< Bitmask for read strobe CLEAR (AND) #endif // end HAS_PORT_SET_CLR #endif // end USE_FAST_PINIO - int8_t _d0; ///< Data pin 0 # - int8_t _wr; ///< Write strobe pin # - int8_t _rd; ///< Read strobe pin # (or -1) + int16_t _d0; ///< Data pin 0 # + int16_t _wr; ///< Write strobe pin # + int16_t _rd; ///< Read strobe pin # (or -1) bool wide = 0; ///< If true, is 16-bit interface } tft8; ///< Parallel interface settings #if defined(__cplusplus) && (__cplusplus >= 201100) @@ -514,9 +514,9 @@ class Adafruit_SPITFT : public Adafruit_GFX { #endif // end HAS_PORT_SET_CLR #endif // end USE_FAST_PINIO uint8_t connection; ///< TFT_HARD_SPI, TFT_SOFT_SPI, etc. - int8_t _rst; ///< Reset pin # (or -1) - int8_t _cs; ///< Chip select pin # (or -1) - int8_t _dc; ///< Data/command pin # + int16_t _rst; ///< Reset pin # (or -1) + int16_t _cs; ///< Chip select pin # (or -1) + int16_t _dc; ///< Data/command pin # int16_t _xstart = 0; ///< Internal framebuffer X offset int16_t _ystart = 0; ///< Internal framebuffer Y offset From c42d576e234c8de4ab39828416e3d06493ecdfe7 Mon Sep 17 00:00:00 2001 From: Asuki Kono Date: Thu, 8 Sep 2022 22:49:34 +0900 Subject: [PATCH 2/2] Correct indent for comments --- Adafruit_SPITFT.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Adafruit_SPITFT.h b/Adafruit_SPITFT.h index 219962fb..37981074 100644 --- a/Adafruit_SPITFT.h +++ b/Adafruit_SPITFT.h @@ -436,9 +436,9 @@ class Adafruit_SPITFT : public Adafruit_GFX { ADAGFX_PORT_t misoPinMask; ///< Bitmask for MISO #endif // end !KINETISK #endif // end USE_FAST_PINIO - int16_t _mosi; ///< MOSI pin # - int16_t _miso; ///< MISO pin # - int16_t _sck; ///< SCK pin # + int16_t _mosi; ///< MOSI pin # + int16_t _miso; ///< MISO pin # + int16_t _sck; ///< SCK pin # } swspi; ///< Software SPI values struct { // Values specific to 8-bit parallel: #if defined(USE_FAST_PINIO) @@ -480,9 +480,9 @@ class Adafruit_SPITFT : public Adafruit_GFX { ADAGFX_PORT_t rdPinMaskClr; ///< Bitmask for read strobe CLEAR (AND) #endif // end HAS_PORT_SET_CLR #endif // end USE_FAST_PINIO - int16_t _d0; ///< Data pin 0 # - int16_t _wr; ///< Write strobe pin # - int16_t _rd; ///< Read strobe pin # (or -1) + int16_t _d0; ///< Data pin 0 # + int16_t _wr; ///< Write strobe pin # + int16_t _rd; ///< Read strobe pin # (or -1) bool wide = 0; ///< If true, is 16-bit interface } tft8; ///< Parallel interface settings #if defined(__cplusplus) && (__cplusplus >= 201100) @@ -514,9 +514,9 @@ class Adafruit_SPITFT : public Adafruit_GFX { #endif // end HAS_PORT_SET_CLR #endif // end USE_FAST_PINIO uint8_t connection; ///< TFT_HARD_SPI, TFT_SOFT_SPI, etc. - int16_t _rst; ///< Reset pin # (or -1) - int16_t _cs; ///< Chip select pin # (or -1) - int16_t _dc; ///< Data/command pin # + int16_t _rst; ///< Reset pin # (or -1) + int16_t _cs; ///< Chip select pin # (or -1) + int16_t _dc; ///< Data/command pin # int16_t _xstart = 0; ///< Internal framebuffer X offset int16_t _ystart = 0; ///< Internal framebuffer Y offset