Browse Source

Revert Cortex delay for now

Scott Lahteine 4 years ago
parent
commit
ed8f1ca9cf
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/src/HAL/HAL_STM32/HAL.cpp
  2. 1
    1
      Marlin/src/HAL/shared/Delay.h

+ 1
- 1
Marlin/src/HAL/HAL_STM32/HAL.cpp View File

49
 // ------------------------
49
 // ------------------------
50
 
50
 
51
 // Needed for DELAY_NS() / DELAY_US() on CORTEX-M7
51
 // Needed for DELAY_NS() / DELAY_US() on CORTEX-M7
52
-#if (defined(__arm__) || defined(__thumb__)) && WITHIN(__CORTEX_M, 3, 7)
52
+#if (defined(__arm__) || defined(__thumb__)) && __CORTEX_M == 7
53
   // HAL pre-initialization task
53
   // HAL pre-initialization task
54
   // Force the preinit function to run between the premain() and main() function
54
   // Force the preinit function to run between the premain() and main() function
55
   // of the STM32 arduino core
55
   // of the STM32 arduino core

+ 1
- 1
Marlin/src/HAL/shared/Delay.h View File

34
 
34
 
35
 #if defined(__arm__) || defined(__thumb__)
35
 #if defined(__arm__) || defined(__thumb__)
36
 
36
 
37
-  #if WITHIN(__CORTEX_M, 3, 7)
37
+  #if __CORTEX_M == 7
38
 
38
 
39
     // Cortex-M3 through M7 can use the cycle counter of the DWT unit
39
     // Cortex-M3 through M7 can use the cycle counter of the DWT unit
40
     // http://www.anthonyvh.com/2017/05/18/cortex_m-cycle_counter/
40
     // http://www.anthonyvh.com/2017/05/18/cortex_m-cycle_counter/

Loading…
Cancel
Save