Skip to content
Snippets Groups Projects
Commit ed8f1ca9 authored by Scott Lahteine's avatar Scott Lahteine
Browse files

Revert Cortex delay for now

parent ca6d00b8
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Marlin/src/HAL/HAL_STM32/HAL.cpp
+ 1
− 1
View file @ ed8f1ca9
...@@ -49,7 +49,7 @@ uint16_t HAL_adc_result; ...@@ -49,7 +49,7 @@ uint16_t HAL_adc_result;
// ------------------------ // ------------------------
// Needed for DELAY_NS() / DELAY_US() on CORTEX-M7 // Needed for DELAY_NS() / DELAY_US() on CORTEX-M7
#if (defined(__arm__) || defined(__thumb__)) && WITHIN(__CORTEX_M, 3, 7) #if (defined(__arm__) || defined(__thumb__)) && __CORTEX_M == 7
// HAL pre-initialization task // HAL pre-initialization task
// Force the preinit function to run between the premain() and main() function // Force the preinit function to run between the premain() and main() function
// of the STM32 arduino core // of the STM32 arduino core
... ...
......
Marlin/src/HAL/shared/Delay.h
+ 1
− 1
View file @ ed8f1ca9
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#if defined(__arm__) || defined(__thumb__) #if defined(__arm__) || defined(__thumb__)
#if WITHIN(__CORTEX_M, 3, 7) #if __CORTEX_M == 7
// Cortex-M3 through M7 can use the cycle counter of the DWT unit // Cortex-M3 through M7 can use the cycle counter of the DWT unit
// http://www.anthonyvh.com/2017/05/18/cortex_m-cycle_counter/ // http://www.anthonyvh.com/2017/05/18/cortex_m-cycle_counter/
... ...
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment