Fix CYCLES_PER_MICROSECOND conflict on STM32F1

2018-02-20 03:09:53 -06:00
parent a810e585db
commit 12c5fdfdb5
2 changed files with 2 additions and 2 deletions
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -46,7 +46,7 @@
 #define _O3          __attribute__((optimize("O3")))

 // Clock speed factors
-#ifndef CYCLES_PER_MICROSECOND
+#if !defined(CYCLES_PER_MICROSECOND) && !defined(__STM32F1__)
  #define CYCLES_PER_MICROSECOND (F_CPU / 1000000L) // 16 or 20 on AVR
 #endif

--- a/Marlin/src/pins/pins_STM32F1R.h
+++ b/Marlin/src/pins/pins_STM32F1R.h
@@ -20,7 +20,7 @@
 *
 */

-#if !defined(__STM32F1__)
+#ifndef __STM32F1__
    #error "Oops!  Make sure you have an STM32F1 board selected from the 'Tools -> Boards' menu."
 #endif