From 4118199ddd94d1cb46ee96c21c49ca5dcd48bc4e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 21 May 2018 20:32:10 -0500
Subject: [PATCH] Tweaks to core headers

---
 Marlin/src/HAL/HAL_AVR/SanityCheck.h | 2 +-
 Marlin/src/core/macros.h             | 2 +-
 Marlin/src/inc/MarlinConfig.h        | 3 +++
 Marlin/src/inc/MarlinConfigPre.h     | 3 +--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/HAL/HAL_AVR/SanityCheck.h b/Marlin/src/HAL/HAL_AVR/SanityCheck.h
index bcc8fb42ea..f2907205d7 100644
--- a/Marlin/src/HAL/HAL_AVR/SanityCheck.h
+++ b/Marlin/src/HAL/HAL_AVR/SanityCheck.h
@@ -111,7 +111,7 @@
     || defined(E2_HARDWARE_SERIAL) \
     || defined(E3_HARDWARE_SERIAL) \
     || defined(E4_HARDWARE_SERIAL) )
-  #error "select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
+  #error "Select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
 #endif
 
 #endif // _SANITYCHECK_AVR_8_BIT_H_
diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index f760ce8209..dc1c35b863 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -67,7 +67,7 @@
 
 // Macros for bit masks
 #undef _BV
-#define _BV(b) (1 << (b))
+#define _BV(n) (1<<(n))
 #define TEST(n,b) !!((n)&_BV(b))
 #define SBI(n,b) (n |= _BV(b))
 #define CBI(n,b) (n &= ~_BV(b))
diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
index 58f67af7b9..539726e405 100644
--- a/Marlin/src/inc/MarlinConfig.h
+++ b/Marlin/src/inc/MarlinConfig.h
@@ -28,11 +28,14 @@
 #include HAL_PATH(../HAL, HAL.h)
 
 #include "../pins/pins.h"
+
 #if defined(__AVR__) && !defined(USBCON)
   #define HardwareSerial_h // trick to disable the standard HWserial
 #endif
+
 #include "Conditionals_post.h"
 #include "SanityCheck.h"
+
 #include HAL_PATH(../HAL, SanityCheck.h)
 
 // Include all core headers
diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h
index c4f1ec6d39..9ed1ee8ffa 100644
--- a/Marlin/src/inc/MarlinConfigPre.h
+++ b/Marlin/src/inc/MarlinConfigPre.h
@@ -26,12 +26,11 @@
 #include "../HAL/platforms.h"
 #include "../core/boards.h"
 #include "../core/macros.h"
+#include "../core/types.h"
 #include "Version.h"
 #include "../../Configuration.h"
 #include "Conditionals_LCD.h"
 #include "../../Configuration_adv.h"
 #include "Conditionals_adv.h"
 
-#include "../core/types.h"
-
 #endif // _MARLIN_CONFIGPRE_H_