zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert Cortex delay for now

Browse source
This commit is contained in:
Scott Lahteine 2019-11-02 04:12:10 -05:00
parent ca6d00b862
commit ed8f1ca9cf
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/HAL_STM32/HAL.cpp
View file

@ -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

2
Marlin/src/HAL/shared/Delay.h
View file

@ -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/