From 12c5fdfdb52007f2ed2d76bd969efeae41dd2810 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 20 Feb 2018 03:09:53 -0600
Subject: [PATCH] Fix CYCLES_PER_MICROSECOND conflict on STM32F1

---
 Marlin/src/core/macros.h        | 2 +-
 Marlin/src/pins/pins_STM32F1R.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 0e498b8b42..c61e7d4cbe 100644
--- 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
 
diff --git a/Marlin/src/pins/pins_STM32F1R.h b/Marlin/src/pins/pins_STM32F1R.h
index acbc2f47cf..6d73853118 100644
--- 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