diff --git a/Marlin/src/inc/SPI.h b/Marlin/src/inc/SPI.h
index 237bf27430af310ff0869c739a29ef1f6b5176a9..3fa0cecceba47f3153810ae5d9e82eff019f4347 100644
--- a/Marlin/src/inc/SPI.h
+++ b/Marlin/src/inc/SPI.h
@@ -1,7 +1,7 @@
#include <stdint.h>
-#if !defined(SPI_FULL_SPEED)
+#ifndef SPI_FULL_SPEED
/**
* SPI speed where 0 <= index <= 6
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 3609c4a3469746ff0e4dca18f54ef7631434970d..404e93b6d3138784125adccc26ceedf0154a6a27 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -632,7 +632,7 @@ static_assert(1 >= 0
/**
* Make sure Z raise values are set
*/
- #if !defined(Z_CLEARANCE_DEPLOY_PROBE)
+ #ifndef Z_CLEARANCE_DEPLOY_PROBE
#error "You must define Z_CLEARANCE_DEPLOY_PROBE in your configuration."
#elif !defined(Z_CLEARANCE_BETWEEN_PROBES)
#error "You must define Z_CLEARANCE_BETWEEN_PROBES in your configuration."
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 9c044b0d37dd15271dcbb41bf3aef235643b4e5c..98185f6a5b81263ff8f6f3475b768b9ac32791fe 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -276,7 +276,7 @@ inline void do_probe_raise(const float z_raise) {
#endif
}
-#endif
+#endif // Z_PROBE_ALLEN_KEY
#if ENABLED(PROBING_FANS_OFF)
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index bd553c8a9755594c9f9ba07bfd78a807db30ae96..b95d223561d8f3da356c52a348007358d8aaf738 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -323,7 +323,7 @@ void Stepper::isr() {
HAL_TIMER_TYPE ocr_val;
- #if defined(CPU_32_BIT)
+ #ifdef CPU_32_BIT
#define ENDSTOP_NOMINAL_OCR_VAL 1500 * HAL_TICKS_PER_US // check endstops every 1.5ms to guarantee two stepper ISRs within 5ms for BLTouch
#define OCR_VAL_TOLERANCE 500 * HAL_TICKS_PER_US // First max delay is 2.0ms, last min delay is 0.5ms, all others 1.5ms
#else
@@ -335,7 +335,7 @@ void Stepper::isr() {
// Disable Timer0 ISRs and enable global ISR again to capture UART events (incoming chars)
DISABLE_TEMPERATURE_INTERRUPT(); // Temperature ISR
DISABLE_STEPPER_DRIVER_INTERRUPT();
- #if !defined(CPU_32_BIT)
+ #ifndef CPU_32_BIT
sei();
#endif
#endif
diff --git a/Marlin/src/pins/pins_ANET_10.h b/Marlin/src/pins/pins_ANET_10.h
index 8668681bf4e0379659ac5f33c5f773eab65426c2..943e1cdfe6480eefba556c8827510fa4e3b7d21d 100644
--- a/Marlin/src/pins/pins_ANET_10.h
+++ b/Marlin/src/pins/pins_ANET_10.h
@@ -88,7 +88,7 @@
* Many thanks to Hans Raaf (@oderwat) for developing the Anet-specific software and supporting the Anet community.
*/
-#if !defined(__AVR_ATmega1284P__)
+#ifndef __AVR_ATmega1284P__
#error "Oops! Make sure you have 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' selected from the 'Tools -> Boards' menu."
#endif
diff --git a/Marlin/src/pins/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/pins_RAMPS_RE_ARM.h
index 57606c032a8a1deb9b907d97c2711297936f6125..bc33ee4dee45ef9fdb35c7866029d4f6bd8d29da 100644
--- a/Marlin/src/pins/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/pins_RAMPS_RE_ARM.h
@@ -66,7 +66,7 @@
#define Y_MAX_PIN 15 //10k pullup to 3.3V, 1K series
#define Z_MIN_PIN 18 //10k pullup to 3.3V, 1K series
#define Z_MAX_PIN 19 //10k pullup to 3.3V, 1K series
-//#define Z_probe_pin 1 // AUX-1
+//#define Z_PROBE_PIN 1 // AUX-1
//
@@ -267,23 +267,18 @@
//#define SHIFT_EN 41 // J5-4 & AUX-4
#endif
- #if ENABLED(SDSUPPORT)
- #define SDCARD_SORT_ALPHA // Using SORT feature to keep one directory level in RAM
- // When going up/down directory levels the SD card is
- // accessed but the garbage/lines are removed when the
- // LCD updates
-
- // SD Card Sorting options
- #if ENABLED(SDCARD_SORT_ALPHA)
- #define SDSORT_LIMIT 255 // Maximum number of sorted items (10-256). Costs 27 bytes each.
- #define FOLDER_SORTING -1 // -1=above 0=none 1=below
- #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
- #define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
- #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
- #define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.
- #define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
- #endif
- #endif
+ #define SDCARD_SORT_ALPHA // Using SORT feature to keep one directory level in RAM
+ // When going up/down directory levels the SD card is
+ // accessed but the garbage/lines are removed when the
+ // LCD updates
+
+ #define SDSORT_LIMIT 256 // Maximum number of sorted items (10-256). Costs 27 bytes each.
+ #define FOLDER_SORTING -1 // -1=above 0=none 1=below
+ #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
+ #define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
+ #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
+ #define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.
+ #define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
// #define LCD_SCREEN_ROT_180
@@ -307,7 +302,7 @@
#undef LCD_PINS_D5 //59 // J3-8 & AUX-2
#define DOGLCD_A0 59 // J3-8 & AUX-2
#undef LCD_PINS_D6 //63 // J5-3 & AUX-2
- #undef LCD_PINS_D7 //6 // (SERVO1) J5-1 & SERVO connector
+ #undef LCD_PINS_D7 // 6 // (SERVO1) J5-1 & SERVO connector
#define DOGLCD_SCK SCK_PIN
#define DOGLCD_MOSI MOSI_PIN
@@ -335,17 +330,17 @@
// Ethernet pins
//
#ifndef ULTIPANEL
-#define ENET_MDIO 71 // J12-4
-#define ENET_RX_ER 73 // J12-6
-#define ENET_RXD1 75 // J12-8
+ #define ENET_MDIO 71 // J12-4
+ #define ENET_RX_ER 73 // J12-6
+ #define ENET_RXD1 75 // J12-8
#endif
-#define ENET_MOC 70 // J12-3
-#define REF_CLK 72 // J12-5
-#define ENET_RXD0 74 // J12-7
-#define ENET_CRS 76 // J12-9
-#define ENET_TX_EN 77 // J12-10
-#define ENET_TXD0 78 // J12-11
-#define ENET_TXD1 79 // J12-12
+#define ENET_MOC 70 // J12-3
+#define REF_CLK 72 // J12-5
+#define ENET_RXD0 74 // J12-7
+#define ENET_CRS 76 // J12-9
+#define ENET_TX_EN 77 // J12-10
+#define ENET_TXD0 78 // J12-11
+#define ENET_TXD1 79 // J12-12
/**
* PWMS
diff --git a/frameworks/CMSIS/LPC1768/include/lpc_types.h b/frameworks/CMSIS/LPC1768/include/lpc_types.h
index 9ba3d2290b313d4ca6ada9c19bc2865f570a34c8..690f226c41bef6da1ec142df047feda980de8725 100644
--- a/frameworks/CMSIS/LPC1768/include/lpc_types.h
+++ b/frameworks/CMSIS/LPC1768/include/lpc_types.h
@@ -134,7 +134,7 @@ typedef int32_t(*PFI)();
/* NULL pointer */
#ifndef NULL
-#define NULL ((void*) 0)
+ #define NULL ((void*) 0)
#endif
/* Number of elements in an array */
@@ -145,11 +145,11 @@ typedef int32_t(*PFI)();
/* External data/function define */
#define EXTERN extern
-#if !defined(MAX)
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#ifndef MAX
+ #define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
-#if !defined(MIN)
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#ifndef MIN
+ #define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
/**