mirror of
https://github.com/adafruit/Adafruit-GFX-Library.git
synced 2024-10-03 18:18:46 -04:00
Revert "added ARDUINO_ARCH_STM32 platform detection and change dc/rst/ce pin variables from int8_t to int16_t for this platform"
This reverts commit 83224c7198.
This commit is contained in:
Buger
parent
83224c7198
commit
3bb45ed24c
@ -114,15 +114,9 @@ static const struct {
|
||||
need to call subclass' begin() function, which in turn calls
|
||||
this library's initSPI() function to initialize pins.
|
||||
*/
|
||||
#if defined(ARDUINO_ARCH_STM32) //use int16_t for STM32 pin definitions
|
||||
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)
|
||||
#else
|
||||
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)
|
||||
#endif
|
||||
: Adafruit_GFX(w, h), connection(TFT_SOFT_SPI), _rst(rst), _cs(cs),
|
||||
_dc(dc) {
|
||||
swspi._sck = sck;
|
||||
@ -241,26 +235,19 @@ 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;
|
||||
}
|
||||
#elif defined(ARDUINO_ARCH_STM32) //use int16_t for STM32 pin definitions
|
||||
#else // !ESP8266
|
||||
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).
|
||||
}
|
||||
#else // other than ESP8266 / STM32
|
||||
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc,
|
||||
int8_t rst)
|
||||
: Adafruit_SPITFT(w, h, &SPI, cs, dc, rst) {
|
||||
// This just invokes the hardware SPI constructor below,
|
||||
// passing the default SPI device (&SPI).
|
||||
}
|
||||
#endif // end !ESP8266
|
||||
|
||||
#if !defined(ESP8266)
|
||||
@ -291,13 +278,8 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc,
|
||||
GPIO manually. Do this BEFORE calling the display-specific
|
||||
begin or init function. Unfortunate but unavoidable.
|
||||
*/
|
||||
#if defined(ARDUINO_ARCH_STM32) //use int16_t for STM32 pin definitions
|
||||
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass,
|
||||
int16_t cs, int16_t dc, int16_t rst)
|
||||
#else
|
||||
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass,
|
||||
int8_t cs, int8_t dc, int8_t rst)
|
||||
#endif
|
||||
: Adafruit_GFX(w, h), connection(TFT_HARD_SPI), _rst(rst), _cs(cs),
|
||||
_dc(dc) {
|
||||
hwspi._spi = spiClass;
|
||||
@ -392,15 +374,9 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass,
|
||||
only SPI displays, parallel being a recent addition (but not
|
||||
wanting to break existing code).
|
||||
*/
|
||||
#if defined(ARDUINO_ARCH_STM32) //use int16_t for STM32 pin definitions
|
||||
Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h, tftBusWidth busWidth,
|
||||
int16_t d0, int16_t wr, int16_t dc, int16_t cs,
|
||||
int16_t rst, int16_t rd)
|
||||
#else
|
||||
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)
|
||||
#endif
|
||||
: Adafruit_GFX(w, h), connection(TFT_PARALLEL), _rst(rst), _cs(cs),
|
||||
_dc(dc) {
|
||||
tft8._d0 = d0;
|
||||
|
||||
@ -127,38 +127,23 @@ public:
|
||||
// (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).
|
||||
#if defined(ARDUINO_ARCH_STM32)
|
||||
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);
|
||||
#else
|
||||
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);
|
||||
#endif
|
||||
|
||||
// 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).
|
||||
#if defined(ARDUINO_ARCH_STM32)
|
||||
Adafruit_SPITFT(uint16_t w, uint16_t h, int16_t cs, int16_t dc,
|
||||
int16_t rst = -1);
|
||||
#else
|
||||
Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t cs, int8_t dc,
|
||||
int8_t rst = -1);
|
||||
#endif
|
||||
|
||||
#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.
|
||||
#if defined(ARDUINO_ARCH_STM32)
|
||||
Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, int16_t cs,
|
||||
int16_t dc, int16_t rst = -1);
|
||||
#else
|
||||
Adafruit_SPITFT(uint16_t w, uint16_t h, SPIClass *spiClass, int8_t cs,
|
||||
int8_t dc, int8_t rst = -1);
|
||||
#endif
|
||||
#endif // end !ESP8266
|
||||
|
||||
// Parallel constructor: expects width & height (rotation 0), flag
|
||||
@ -166,15 +151,9 @@ public:
|
||||
// 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.
|
||||
#if defined(ARDUINO_ARCH_STM32)
|
||||
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);
|
||||
#else
|
||||
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);
|
||||
#endif
|
||||
|
||||
// DESTRUCTOR ----------------------------------------------------------
|
||||
|
||||
@ -456,15 +435,9 @@ protected:
|
||||
ADAGFX_PORT_t misoPinMask; ///< Bitmask for MISO
|
||||
#endif // end !KINETISK
|
||||
#endif // end USE_FAST_PINIO
|
||||
#if defined(ARDUINO_ARCH_STM32)
|
||||
int16_t _mosi; ///< MOSI pin #
|
||||
int16_t _miso; ///< MISO pin #
|
||||
int16_t _sck; ///< SCK pin #
|
||||
#else
|
||||
int8_t _mosi; ///< MOSI pin #
|
||||
int8_t _miso; ///< MISO pin #
|
||||
int8_t _sck; ///< SCK pin #
|
||||
#endif
|
||||
} swspi; ///< Software SPI values
|
||||
struct { // Values specific to 8-bit parallel:
|
||||
#if defined(USE_FAST_PINIO)
|
||||
@ -506,15 +479,9 @@ protected:
|
||||
ADAGFX_PORT_t rdPinMaskClr; ///< Bitmask for read strobe CLEAR (AND)
|
||||
#endif // end HAS_PORT_SET_CLR
|
||||
#endif // end USE_FAST_PINIO
|
||||
#if defined(ARDUINO_ARCH_STM32)
|
||||
int16_t _d0; ///< Data pin 0 #
|
||||
int16_t _wr; ///< Write strobe pin #
|
||||
int16_t _rd; ///< Read strobe pin # (or -1)
|
||||
#else
|
||||
int8_t _d0; ///< Data pin 0 #
|
||||
int8_t _wr; ///< Write strobe pin #
|
||||
int8_t _rd; ///< Read strobe pin # (or -1)
|
||||
#endif
|
||||
bool wide = 0; ///< If true, is 16-bit interface
|
||||
} tft8; ///< Parallel interface settings
|
||||
#if defined(__cplusplus) && (__cplusplus >= 201100)
|
||||
@ -546,15 +513,9 @@ protected:
|
||||
#endif // end HAS_PORT_SET_CLR
|
||||
#endif // end USE_FAST_PINIO
|
||||
uint8_t connection; ///< TFT_HARD_SPI, TFT_SOFT_SPI, etc.
|
||||
#if defined(ARDUINO_ARCH_STM32)
|
||||
int16_t _rst; ///< Reset pin # (or -1)
|
||||
int16_t _cs; ///< Chip select pin # (or -1)
|
||||
int16_t _dc; ///< Data/command pin #
|
||||
#else
|
||||
int8_t _rst; ///< Reset pin # (or -1)
|
||||
int8_t _cs; ///< Chip select pin # (or -1)
|
||||
int8_t _dc; ///< Data/command pin #
|
||||
#endif
|
||||
|
||||
int16_t _xstart = 0; ///< Internal framebuffer X offset
|
||||
int16_t _ystart = 0; ///< Internal framebuffer Y offset
|
||||
|
||||
Loading…
Reference in New Issue
Block a user