Skip to content

Commit 6338e26

Browse files
authored
Merge pull request #434 from caternuson/esp32_warns
Remove volatile from wait loops
2 parents b0ac687 + 3c0c85b commit 6338e26

File tree

1 file changed

+2
-26
lines changed

1 file changed

+2
-26
lines changed

Adafruit_SPITFT.cpp

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2305,10 +2305,6 @@ inline void Adafruit_SPITFT::SPI_MOSI_HIGH(void) {
23052305
#endif // end !HAS_PORT_SET_CLR
23062306
#else // !USE_FAST_PINIO
23072307
digitalWrite(swspi._mosi, HIGH);
2308-
#if defined(ESP32)
2309-
for (volatile uint8_t i = 0; i < 1; i++)
2310-
;
2311-
#endif // end ESP32
23122308
#endif // end !USE_FAST_PINIO
23132309
}
23142310

@@ -2328,10 +2324,6 @@ inline void Adafruit_SPITFT::SPI_MOSI_LOW(void) {
23282324
#endif // end !HAS_PORT_SET_CLR
23292325
#else // !USE_FAST_PINIO
23302326
digitalWrite(swspi._mosi, LOW);
2331-
#if defined(ESP32)
2332-
for (volatile uint8_t i = 0; i < 1; i++)
2333-
;
2334-
#endif // end ESP32
23352327
#endif // end !USE_FAST_PINIO
23362328
}
23372329

@@ -2343,22 +2335,14 @@ inline void Adafruit_SPITFT::SPI_SCK_HIGH(void) {
23432335
#if defined(HAS_PORT_SET_CLR)
23442336
#if defined(KINETISK)
23452337
*swspi.sckPortSet = 1;
2346-
#else // !KINETISK
2338+
#else // !KINETISK
23472339
*swspi.sckPortSet = swspi.sckPinMask;
2348-
#if defined(__IMXRT1052__) || defined(__IMXRT1062__) // Teensy 4.x
2349-
for (volatile uint8_t i = 0; i < 1; i++)
2350-
;
2351-
#endif
23522340
#endif
23532341
#else // !HAS_PORT_SET_CLR
23542342
*swspi.sckPort |= swspi.sckPinMaskSet;
23552343
#endif // end !HAS_PORT_SET_CLR
23562344
#else // !USE_FAST_PINIO
23572345
digitalWrite(swspi._sck, HIGH);
2358-
#if defined(ESP32)
2359-
for (volatile uint8_t i = 0; i < 1; i++)
2360-
;
2361-
#endif // end ESP32
23622346
#endif // end !USE_FAST_PINIO
23632347
}
23642348

@@ -2370,22 +2354,14 @@ inline void Adafruit_SPITFT::SPI_SCK_LOW(void) {
23702354
#if defined(HAS_PORT_SET_CLR)
23712355
#if defined(KINETISK)
23722356
*swspi.sckPortClr = 1;
2373-
#else // !KINETISK
2357+
#else // !KINETISK
23742358
*swspi.sckPortClr = swspi.sckPinMask;
2375-
#if defined(__IMXRT1052__) || defined(__IMXRT1062__) // Teensy 4.x
2376-
for (volatile uint8_t i = 0; i < 1; i++)
2377-
;
2378-
#endif
23792359
#endif
23802360
#else // !HAS_PORT_SET_CLR
23812361
*swspi.sckPort &= swspi.sckPinMaskClr;
23822362
#endif // end !HAS_PORT_SET_CLR
23832363
#else // !USE_FAST_PINIO
23842364
digitalWrite(swspi._sck, LOW);
2385-
#if defined(ESP32)
2386-
for (volatile uint8_t i = 0; i < 1; i++)
2387-
;
2388-
#endif // end ESP32
23892365
#endif // end !USE_FAST_PINIO
23902366
}
23912367

0 commit comments

Comments
 (0)