Browse Source

Fix CYCLES_PER_MICROSECOND conflict

Scott Lahteine 7 years ago
parent
commit
451fb16f9b
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      Marlin/src/core/macros.h

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

@@ -46,7 +46,9 @@
46 46
 #define _O3          __attribute__((optimize("O3")))
47 47
 
48 48
 // Clock speed factors
49
-#define CYCLES_PER_MICROSECOND (F_CPU / 1000000L) // 16 or 20 on AVR
49
+#ifndef CYCLES_PER_MICROSECOND
50
+  #define CYCLES_PER_MICROSECOND (F_CPU / 1000000L) // 16 or 20 on AVR
51
+#endif
50 52
 
51 53
 // Highly granular delays for step pulses, etc.
52 54
 #define DELAY_0_NOP NOOP

Loading…
Cancel
Save