Skip to content
Snippets Groups Projects
Commit 451fb16f authored by Scott Lahteine's avatar Scott Lahteine
Browse files

Fix CYCLES_PER_MICROSECOND conflict

parent 3e384b60
Show whitespace changes
Inline Side-by-side
Marlin/src/core/macros.h
+ 3
− 1
View file @ 451fb16f
...@@ -46,7 +46,9 @@ ...@@ -46,7 +46,9 @@
#define _O3 __attribute__((optimize("O3"))) #define _O3 __attribute__((optimize("O3")))
// Clock speed factors // Clock speed factors
#ifndef CYCLES_PER_MICROSECOND
#define CYCLES_PER_MICROSECOND (F_CPU / 1000000L) // 16 or 20 on AVR #define CYCLES_PER_MICROSECOND (F_CPU / 1000000L) // 16 or 20 on AVR
#endif
// Highly granular delays for step pulses, etc. // Highly granular delays for step pulses, etc.
#define DELAY_0_NOP NOOP #define DELAY_0_NOP NOOP
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment