Browse Source

Fix CYCLES_PER_MICROSECOND conflict on STM32F1

Scott Lahteine 7 years ago
parent
commit
12c5fdfdb5
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/src/core/macros.h
  2. 1
    1
      Marlin/src/pins/pins_STM32F1R.h

+ 1
- 1
Marlin/src/core/macros.h View File

@@ -46,7 +46,7 @@
46 46
 #define _O3          __attribute__((optimize("O3")))
47 47
 
48 48
 // Clock speed factors
49
-#ifndef CYCLES_PER_MICROSECOND
49
+#if !defined(CYCLES_PER_MICROSECOND) && !defined(__STM32F1__)
50 50
   #define CYCLES_PER_MICROSECOND (F_CPU / 1000000L) // 16 or 20 on AVR
51 51
 #endif
52 52
 

+ 1
- 1
Marlin/src/pins/pins_STM32F1R.h View File

@@ -20,7 +20,7 @@
20 20
  *
21 21
  */
22 22
 
23
-#if !defined(__STM32F1__)
23
+#ifndef __STM32F1__
24 24
     #error "Oops!  Make sure you have an STM32F1 board selected from the 'Tools -> Boards' menu."
25 25
 #endif
26 26
 

Loading…
Cancel
Save