alex/Adafruit-GFX-Library
1
0
Fork 0
mirror of https://github.com/adafruit/Adafruit-GFX-Library.git synced 2024-10-03 18:18:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 3bb45ed24c into 0e32d7dc76

Browse Source
This commit is contained in:
Jiri Drozd 2024-10-02 01:20:28 +05:30 committed by GitHub
commit c1e064b824
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Adafruit_SPITFT.cpp
View File

@ -115,9 +115,9 @@ static const struct {
need to call subclass' begin() function, which in turn calls need to call subclass' begin() function, which in turn calls
this library's initSPI() function to initialize pins. this library's initSPI() function to initialize pins.
*/ */
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc,
int8_t mosi, int8_t sck, int8_t rst, int16_t mosi, int16_t sck, int16_t rst,
int8_t miso) int16_t miso)
: Adafruit_GFX(w, h), connection(TFT_SOFT_SPI), _rst(rst), _cs(cs), : Adafruit_GFX(w, h), connection(TFT_SOFT_SPI), _rst(rst), _cs(cs),
_dc(dc) { _dc(dc) {
swspi._sck = sck; swspi._sck = sck;
@ -236,15 +236,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. this library's initSPI() function to initialize pins.
*/ */
#if defined(ESP8266) // See notes below #if defined(ESP8266) // See notes below
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc,
int8_t rst) int16_t rst)
: Adafruit_GFX(w, h), connection(TFT_HARD_SPI), _rst(rst), _cs(cs), : Adafruit_GFX(w, h), connection(TFT_HARD_SPI), _rst(rst), _cs(cs),
_dc(dc) { _dc(dc) {
hwspi._spi = &SPI; hwspi._spi = &SPI;
} }
#else // !ESP8266 #else // !ESP8266
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc,
int8_t rst) int16_t rst)
: Adafruit_SPITFT(w, h, &SPI, cs, dc, rst) { : Adafruit_SPITFT(w, h, &SPI, cs, dc, rst) {
// This just invokes the hardware SPI constructor below, // This just invokes the hardware SPI constructor below,
// passing the default SPI device (&SPI). // passing the default SPI device (&SPI).
@ -280,7 +280,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc,
begin or init function. Unfortunate but unavoidable. begin or init function. Unfortunate but unavoidable.
*/ */
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, 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), : Adafruit_GFX(w, h), connection(TFT_HARD_SPI), _rst(rst), _cs(cs),
_dc(dc) { _dc(dc) {
hwspi._spi = spiClass; hwspi._spi = spiClass;
@ -376,8 +376,8 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass,
wanting to break existing code). wanting to break existing code).
*/ */
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth, Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth,
int8_t d0, int8_t wr, int8_t dc, int8_t cs, int16_t d0, int16_t wr, int16_t dc, int16_t cs,
int8_t rst, int8_t rd) int16_t rst, int16_t rd)
: Adafruit_GFX(w, h), connection(TFT_PARALLEL), _rst(rst), _cs(cs), : Adafruit_GFX(w, h), connection(TFT_PARALLEL), _rst(rst), _cs(cs),
_dc(dc) { _dc(dc) {
tft8._d0 = d0; tft8._d0 = d0;

36
Adafruit_SPITFT.h
View File

@ -128,23 +128,23 @@ public:
// (reset, miso). cs argument is required but can be -1 if unused -- // (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 // rather than moving it to the optional arguments, it was done this way
// to avoid breaking existing code (-1 option was a later addition). // 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, Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc, int16_t mosi,
int8_t sck, int8_t rst = -1, int8_t miso = -1); int16_t sck, int16_t rst = -1, int16_t miso = -1);
// Hardware SPI constructor using the default SPI port: expects width & // Hardware SPI constructor using the default SPI port: expects width &
// height (at default rotation setting 0), 2 signal pins (cs, dc), // height (at default rotation setting 0), 2 signal pins (cs, dc),
// optional reset pin. cs is required but can be -1 if unused -- rather // 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 // than moving it to the optional arguments, it was done this way to
// avoid breaking existing code (-1 option was a later addition). // avoid breaking existing code (-1 option was a later addition).
Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc, Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc,
int8_t rst = -1); int16_t rst = -1);
#if !defined(ESP8266) // See notes in .cpp #if !defined(ESP8266) // See notes in .cpp
// Hardware SPI constructor using an arbitrary SPI peripheral: expects // Hardware SPI constructor using an arbitrary SPI peripheral: expects
// width & height (rotation 0), SPIClass pointer, 2 signal pins (cs, dc) // width & height (rotation 0), SPIClass pointer, 2 signal pins (cs, dc)
// and optional reset pin. cs is required but can be -1 if unused. // 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, Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, int16_t cs,
int8_t dc, int8_t rst = -1); int16_t dc, int16_t rst = -1);
#endif // end !ESP8266 #endif // end !ESP8266
// Parallel constructor: expects width & height (rotation 0), flag // Parallel constructor: expects width & height (rotation 0), flag
@ -152,9 +152,9 @@ public:
// pins (d0, wr, dc), 3 optional pins (cs, rst, rd). 16-bit parallel // 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 // isn't even fully implemented but the 'wide' flag was added as a
// required argument to avoid ambiguity with other constructors. // required argument to avoid ambiguity with other constructors.
Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth, int8_t d0, Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth, int16_t d0,
int8_t wr, int8_t dc, int8_t cs = -1, int8_t rst = -1, int16_t wr, int16_t dc, int16_t cs = -1, int16_t rst = -1,
int8_t rd = -1); int16_t rd = -1);
// DESTRUCTOR ---------------------------------------------------------- // DESTRUCTOR ----------------------------------------------------------
@ -437,9 +437,9 @@ protected:
ADAGFX_PORT_t misoPinMask; ///< Bitmask for MISO ADAGFX_PORT_t misoPinMask; ///< Bitmask for MISO
#endif // end !KINETISK #endif // end !KINETISK
#endif // end USE_FAST_PINIO #endif // end USE_FAST_PINIO
int8_t _mosi; ///< MOSI pin # int16_t _mosi; ///< MOSI pin #
int8_t _miso; ///< MISO pin # int16_t _miso; ///< MISO pin #
int8_t _sck; ///< SCK pin # int16_t _sck; ///< SCK pin #
} swspi; ///< Software SPI values } swspi; ///< Software SPI values
struct { // Values specific to 8-bit parallel: struct { // Values specific to 8-bit parallel:
#if defined(USE_FAST_PINIO) #if defined(USE_FAST_PINIO)
@ -481,9 +481,9 @@ protected:
ADAGFX_PORT_t rdPinMaskClr; ///< Bitmask for read strobe CLEAR (AND) ADAGFX_PORT_t rdPinMaskClr; ///< Bitmask for read strobe CLEAR (AND)
#endif // end HAS_PORT_SET_CLR #endif // end HAS_PORT_SET_CLR
#endif // end USE_FAST_PINIO #endif // end USE_FAST_PINIO
int8_t _d0; ///< Data pin 0 # int16_t _d0; ///< Data pin 0 #
int8_t _wr; ///< Write strobe pin # int16_t _wr; ///< Write strobe pin #
int8_t _rd; ///< Read strobe pin # (or -1) int16_t _rd; ///< Read strobe pin # (or -1)
bool wide = 0; ///< If true, is 16-bit interface bool wide = 0; ///< If true, is 16-bit interface
} tft8; ///< Parallel interface settings } tft8; ///< Parallel interface settings
#if defined(__cplusplus) && (__cplusplus >= 201100) #if defined(__cplusplus) && (__cplusplus >= 201100)
@ -515,9 +515,9 @@ protected:
#endif // end HAS_PORT_SET_CLR #endif // end HAS_PORT_SET_CLR
#endif // end USE_FAST_PINIO #endif // end USE_FAST_PINIO
uint8_t connection; ///< TFT_HARD_SPI, TFT_SOFT_SPI, etc. uint8_t connection; ///< TFT_HARD_SPI, TFT_SOFT_SPI, etc.
int8_t _rst; ///< Reset pin # (or -1) int16_t _rst; ///< Reset pin # (or -1)
int8_t _cs; ///< Chip select pin # (or -1) int16_t _cs; ///< Chip select pin # (or -1)
int8_t _dc; ///< Data/command pin # int16_t _dc; ///< Data/command pin #
int16_t _xstart = 0; ///< Internal framebuffer X offset int16_t _xstart = 0; ///< Internal framebuffer X offset
int16_t _ystart = 0; ///< Internal framebuffer Y offset int16_t _ystart = 0; ///< Internal framebuffer Y offset