Skip to content

Commit

Permalink
Merge branch 'adafruit:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
mysterywolf authored Feb 16, 2024
2 parents 9b0349d + 126007f commit 7c758b8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 28 deletions.
30 changes: 3 additions & 27 deletions Adafruit_SPITFT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ void Adafruit_SPITFT::writeColor(uint16_t color, uint32_t len) {
if (pixelsThisPass > 50000)
pixelsThisPass = 50000;
len -= pixelsThisPass;
yield(); // Periodic yield() on long fills
delay(1); // Periodic delay on long fills
while (pixelsThisPass--) {
hwspi._spi->write(hi);
hwspi._spi->write(lo);
Expand Down Expand Up @@ -2352,10 +2352,6 @@ inline void Adafruit_SPITFT::SPI_MOSI_HIGH(void) {
#endif // end !HAS_PORT_SET_CLR
#else // !USE_FAST_PINIO
digitalWrite(swspi._mosi, HIGH);
#if defined(ESP32)
for (volatile uint8_t i = 0; i < 1; i++)
;
#endif // end ESP32
#endif // end !USE_FAST_PINIO
}

Expand All @@ -2375,10 +2371,6 @@ inline void Adafruit_SPITFT::SPI_MOSI_LOW(void) {
#endif // end !HAS_PORT_SET_CLR
#else // !USE_FAST_PINIO
digitalWrite(swspi._mosi, LOW);
#if defined(ESP32)
for (volatile uint8_t i = 0; i < 1; i++)
;
#endif // end ESP32
#endif // end !USE_FAST_PINIO
}

Expand All @@ -2390,22 +2382,14 @@ inline void Adafruit_SPITFT::SPI_SCK_HIGH(void) {
#if defined(HAS_PORT_SET_CLR)
#if defined(KINETISK)
*swspi.sckPortSet = 1;
#else // !KINETISK
#else // !KINETISK
*swspi.sckPortSet = swspi.sckPinMask;
#if defined(__IMXRT1052__) || defined(__IMXRT1062__) // Teensy 4.x
for (volatile uint8_t i = 0; i < 1; i++)
;
#endif
#endif
#else // !HAS_PORT_SET_CLR
*swspi.sckPort |= swspi.sckPinMaskSet;
#endif // end !HAS_PORT_SET_CLR
#else // !USE_FAST_PINIO
digitalWrite(swspi._sck, HIGH);
#if defined(ESP32)
for (volatile uint8_t i = 0; i < 1; i++)
;
#endif // end ESP32
#endif // end !USE_FAST_PINIO
}

Expand All @@ -2417,22 +2401,14 @@ inline void Adafruit_SPITFT::SPI_SCK_LOW(void) {
#if defined(HAS_PORT_SET_CLR)
#if defined(KINETISK)
*swspi.sckPortClr = 1;
#else // !KINETISK
#else // !KINETISK
*swspi.sckPortClr = swspi.sckPinMask;
#if defined(__IMXRT1052__) || defined(__IMXRT1062__) // Teensy 4.x
for (volatile uint8_t i = 0; i < 1; i++)
;
#endif
#endif
#else // !HAS_PORT_SET_CLR
*swspi.sckPort &= swspi.sckPinMaskClr;
#endif // end !HAS_PORT_SET_CLR
#else // !USE_FAST_PINIO
digitalWrite(swspi._sck, LOW);
#if defined(ESP32)
for (volatile uint8_t i = 0; i < 1; i++)
;
#endif // end ESP32
#endif // end !USE_FAST_PINIO
}

Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit GFX Library
version=1.11.7
version=1.11.9
author=Adafruit
maintainer=Adafruit <[email protected]>
sentence=Adafruit GFX graphics core library, this is the 'core' class that all our other graphics libraries derive from.
Expand Down

0 comments on commit 7c758b8

Please sign in to comment.