Browse Source

Tweaks to core headers

Scott Lahteine 7 years ago
parent
commit
4118199ddd

+ 1
- 1
Marlin/src/HAL/HAL_AVR/SanityCheck.h View File

111
     || defined(E2_HARDWARE_SERIAL) \
111
     || defined(E2_HARDWARE_SERIAL) \
112
     || defined(E3_HARDWARE_SERIAL) \
112
     || defined(E3_HARDWARE_SERIAL) \
113
     || defined(E4_HARDWARE_SERIAL) )
113
     || defined(E4_HARDWARE_SERIAL) )
114
-  #error "select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
114
+  #error "Select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
115
 #endif
115
 #endif
116
 
116
 
117
 #endif // _SANITYCHECK_AVR_8_BIT_H_
117
 #endif // _SANITYCHECK_AVR_8_BIT_H_

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

67
 
67
 
68
 // Macros for bit masks
68
 // Macros for bit masks
69
 #undef _BV
69
 #undef _BV
70
-#define _BV(b) (1 << (b))
70
+#define _BV(n) (1<<(n))
71
 #define TEST(n,b) !!((n)&_BV(b))
71
 #define TEST(n,b) !!((n)&_BV(b))
72
 #define SBI(n,b) (n |= _BV(b))
72
 #define SBI(n,b) (n |= _BV(b))
73
 #define CBI(n,b) (n &= ~_BV(b))
73
 #define CBI(n,b) (n &= ~_BV(b))

+ 3
- 0
Marlin/src/inc/MarlinConfig.h View File

28
 #include HAL_PATH(../HAL, HAL.h)
28
 #include HAL_PATH(../HAL, HAL.h)
29
 
29
 
30
 #include "../pins/pins.h"
30
 #include "../pins/pins.h"
31
+
31
 #if defined(__AVR__) && !defined(USBCON)
32
 #if defined(__AVR__) && !defined(USBCON)
32
   #define HardwareSerial_h // trick to disable the standard HWserial
33
   #define HardwareSerial_h // trick to disable the standard HWserial
33
 #endif
34
 #endif
35
+
34
 #include "Conditionals_post.h"
36
 #include "Conditionals_post.h"
35
 #include "SanityCheck.h"
37
 #include "SanityCheck.h"
38
+
36
 #include HAL_PATH(../HAL, SanityCheck.h)
39
 #include HAL_PATH(../HAL, SanityCheck.h)
37
 
40
 
38
 // Include all core headers
41
 // Include all core headers

+ 1
- 2
Marlin/src/inc/MarlinConfigPre.h View File

26
 #include "../HAL/platforms.h"
26
 #include "../HAL/platforms.h"
27
 #include "../core/boards.h"
27
 #include "../core/boards.h"
28
 #include "../core/macros.h"
28
 #include "../core/macros.h"
29
+#include "../core/types.h"
29
 #include "Version.h"
30
 #include "Version.h"
30
 #include "../../Configuration.h"
31
 #include "../../Configuration.h"
31
 #include "Conditionals_LCD.h"
32
 #include "Conditionals_LCD.h"
32
 #include "../../Configuration_adv.h"
33
 #include "../../Configuration_adv.h"
33
 #include "Conditionals_adv.h"
34
 #include "Conditionals_adv.h"
34
 
35
 
35
-#include "../core/types.h"
36
-
37
 #endif // _MARLIN_CONFIGPRE_H_
36
 #endif // _MARLIN_CONFIGPRE_H_

Loading…
Cancel
Save