Skip to content

Commit a34c594

Browse files
SPITFT: don't USE_FAST_PINIO on WICED
1 parent f379d70 commit a34c594

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

Adafruit_SPITFT.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ Adafruit_SPITFT::Adafruit_SPITFT(uint16_t w, uint16_t h,
160160
@param freq The desired maximum SPI hardware clock frequency
161161
*/
162162
/**************************************************************************/
163-
void Adafruit_SPITFT::initSPI(uint32_t freq)
164-
{
163+
void Adafruit_SPITFT::initSPI(uint32_t freq) {
165164
_freq = freq;
166165

167166
// Control Pins

Adafruit_SPITFT.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@
1313
#define USE_FAST_PINIO
1414

1515
#if defined(__AVR__)
16-
typedef volatile uint8_t RwReg;
16+
typedef volatile uint8_t RwReg;
1717
#elif defined(ARDUINO_STM32_FEATHER)
18-
typedef volatile uint32 RwReg;
18+
typedef volatile uint32 RwReg;
19+
#undef USE_FAST_PINIO
1920
#elif defined(__OPENCR__) || defined (__OPENCM904__)
20-
#undef USE_FAST_PINIO
21+
#undef USE_FAST_PINIO
2122
#elif defined(ARDUINO_FEATHER52) || defined(__arm__)
22-
typedef volatile uint32_t RwReg;
23+
typedef volatile uint32_t RwReg;
2324
#elif defined(ESP32) || defined(ESP8266)
24-
typedef volatile uint32_t RwReg;
25-
#undef USE_FAST_PINIO
25+
typedef volatile uint32_t RwReg;
26+
#undef USE_FAST_PINIO
2627
#else
27-
#undef USE_FAST_PINIO
28+
#undef USE_FAST_PINIO
2829
#endif
2930

3031
#include "Adafruit_SPITFT_Macros.h"
@@ -37,7 +38,8 @@ class Adafruit_SPITFT : public Adafruit_GFX {
3738
Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t _CS, int8_t _DC, int8_t _MOSI, int8_t _SCLK, int8_t _RST = -1, int8_t _MISO = -1);
3839
Adafruit_SPITFT(uint16_t w, uint16_t h, int8_t _CS, int8_t _DC, int8_t _RST = -1);
3940

40-
virtual void begin(uint32_t freq) = 0; ///< Virtual begin() function to set SPI frequency, must be overridden in subclass. @param freq Maximum SPI hardware clock speed
41+
virtual void begin(uint32_t freq) = 0; ///< Virtual begin() function to set SPI frequency, must be overridden in subclass. @param freq Maximum SPI hardware clock speed
42+
4143
void initSPI(uint32_t freq);
4244

4345
// Required Non-Transaction

Adafruit_SPITFT_Macros.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* Hardware SPI Macros
4747
* */
4848

49-
#define SPI_OBJECT SPI
49+
#define SPI_OBJECT SPI
5050

5151
#if defined (__AVR__) || defined(TEENSYDUINO) || defined(ARDUINO_ARCH_STM32F1)
5252
#define HSPI_SET_CLOCK() SPI_OBJECT.setClockDivider(SPI_CLOCK_DIV2);
@@ -115,5 +115,4 @@ static inline uint8_t _avr_spi_read(void) {
115115
#define SPI_WRITE32(l) if(_sclk < 0){HSPI_WRITE32(l);}else{SSPI_WRITE32(l);}
116116
#define SPI_WRITE_PIXELS(c,l) if(_sclk < 0){HSPI_WRITE_PIXELS(c,l);}else{SSPI_WRITE_PIXELS(c,l);}
117117

118-
119-
#endif
118+
#endif // _ADAFRUIT_SPITFT_MACROS

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Adafruit GFX Library
2-
version=1.2.7
2+
version=1.2.8
33
author=Adafruit
44
maintainer=Adafruit <[email protected]>
55
sentence=Adafruit GFX graphics core library, this is the 'core' class that all our other graphics libraries derive from.

0 commit comments

Comments
 (0)