Merge patches from bugfix-2.0.x

Marlin/Configuration.h

@@ -99,6 +99,7 @@
 /**
  * Select the serial port on the board to use for communication with the host.
  * This allows the connection of wireless adapters (for instance) to non-default port pins.
+ * Serial port -1 is the USB emulated serial port, if available.
  * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
  *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
@@ -107,9 +108,6 @@
 
 /**
  * Select a secondary serial port on the board to use for communication with the host.
- * This allows the connection of wireless adapters (for instance) to non-default port pins.
- * Serial port -1 is the USB emulated serial port, if available.
- *
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 //#define SERIAL_PORT_2 -1
@@ -363,6 +361,7 @@
  *   331 : (3.3V scaled thermistor 1 table for MEGA)
  *   332 : (3.3V scaled thermistor 1 table for DUE)
  *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
+ *   202 : 200k thermistor - Copymaster 3D
  *     3 : Mendel-parts thermistor (4.7k pullup)
  *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
  *     5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup)

Marlin/Configuration_adv.h

@@ -338,15 +338,22 @@
  * Controller Fan
  * To cool down the stepper drivers and MOSFETs.
  *
- * The fan will turn on automatically whenever any stepper is enabled
- * and turn off after a set period after all steppers are turned off.
+ * The fan turns on automatically whenever any driver is enabled and turns
+ * off (or reduces to idle speed) shortly after drivers are turned off.
+ *
  */
 //#define USE_CONTROLLER_FAN
 #if ENABLED(USE_CONTROLLER_FAN)
-  //#define CONTROLLER_FAN_PIN -1           // Set a custom pin for the controller fan
-  #define CONTROLLERFAN_SECS 60             // Duration in seconds for the fan to run after all motors are disabled
-  #define CONTROLLERFAN_SPEED 255           // 255 == full speed
-  //#define CONTROLLERFAN_SPEED_Z_ONLY 127  // Reduce noise on machines that keep Z enabled
+  //#define CONTROLLER_FAN_PIN -1        // Set a custom pin for the controller fan
+  //#define CONTROLLER_FAN_USE_Z_ONLY    // With this option only the Z axis is considered
+  #define CONTROLLERFAN_SPEED_MIN      0 // (0-255) Minimum speed. (If set below this value the fan is turned off.)
+  #define CONTROLLERFAN_SPEED_ACTIVE 255 // (0-255) Active speed, used when any motor is enabled
+  #define CONTROLLERFAN_SPEED_IDLE     0 // (0-255) Idle speed, used when motors are disabled
+  #define CONTROLLERFAN_IDLE_TIME     60 // (seconds) Extra time to keep the fan running after disabling motors
+  //#define CONTROLLER_FAN_EDITABLE      // Enable M710 configurable settings
+  #if ENABLED(CONTROLLER_FAN_EDITABLE)
+    #define CONTROLLER_FAN_MENU          // Enable the Controller Fan submenu
+  #endif
 #endif
 
 // When first starting the main fan, run it at full speed for the

Marlin/Makefile

@@ -267,6 +267,8 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1147)
 else ifeq ($(HARDWARE_MOTHERBOARD),1148)
 # MKS GEN L V2
 else ifeq ($(HARDWARE_MOTHERBOARD),1149)
+# Copymaster 3D
+else ifeq ($(HARDWARE_MOTHERBOARD),1150)
 
 #
 # RAMBo and derivatives

Marlin/src/HAL/DUE/HAL.h

@@ -39,7 +39,7 @@
 #include <stdint.h>
 
 // Define MYSERIAL0/1 before MarlinSerial includes!
-#if SERIAL_PORT == -1
+#if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER)
   #define MYSERIAL0 customizedSerial1
 #elif SERIAL_PORT == 0
   #define MYSERIAL0 Serial
@@ -56,7 +56,7 @@
 #ifdef SERIAL_PORT_2
   #if SERIAL_PORT_2 == SERIAL_PORT
     #error "SERIAL_PORT_2 must be different from SERIAL_PORT. Please update your configuration."
-  #elif SERIAL_PORT_2 == -1
+  #elif SERIAL_PORT_2 == -1 || ENABLED(EMERGENCY_PARSER)
     #define MYSERIAL1 customizedSerial2
   #elif SERIAL_PORT_2 == 0
     #define MYSERIAL1 Serial
@@ -94,7 +94,6 @@
   #endif
 #endif
 
-
 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
 

Marlin/src/HAL/DUE/MarlinSerial.cpp

@@ -629,23 +629,13 @@ void MarlinSerial<Cfg>::printFloat(double number, uint8_t digits) {
 
 // If not using the USB port as serial port
 #if SERIAL_PORT >= 0
-
-  // Preinstantiate
-  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT>>;
-
-  // Instantiate
-  MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
-
+  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT>>;      // Define
+  MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;   // Instantiate
 #endif
 
-#ifdef SERIAL_PORT_2
-
-  // Preinstantiate
-  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>>;
-
-  // Instantiate
-  MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2;
-
+#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
+  template class MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>>;    // Define
+  MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2; // Instantiate
 #endif
 
 #endif // ARDUINO_ARCH_SAM

Marlin/src/HAL/DUE/MarlinSerial.h

@@ -172,13 +172,9 @@ struct MarlinSerialCfg {
 };
 
 #if SERIAL_PORT >= 0
-
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT>> customizedSerial1;
+#endif
 
-#endif // SERIAL_PORT >= 0
-
-#ifdef SERIAL_PORT_2
-
+#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
   extern MarlinSerial<MarlinSerialCfg<SERIAL_PORT_2>> customizedSerial2;
-
 #endif

Marlin/src/HAL/DUE/MarlinSerialUSB.cpp

@@ -29,7 +29,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if SERIAL_PORT == -1
+#if HAS_USB_SERIAL
 
 #include "MarlinSerialUSB.h"
 
@@ -283,8 +283,12 @@ void MarlinSerialUSB::printFloat(double number, uint8_t digits) {
 }
 
 // Preinstantiate
-MarlinSerialUSB customizedSerial1;
-
-#endif // SERIAL_PORT == -1
+#if SERIAL_PORT == -1
+  MarlinSerialUSB customizedSerial1;
+#endif
+#if SERIAL_PORT_2 == -1
+  MarlinSerialUSB customizedSerial2;
+#endif
 
+#endif // HAS_USB_SERIAL
 #endif // ARDUINO_ARCH_SAM

Marlin/src/HAL/DUE/MarlinSerialUSB.h

@@ -28,7 +28,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if SERIAL_PORT == -1
+#if HAS_USB_SERIAL
 
 #include <WString.h>
 
@@ -88,6 +88,12 @@ private:
   static void printFloat(double, uint8_t);
 };
 
-extern MarlinSerialUSB customizedSerial1;
+#if SERIAL_PORT == -1
+  extern MarlinSerialUSB customizedSerial1;
+#endif
+
+#if SERIAL_PORT_2 == -1
+  extern MarlinSerialUSB customizedSerial2;
+#endif
 
-#endif // SERIAL_PORT == -1
+#endif // HAS_USB_SERIAL

Marlin/src/HAL/LPC1768/HAL.cpp

@@ -67,9 +67,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
   return ind > -1 ? ind : dval;
 }
 
-void flashFirmware(int16_t value) {
-  NVIC_SystemReset();
-}
+void flashFirmware(const int16_t) { NVIC_SystemReset(); }
 
 void HAL_clear_reset_source(void) {
   #if ENABLED(USE_WATCHDOG)

Marlin/src/HAL/LPC1768/HAL.h

@@ -195,7 +195,7 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 void HAL_idletask();
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);
 
 /**
  * set_pwm_frequency

Marlin/src/HAL/STM32/HAL.cpp

@@ -133,6 +133,6 @@ void HAL_adc_start_conversion(const uint8_t adc_pin) { HAL_adc_result = analogRe
 
 uint16_t HAL_adc_get_result() { return HAL_adc_result; }
 
-void flashFirmware(int16_t) { NVIC_SystemReset(); }
+void flashFirmware(const int16_t) { NVIC_SystemReset(); }
 
 #endif // ARDUINO_ARCH_STM32 && !STM32GENERIC

Marlin/src/HAL/STM32/HAL.h

@@ -223,4 +223,4 @@ uint16_t HAL_adc_get_result();
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);

Marlin/src/HAL/STM32F1/HAL.cpp

@@ -388,6 +388,6 @@ void analogWrite(pin_t pin, int pwm_val8) {
     analogWrite(uint8_t(pin), pwm_val8);
 }
 
-void flashFirmware(int16_t value) { nvic_sys_reset(); }
+void flashFirmware(const int16_t) { nvic_sys_reset(); }
 
 #endif // __STM32F1__

Marlin/src/HAL/STM32F1/HAL.h

@@ -160,6 +160,7 @@ void HAL_idletask();
 
 #ifndef digitalPinHasPWM
   #define digitalPinHasPWM(P) (PIN_MAP[P].timer_device != nullptr)
+  #define NO_COMPILE_TIME_PWM
 #endif
 
 #define CRITICAL_SECTION_START()  uint32_t primask = __get_primask(); (void)__iCliRetVal()
@@ -287,4 +288,4 @@ void analogWrite(pin_t pin, int pwm_val8); // PWM only! mul by 257 in maple!?
 #define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
 
 #define PLATFORM_M997_SUPPORT
-void flashFirmware(int16_t value);
+void flashFirmware(const int16_t);

Marlin/src/MarlinCore.cpp

@@ -567,7 +567,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
   #endif
 
   #if ENABLED(USE_CONTROLLER_FAN)
-    controllerfan_update(); // Check if fan should be turned on to cool stepper drivers down
+    controllerFan.update(); // Check if fan should be turned on to cool stepper drivers down
   #endif
 
   #if ENABLED(AUTO_POWER_CONTROL)
@@ -984,6 +984,10 @@ void setup() {
     SETUP_RUN(leds.setup());
   #endif
 
+  #if ENABLED(USE_CONTROLLER_FAN)     // Set up fan controller to initialize also the default configurations.
+    SETUP_RUN(controllerFan.setup());
+  #endif
+
   SETUP_RUN(ui.init());
   SETUP_RUN(ui.reset_status());       // Load welcome message early. (Retained if no errors exist.)
 
@@ -1047,10 +1051,6 @@ void setup() {
     SETUP_RUN(endstops.enable_z_probe(false));
   #endif
 
-  #if ENABLED(USE_CONTROLLER_FAN)
-    SET_OUTPUT(CONTROLLER_FAN_PIN);
-  #endif
-
   #if HAS_STEPPER_RESET
     SETUP_RUN(enableStepperDrivers());
   #endif

Marlin/src/core/boards.h

@@ -103,6 +103,7 @@
 #define BOARD_HJC2560C_REV2           1147  // ADIMLab Gantry v2
 #define BOARD_TANGO                   1148  // BIQU Tango V1
 #define BOARD_MKS_GEN_L_V2            1149  // MKS GEN L V2
+#define BOARD_COPYMASTER_3D           1150  // Copymaster 3D
 
 //
 // RAMBo and derivatives

Marlin/src/core/macros.h

@@ -21,6 +21,10 @@
  */
 #pragma once
 
+#if !defined(__has_include)
+  #define __has_include(...) 1
+#endif
+
 #define ABCE 4
 #define XYZE 4
 #define ABC  3

Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

@@ -1611,7 +1611,7 @@
          * numbers for those locations should be 0.
          */
         #ifdef VALIDATE_MESH_TILT
-          auto d_from = []() { DEBUG_ECHOPGM("D from "); };
+          auto d_from = []{ DEBUG_ECHOPGM("D from "); };
           auto normed = [&](const xy_pos_t &pos, const float &zadd) {
             return normal.x * pos.x + normal.y * pos.y + zadd;
           };

Marlin/src/feature/controllerfan.cpp

@@ -24,60 +24,80 @@
 
 #if ENABLED(USE_CONTROLLER_FAN)
 
+#include "controllerfan.h"
 #include "../module/stepper/indirection.h"
 #include "../module/temperature.h"
 
-uint8_t controllerfan_speed;
+ControllerFan controllerFan;
 
-void controllerfan_update() {
-  static millis_t lastMotorOn = 0, // Last time a motor was turned on
+uint8_t ControllerFan::speed;
+
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+  controllerFan_settings_t ControllerFan::settings; // {0}
+#endif
+
+void ControllerFan::setup() {
+  SET_OUTPUT(CONTROLLER_FAN_PIN);
+  init();
+}
+
+void ControllerFan::set_fan_speed(const uint8_t s) {
+  speed = s < (CONTROLLERFAN_SPEED_MIN) ? 0 : s; // Fan OFF below minimum
+}
+
+void ControllerFan::update() {
+  static millis_t lastMotorOn = 0,    // Last time a motor was turned on
                   nextMotorCheck = 0; // Last time the state was checked
   const millis_t ms = millis();
   if (ELAPSED(ms, nextMotorCheck)) {
     nextMotorCheck = ms + 2500UL; // Not a time critical function, so only check every 2.5s
 
-    const bool xory = X_ENABLE_READ() == bool(X_ENABLE_ON) || Y_ENABLE_READ() == bool(Y_ENABLE_ON);
+    #define MOTOR_IS_ON(A,B) (A##_ENABLE_READ() == bool(B##_ENABLE_ON))
+    #define _OR_ENABLED_E(N) || MOTOR_IS_ON(E##N,E)
 
-    // If any of the drivers or the bed are enabled...
-    if (xory || Z_ENABLE_READ() == bool(Z_ENABLE_ON)
-      #if HAS_HEATED_BED
-        || thermalManager.temp_bed.soft_pwm_amount > 0
-      #endif
-      #if HAS_X2_ENABLE
-        || X2_ENABLE_READ() == bool(X_ENABLE_ON)
-      #endif
-      #if HAS_Y2_ENABLE
-        || Y2_ENABLE_READ() == bool(Y_ENABLE_ON)
-      #endif
+    const bool motor_on = MOTOR_IS_ON(Z,Z)
       #if HAS_Z2_ENABLE
-        || Z2_ENABLE_READ() == bool(Z_ENABLE_ON)
+        || MOTOR_IS_ON(Z2,Z)
       #endif
       #if HAS_Z3_ENABLE
-        || Z3_ENABLE_READ() == bool(Z_ENABLE_ON)
+        || MOTOR_IS_ON(Z3,Z)
       #endif
       #if HAS_Z4_ENABLE
-        || Z4_ENABLE_READ() == bool(Z_ENABLE_ON)
-      #endif
-      #if E_STEPPERS
-        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == bool(E_ENABLE_ON)
-        REPEAT(E_STEPPERS, _OR_ENABLED_E)
+        || MOTOR_IS_ON(Z4,Z)
       #endif
-    ) {
-      lastMotorOn = ms; //... set time to NOW so the fan will turn on
-    }
+      || (DISABLED(CONTROLLER_FAN_USE_Z_ONLY) && (
+          MOTOR_IS_ON(X,X) || MOTOR_IS_ON(Y,Y)
+          #if HAS_X2_ENABLE
+            || MOTOR_IS_ON(X2,X)
+          #endif
+          #if HAS_Y2_ENABLE
+            || MOTOR_IS_ON(Y2,Y)
+          #endif
+          #if E_STEPPERS
+            REPEAT(E_STEPPERS, _OR_ENABLED_E)
+          #endif
+        )
+      )
+    ;
 
-    // Fan off if no steppers have been enabled for CONTROLLERFAN_SECS seconds
-    controllerfan_speed = (!lastMotorOn || ELAPSED(ms, lastMotorOn + (CONTROLLERFAN_SECS) * 1000UL)) ? 0 : (
-      #ifdef CONTROLLERFAN_SPEED_Z_ONLY
-        xory ? CONTROLLERFAN_SPEED : CONTROLLERFAN_SPEED_Z_ONLY
-      #else
-        CONTROLLERFAN_SPEED
+    // If any of the drivers or the heated bed are enabled...
+    if (motor_on
+      #if HAS_HEATED_BED
+        || thermalManager.temp_bed.soft_pwm_amount > 0
       #endif
+    ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
+
+    // Fan Settings. Set fan > 0:
+    //  - If AutoMode is on and steppers have been enabled for CONTROLLERFAN_IDLE_TIME seconds.
+    //  - If System is on idle and idle fan speed settings is activated.
+    set_fan_speed(
+      settings.auto_mode && lastMotorOn && PENDING(ms, lastMotorOn + settings.duration * 1000UL)
+      ? settings.active_speed : settings.idle_speed
     );
 
     // Allow digital or PWM fan output (see M42 handling)
-    WRITE(CONTROLLER_FAN_PIN, controllerfan_speed);
-    analogWrite(pin_t(CONTROLLER_FAN_PIN), controllerfan_speed);
+    WRITE(CONTROLLER_FAN_PIN, speed);
+    analogWrite(pin_t(CONTROLLER_FAN_PIN), speed);
   }
 }
 

Marlin/src/feature/controllerfan.h

@@ -21,4 +21,56 @@
  */
 #pragma once
 
-void controllerfan_update();
+#include "../inc/MarlinConfigPre.h"
+
+typedef struct {
+  uint8_t   active_speed,    // 0-255 (fullspeed); Speed with enabled stepper motors
+            idle_speed;      // 0-255 (fullspeed); Speed after idle period with all motors are disabled
+  uint16_t  duration;        // Duration in seconds for the fan to run after all motors are disabled
+  bool      auto_mode;       // Default true
+} controllerFan_settings_t;
+
+#ifndef CONTROLLERFAN_SPEED_ACTIVE
+  #define CONTROLLERFAN_SPEED_ACTIVE 255
+#endif
+#ifndef CONTROLLERFAN_SPEED_IDLE
+  #define CONTROLLERFAN_SPEED_IDLE     0
+#endif
+#ifndef CONTROLLERFAN_IDLE_TIME
+  #define CONTROLLERFAN_IDLE_TIME     60
+#endif
+
+static constexpr controllerFan_settings_t controllerFan_defaults = {
+  CONTROLLERFAN_SPEED_ACTIVE,
+  CONTROLLERFAN_SPEED_IDLE,
+  CONTROLLERFAN_IDLE_TIME,
+  true
+};
+
+#if ENABLED(USE_CONTROLLER_FAN)
+
+class ControllerFan {
+  private:
+    static uint8_t speed;
+    static void set_fan_speed(const uint8_t s);
+
+  public:
+    #if ENABLED(CONTROLLER_FAN_EDITABLE)
+      static controllerFan_settings_t settings;
+    #else
+      static const controllerFan_settings_t constexpr &settings = controllerFan_defaults;
+    #endif
+    static inline bool state() { return speed > 0; }
+    static inline void init() { reset(); }
+    static inline void reset() {
+      #if ENABLED(CONTROLLER_FAN_EDITABLE)
+        settings = controllerFan_defaults;
+      #endif
+    }
+    static void setup();
+    static void update();
+};
+
+extern ControllerFan controllerFan;
+
+#endif

Marlin/src/feature/power.cpp

@@ -46,8 +46,8 @@ bool Power::is_power_needed() {
     HOTEND_LOOP() if (thermalManager.autofan_speed[e]) return true;
   #endif
 
-  #if ENABLED(AUTO_POWER_CONTROLLERFAN, USE_CONTROLLER_FAN) && HAS_CONTROLLER_FAN
-    if (controllerfan_speed) return true;
+  #if BOTH(USE_CONTROLLER_FAN, AUTO_POWER_CONTROLLERFAN)
+    if (controllerFan.state()) return true;
   #endif
 
   #if ENABLED(AUTO_POWER_CHAMBER_FAN)

Marlin/src/gcode/config/M220.cpp

@@ -30,7 +30,7 @@
  *   S<percent> : Set the feed rate percentage factor
  *
  * Report the current speed percentage factor if no parameter is specified
- * 
+ *
  * With PRUSA_MMU2...
  *   B : Flag to back up the current factor
  *   R : Flag to restore the last-saved factor

Marlin/src/gcode/config/M43.cpp

@@ -67,6 +67,7 @@ inline void toggle_pins() {
     else {
       watchdog_refresh();
       report_pin_state_extended(pin, ignore_protection, true, PSTR("Pulsing   "));
+      const bool prior_mode = GET_PINMODE(pin);
       #if AVR_AT90USB1286_FAMILY // Teensy IDEs don't know about these pins so must use FASTIO
         if (pin == TEENSY_E2) {
           SET_OUTPUT(TEENSY_E2);
@@ -95,6 +96,7 @@ inline void toggle_pins() {
           watchdog_refresh();
         }
       }
+      pinMode(pin, prior_mode);
     }
     SERIAL_EOL();
   }

Marlin/src/gcode/control/M42.cpp

@@ -37,16 +37,33 @@
  *
  *  S<byte> Pin status from 0 - 255
  *  I       Flag to ignore Marlin's pin protection
+ *
+ *  M<mode> Pin mode: 0=INPUT  1=OUTPUT  2=INPUT_PULLUP  3=INPUT_PULLDOWN
  */
 void GcodeSuite::M42() {
-  if (!parser.seenval('S')) return;
-  const byte pin_status = parser.value_byte();
-
   const int pin_index = PARSED_PIN_INDEX('P', GET_PIN_MAP_INDEX(LED_PIN));
   if (pin_index < 0) return;
 
   const pin_t pin = GET_PIN_MAP_PIN(pin_index);
 
+  if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
+
+  if (parser.seenval('M')) {
+    switch (parser.value_byte()) {
+      case 0: pinMode(pin, INPUT); break;
+      case 1: pinMode(pin, OUTPUT); break;
+      case 2: pinMode(pin, INPUT_PULLUP); break;
+      #ifdef INPUT_PULLDOWN
+        case 3: pinMode(pin, INPUT_PULLDOWN); break;
+      #endif
+      default: SERIAL_ECHOLNPGM("Invalid Pin Mode");
+    }
+    return;
+  }
+
+  if (!parser.seenval('S')) return;
+  const byte pin_status = parser.value_byte();
+
   #if FAN_COUNT > 0
     switch (pin) {
       #if HAS_FAN0
@@ -76,8 +93,6 @@ void GcodeSuite::M42() {
     }
   #endif
 
-  if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();
-
   pinMode(pin, OUTPUT);
   extDigitalWrite(pin, pin_status);
   analogWrite(pin, pin_status);

Marlin/src/gcode/feature/advance/M900.cpp

@@ -42,7 +42,7 @@
  */
 void GcodeSuite::M900() {
 
-  auto echo_value_oor = [] (const char ltr, const bool ten=true) {
+  auto echo_value_oor = [](const char ltr, const bool ten=true) {
     SERIAL_CHAR('?'); SERIAL_CHAR(ltr);
     SERIAL_ECHOPGM(" value out of range");
     if (ten) SERIAL_ECHOPGM(" (0-10)");

Marlin/src/gcode/feature/controllerfan/M710.cpp

@@ -0,0 +1,81 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../../inc/MarlinConfigPre.h"
+
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+
+#include "../../gcode.h"
+#include "../../../feature/controllerfan.h"
+
+void M710_report(const bool forReplay) {
+  if (!forReplay) { SERIAL_ECHOLNPGM("; Controller Fan"); SERIAL_ECHO_START(); }
+  SERIAL_ECHOLNPAIR("M710 "
+    "S", int(controllerFan.settings.active_speed),
+    "I", int(controllerFan.settings.idle_speed),
+    "A", int(controllerFan.settings.auto_mode),
+    "D", controllerFan.settings.duration,
+    " ; (", (int(controllerFan.settings.active_speed) * 100) / 255, "%"
+    " ", (int(controllerFan.settings.idle_speed) * 100) / 255, "%)"
+  );
+}
+
+/**
+ * M710: Set controller fan settings
+ *
+ *  R         : Reset to defaults
+ *  S[0-255]  : Fan speed when motors are active
+ *  I[0-255]  : Fan speed when motors are idle
+ *  A[0|1]    : Turn auto mode on or off
+ *  D         : Set auto mode idle duration
+ *
+ * Examples:
+ *   M710                   ; Report current Settings
+ *   M710 R                 ; Reset SIAD to defaults
+ *   M710 I64               ; Set controller fan Idle Speed to 25%
+ *   M710 S255              ; Set controller fan Active Speed to 100%
+ *   M710 S0                ; Set controller fan Active Speed to OFF
+ *   M710 I255 A0           ; Set controller fan Idle Speed to 100% with Auto Mode OFF
+ *   M710 I127 A1 S255 D160 ; Set controller fan idle speed 50%, AutoMode On, Fan speed 100%, duration to 160 Secs
+ */
+void GcodeSuite::M710() {
+
+  const bool seenR = parser.seen('R');
+  if (seenR) controllerFan.reset();
+
+  const bool seenS = parser.seenval('S');
+  if (seenS) controllerFan.settings.active_speed = parser.value_byte();
+
+  const bool seenI = parser.seenval('I');
+  if (seenI) controllerFan.settings.idle_speed = parser.value_byte();
+
+  const bool seenA = parser.seenval('A');
+  if (seenA) controllerFan.settings.auto_mode = parser.value_bool();
+
+  const bool seenD = parser.seenval('D');
+  if (seenD) controllerFan.settings.duration = parser.value_ushort();
+
+  if (!(seenR || seenS || seenI || seenA || seenD))
+    M710_report(false);
+}
+
+#endif // CONTROLLER_FAN_EDITABLE

Marlin/src/gcode/gcode.cpp

@@ -752,6 +752,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
         case 702: M702(); break;                                  // M702: Unload Filament
       #endif
 
+      #if ENABLED(CONTROLLER_FAN_EDITABLE)
+        case 710: M710(); break;                                  // M710: Set Controller Fan settings
+      #endif
+
       #if ENABLED(GCODE_MACROS)
         case 810: case 811: case 812: case 813: case 814:
         case 815: case 816: case 817: case 818: case 819:

Marlin/src/gcode/gcode.h

@@ -972,6 +972,10 @@ private:
     static void M7219();
   #endif
 
+  #if ENABLED(CONTROLLER_FAN_EDITABLE)
+    static void M710();
+  #endif
+
   static void T(const uint8_t tool_index);
 
 };

Marlin/src/inc/Conditionals_LCD.h

@@ -683,6 +683,10 @@
   #define SPI_SPEED SPI_FULL_SPEED
 #endif
 
+#if SERIAL_PORT == -1 || SERIAL_PORT_2 == -1
+  #define HAS_USB_SERIAL 1
+#endif
+
 /**
  * This setting is also used by M109 when trying to calculate
  * a ballpark safe margin to prevent wait-forever situation.

Marlin/src/inc/MarlinConfigPre.h

@@ -37,12 +37,8 @@
 #include "../../Configuration.h"
 
 #ifdef CUSTOM_VERSION_FILE
-  #if defined(__has_include)
-    #if __has_include(XSTR(../../CUSTOM_VERSION_FILE))
-      #include XSTR(../../CUSTOM_VERSION_FILE)
-    #endif
-  #else
-    #include XSTR(../../CUSTOM_VERSION_FILE)
+  #if __has_include(STRINGIFY(../../CUSTOM_VERSION_FILE))
+    #include STRINGIFY(../../CUSTOM_VERSION_FILE)
   #endif
 #endif
 

Marlin/src/inc/SanityCheck.h

@@ -270,6 +270,10 @@
   #error "Replace SLED_PIN with SOL1_PIN (applies to both Z_PROBE_SLED and SOLENOID_PROBE)."
 #elif defined(CONTROLLERFAN_PIN)
   #error "CONTROLLERFAN_PIN is now CONTROLLER_FAN_PIN, enabled with USE_CONTROLLER_FAN. Please update your Configuration_adv.h."
+#elif defined(CONTROLLERFAN_SPEED)
+  #error "CONTROLLERFAN_SPEED is now CONTROLLERFAN_SPEED_ACTIVE. Please update your Configuration_adv.h."
+#elif defined(CONTROLLERFAN_SECS)
+  #error "CONTROLLERFAN_SECS is now CONTROLLERFAN_IDLE_TIME. Please update your Configuration_adv.h."
 #elif defined(MIN_RETRACT)
   #error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT. Please update your Configuration_adv.h."
 #elif defined(ADVANCE)
@@ -1983,7 +1987,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 /**
  * Auto Fan check for PWM pins
  */
-#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255
+#if HAS_AUTO_FAN && EXTRUDER_AUTO_FAN_SPEED != 255 && DISABLED(NO_COMPILE_TIME_PWM)
   #define AF_ERR_SUFF "_AUTO_FAN_PIN is not a PWM pin. Set EXTRUDER_AUTO_FAN_SPEED to 255."
   #if HAS_AUTO_FAN_0
     static_assert(PWM_PIN(E0_AUTO_FAN_PIN), "E0" AF_ERR_SUFF);
@@ -2649,14 +2653,14 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
 #endif
 
 #if ENABLED(BACKLASH_COMPENSATION)
-  #if IS_CORE
-    #error "BACKLASH_COMPENSATION is incompatible with CORE kinematics."
-  #endif
   #ifndef BACKLASH_DISTANCE_MM
     #error "BACKLASH_COMPENSATION requires BACKLASH_DISTANCE_MM"
-  #endif
-  #ifndef BACKLASH_CORRECTION
+  #elif !defined(BACKLASH_CORRECTION)
     #error "BACKLASH_COMPENSATION requires BACKLASH_CORRECTION"
+  #elif IS_CORE
+    constexpr float backlash_arr[] = BACKLASH_DISTANCE_MM;
+    static_assert(!backlash_arr[CORE_AXIS_1] && !backlash_arr[CORE_AXIS_2],
+                  "BACKLASH_COMPENSATION can only apply to " STRINGIFY(NORMAL_AXIS) " with your CORE system.");
   #endif
 #endif
 

Marlin/src/inc/Version.h

@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-16"
+  #define STRING_DISTRIBUTION_DATE "2020-03-24"
 #endif
 
 /**

Marlin/src/lcd/dogm/u8g_dev_uc1701_mini12864_HAL.cpp

@@ -118,7 +118,7 @@ static const uint8_t u8g_dev_uc1701_mini12864_HAL_init_seq[] PROGMEM = {
 static const uint8_t u8g_dev_uc1701_mini12864_HAL_data_start[] PROGMEM = {
   U8G_ESC_ADR(0),             // instruction mode
   U8G_ESC_CS(1),              // enable chip
-  #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
+  #if ANY(MKS_MINI_12864, ENDER2_STOCKDISPLAY, FYSETC_MINI_12864)
     UC1701_START_LINE(0),     // set display start line to 0
     UC1701_ADC_REVERSE(0),    // ADC set to reverse
     UC1701_OUT_MODE(1),       // common output mode

Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp

@@ -30,10 +30,6 @@
   #error "More than 2 hotends not implemented on the Display UI design."
 #endif
 
-#include "DGUSDisplay.h"
-#include "DGUSVPVariable.h"
-#include "DGUSDisplayDef.h"
-
 #include "../../ui_api.h"
 
 #include "../../../../MarlinCore.h"
@@ -48,6 +44,10 @@
   #include "../../../../feature/powerloss.h"
 #endif
 
+#include "DGUSDisplay.h"
+#include "DGUSVPVariable.h"
+#include "DGUSDisplayDef.h"
+
 // Preamble... 2 Bytes, usually 0x5A 0xA5, but configurable
 constexpr uint8_t DGUS_HEADER1 = 0x5A;
 constexpr uint8_t DGUS_HEADER2 = 0xA5;
@@ -855,7 +855,7 @@ void DGUSScreenVariableHandler::HandleStepPerMMExtruderChanged(DGUS_VP_Variable
 void DGUSScreenVariableHandler::HandleProbeOffsetZChanged(DGUS_VP_Variable &var, void *val_ptr) {
   DEBUG_ECHOLNPGM("HandleProbeOffsetZChanged");
 
-  const float offset = float(swap16(*(uint16_t*)val_ptr)) / 100.0f;
+  const float offset = float(int16_t(swap16(*(uint16_t*)val_ptr))) / 100.0f;
   ExtUI::setZOffset_mm(offset);
   ScreenHandler.skipVP = var.VP; // don't overwrite value the next update time as the display might autoincrement in parallel
   return;

Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp

@@ -283,6 +283,13 @@ const uint16_t VPList_FLCPrinting[] PROGMEM = {
   0x0000
 };
 
+const uint16_t VPList_Z_Offset[] PROGMEM = {
+  #if HOTENDS >= 1
+    VP_SD_Print_ProbeOffsetZ,
+  #endif
+  0x0000
+};
+
 const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_BOOT, VPList_Boot },
   { DGUSLCD_SCREEN_MAIN, VPList_Main },
@@ -291,6 +298,7 @@ const struct VPMapping VPMap[] PROGMEM = {
   { DGUSLCD_SCREEN_STATUS2, VPList_Status2 },
   { DGUSLCD_SCREEN_PREHEAT, VPList_Preheat },
   { DGUSLCD_SCREEN_MANUALMOVE, VPList_ManualMove },
+  { DGUSLCD_SCREEN_Z_OFFSET, VPList_Z_Offset },
   { DGUSLCD_SCREEN_MANUALEXTRUDE, VPList_ManualExtrude },
   { DGUSLCD_SCREEN_FILAMENT_HEATING, VPList_Filament_heating },
   { DGUSLCD_SCREEN_FILAMENT_LOADING, VPList_Filament_load_unload },
@@ -361,7 +369,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
   #if HOTENDS >= 1
     VPHELPER(VP_T_E0_Is, &thermalManager.temp_hotend[0].celsius, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<0>),
     VPHELPER(VP_T_E0_Set, &thermalManager.temp_hotend[0].target, DGUSScreenVariableHandler::HandleTemperatureChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
-    VPHELPER(VP_Flowrate_E0, nullptr, DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
+    VPHELPER(VP_Flowrate_E0, &planner.flow_percentage[ExtUI::extruder_t::E0], DGUSScreenVariableHandler::HandleFlowRateChanged, &DGUSScreenVariableHandler::DGUSLCD_SendWordValueToDisplay),
     VPHELPER(VP_EPos, &destination.e, nullptr, DGUSScreenVariableHandler::DGUSLCD_SendFloatAsLongValueToDisplay<2>),
     VPHELPER(VP_MOVE_E0, nullptr, &DGUSScreenVariableHandler::HandleManualExtrude, nullptr),
     VPHELPER(VP_E0_CONTROL, &thermalManager.temp_hotend[0].target, &DGUSScreenVariableHandler::HandleHeaterControl, nullptr),

Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.h

@@ -35,6 +35,7 @@ enum DGUSLCD_Screens : uint8_t {
   DGUSLCD_SCREEN_FILAMENT_LOADING     =  76,
   DGUSLCD_SCREEN_FILAMENT_UNLOADING   =  82,
   DGUSLCD_SCREEN_MANUALEXTRUDE        =  84,
+  DGUSLCD_SCREEN_Z_OFFSET             =  88,
   DGUSLCD_SCREEN_SDFILELIST           =   3,
   DGUSLCD_SCREEN_SDPRINTMANIPULATION  =   7,
   DGUSLCD_SCREEN_SDPRINTTUNE          =   9,

Marlin/src/lcd/language/language_de.h

@@ -236,6 +236,11 @@ namespace Language_de {
   PROGMEM Language_Str MSG_FAN_SPEED_N                     = _UxGT("Lüfter ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Geschw. Extralüfter");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Geschw. Extralüfter ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Lüfter Kontroller");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Lüfter Leerlauf");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Motorlast Modus");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Lüfter Motorlast");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Ausschalt Delay");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flussrate");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flussrate ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Einstellungen");

Marlin/src/lcd/language/language_en.h

@@ -247,6 +247,11 @@ namespace Language_en {
   PROGMEM Language_Str MSG_STORED_FAN_N                    = _UxGT("Stored Fan ~");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED                 = _UxGT("Extra Fan Speed");
   PROGMEM Language_Str MSG_EXTRA_FAN_SPEED_N               = _UxGT("Extra Fan Speed ~");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN                  = _UxGT("Controller Fan");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_IDLE_SPEED       = _UxGT("Idle Speed");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_AUTO_ON          = _UxGT("Auto Mode");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_SPEED            = _UxGT("Active Speed");
+  PROGMEM Language_Str MSG_CONTROLLER_FAN_DURATION         = _UxGT("Idle Period");
   PROGMEM Language_Str MSG_FLOW                            = _UxGT("Flow");
   PROGMEM Language_Str MSG_FLOW_N                          = _UxGT("Flow ~");
   PROGMEM Language_Str MSG_CONTROL                         = _UxGT("Control");

Marlin/src/lcd/language/language_tr.h

@@ -606,4 +606,3 @@ namespace Language_tr {
   #define MSG_FIRST_FAN_SPEED       MSG_FAN_SPEED_N
   #define MSG_FIRST_EXTRA_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
 #endif
- 

Marlin/src/lcd/menu/menu.cpp

@@ -193,7 +193,7 @@ DEFINE_MENU_EDIT_ITEM(uint16_3);    // 123        right-justified
 DEFINE_MENU_EDIT_ITEM(uint16_4);    // 1234       right-justified
 DEFINE_MENU_EDIT_ITEM(uint16_5);    // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM(float3);      // 123        right-justified
-DEFINE_MENU_EDIT_ITEM(float52);     // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM(float42_52);  // _2.34, 12.34, -2.34 or 123.45, -23.45
 DEFINE_MENU_EDIT_ITEM(float43);     // 1.234
 DEFINE_MENU_EDIT_ITEM(float5);      // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM(float5_25);   // 12345      right-justified (25 increment)
@@ -428,7 +428,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
           MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_HOTEND_OFFSET_Z), ftostr54sign(hotend_offset[active_extruder].z));
       #endif
       if (do_probe) {
-        MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), ftostr52sign(probe.offset.z));
+        MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_ZPROBE_ZOFFSET), BABYSTEP_TO_STR(probe.offset.z));
         #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
           _lcd_zoffset_overlay_gfx(probe.offset.z);
         #endif

Marlin/src/lcd/menu/menu.h

@@ -47,14 +47,18 @@ typedef void (*selectFunc_t)();
   void _lcd_zoffset_overlay_gfx(const float zvalue);
 #endif
 
-#if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
-  // Only values from -9.999 to 9.999
-  #define LCD_Z_OFFSET_FUNC(N) ftostr54sign(N)
-  #define LCD_Z_OFFSET_TYPE float43
-#else
-  // Values from -99.99 to 99.99
-  #define LCD_Z_OFFSET_FUNC(N) ftostr52sign(N)
-  #define LCD_Z_OFFSET_TYPE float52
+#if HAS_BED_PROBE
+  #if Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+    #define LCD_Z_OFFSET_TYPE float43    // Values from -9.000 to +9.000
+  #else
+    #define LCD_Z_OFFSET_TYPE float42_52 // Values from -99.99 to 99.99
+  #endif
+#endif
+
+#if ENABLED(BABYSTEP_ZPROBE_OFFSET) && Z_PROBE_OFFSET_RANGE_MIN >= -9 && Z_PROBE_OFFSET_RANGE_MAX <= 9
+  #define BABYSTEP_TO_STR(N) ftostr43sign(N)
+#elif ENABLED(BABYSTEPPING)
+  #define BABYSTEP_TO_STR(N) ftostr53sign(N)
 #endif
 
 ////////////////////////////////////////////
@@ -289,7 +293,7 @@ DEFINE_MENU_EDIT_ITEM_TYPE(uint16_3    ,uint16_t ,ui16tostr3rj    ,   1     );
 DEFINE_MENU_EDIT_ITEM_TYPE(uint16_4    ,uint16_t ,ui16tostr4rj    ,   0.1f  );   // 1234       right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(uint16_5    ,uint16_t ,ui16tostr5rj    ,   0.01f );   // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(float3      ,float    ,ftostr3         ,   1     );   // 123        right-justified
-DEFINE_MENU_EDIT_ITEM_TYPE(float52     ,float    ,ftostr42_52     , 100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
+DEFINE_MENU_EDIT_ITEM_TYPE(float42_52  ,float    ,ftostr42_52     , 100     );   // _2.34, 12.34, -2.34 or 123.45, -23.45
 DEFINE_MENU_EDIT_ITEM_TYPE(float43     ,float    ,ftostr43sign    ,1000     );   // -1.234, _1.234, +1.234
 DEFINE_MENU_EDIT_ITEM_TYPE(float5      ,float    ,ftostr5rj       ,   1     );   // 12345      right-justified
 DEFINE_MENU_EDIT_ITEM_TYPE(float5_25   ,float    ,ftostr5rj       ,   0.04f );   // 12345      right-justified (25 increment)

Marlin/src/lcd/menu/menu_advanced.cpp

@@ -112,10 +112,10 @@ void menu_cancelobject();
 
     #if ENABLED(LIN_ADVANCE)
       #if EXTRUDERS == 1
-        EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+        EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
       #elif EXTRUDERS > 1
         LOOP_L_N(n, EXTRUDERS)
-          EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+          EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
       #endif
     #endif
 
@@ -257,7 +257,7 @@ void menu_cancelobject();
       EDIT_ITEM(bool, MSG_AUTOTEMP, &planner.autotemp_enabled);
       EDIT_ITEM(float3, MSG_MIN, &planner.autotemp_min, 0, float(HEATER_0_MAXTEMP) - 15);
       EDIT_ITEM(float3, MSG_MAX, &planner.autotemp_max, 0, float(HEATER_0_MAXTEMP) - 15);
-      EDIT_ITEM(float52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
+      EDIT_ITEM(float42_52, MSG_FACTOR, &planner.autotemp_factor, 0, 10);
     #endif
 
     //
@@ -376,12 +376,12 @@ void menu_cancelobject();
     START_MENU();
     BACK_ITEM(MSG_ADVANCED_SETTINGS);
 
-    static float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]);
+    const float max_accel = _MAX(planner.settings.max_acceleration_mm_per_s2[A_AXIS], planner.settings.max_acceleration_mm_per_s2[B_AXIS], planner.settings.max_acceleration_mm_per_s2[C_AXIS]);
     // M204 P Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_ACC, &planner.settings.acceleration, 25, max_accel);
 
     // M204 R Retract Acceleration
-    EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, max_accel);
+    EDIT_ITEM_FAST(float5, MSG_A_RETRACT, &planner.settings.retract_acceleration, 100, planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)]);
 
     // M204 T Travel Acceleration
     EDIT_ITEM_FAST(float5_25, MSG_A_TRAVEL, &planner.settings.travel_acceleration, 25, max_accel);
@@ -556,10 +556,10 @@ void menu_advanced_settings() {
     SUBMENU(MSG_FILAMENT, menu_advanced_filament);
   #elif ENABLED(LIN_ADVANCE)
     #if EXTRUDERS == 1
-      EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+      EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
     #elif EXTRUDERS > 1
       LOOP_L_N(n, E_STEPPERS)
-        EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
     #endif
   #endif
 

Marlin/src/lcd/menu/menu_configuration.cpp

@@ -138,12 +138,12 @@ void menu_advanced_settings();
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
     #if ENABLED(DUAL_X_CARRIAGE)
-      EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
+      EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, float(X2_HOME_POS - 25), float(X2_HOME_POS + 25), _recalc_offsets);
     #else
-      EDIT_ITEM_FAST(float52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
+      EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_X, &hotend_offset[1].x, -99.0, 99.0, _recalc_offsets);
     #endif
-    EDIT_ITEM_FAST(float52,   MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
-    EDIT_ITEM_FAST(float52,   MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
+    EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Y, &hotend_offset[1].y, -99.0, 99.0, _recalc_offsets);
+    EDIT_ITEM_FAST(float42_52, MSG_HOTEND_OFFSET_Z, &hotend_offset[1].z, Z_PROBE_LOW_POINT, 10.0, _recalc_offsets);
     #if ENABLED(EEPROM_SETTINGS)
       ACTION_ITEM(MSG_STORE_EEPROM, lcd_store_settings);
     #endif
@@ -227,6 +227,24 @@ void menu_advanced_settings();
   }
 #endif
 
+#if ENABLED(CONTROLLER_FAN_MENU)
+
+  #include "../../feature/controllerfan.h"
+
+  void menu_controller_fan() {
+    START_MENU();
+    BACK_ITEM(MSG_CONFIGURATION);
+    EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255);
+    EDIT_ITEM(bool, MSG_CONTROLLER_FAN_AUTO_ON, &controllerFan.settings.auto_mode);
+    if (controllerFan.settings.auto_mode) {
+      EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, _MAX(1, CONTROLLERFAN_SPEED_MIN) - 1, 255);
+      EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800);
+    }
+    END_MENU();
+  }
+
+#endif
+
 #if ENABLED(CASE_LIGHT_MENU)
 
   #include "../../feature/caselight.h"
@@ -320,6 +338,13 @@ void menu_configuration() {
     EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
   #endif
 
+  //
+  // Set Fan Controller speed
+  //
+  #if ENABLED(CONTROLLER_FAN_MENU)
+    SUBMENU(MSG_CONTROLLER_FAN, menu_controller_fan);
+  #endif
+
   const bool busy = printer_busy();
   if (!busy) {
     #if EITHER(DELTA_CALIBRATION_MENU, DELTA_AUTO_CALIBRATION)

Marlin/src/lcd/menu/menu_delta_calibrate.cpp

@@ -103,7 +103,7 @@ void _man_probe_pt(const xy_pos_t &xy) {
 #endif
 
 void lcd_delta_settings() {
-  auto _recalc_delta_settings = []() {
+  auto _recalc_delta_settings = []{
     #if HAS_LEVELING
       reset_bed_level(); // After changing kinematics bed-level data is no longer valid
     #endif

Marlin/src/lcd/menu/menu_mixer.cpp

@@ -182,7 +182,7 @@ void lcd_mixer_mix_edit() {
     #if CHANNEL_MIX_EDITING
 
       LOOP_S_LE_N(n, 1, MIXING_STEPPERS)
-        EDIT_ITEM_FAST_N(float52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
+        EDIT_ITEM_FAST_N(float42_52, n, MSG_MIX_COMPONENT_N, &mixer.collector[n-1], 0, 10);
 
       ACTION_ITEM(MSG_CYCLE_MIX, _lcd_mixer_cycle_mix);
       ACTION_ITEM(MSG_COMMIT_VTOOL, _lcd_mixer_commit_vtool);

Marlin/src/lcd/menu/menu_tune.cpp

@@ -65,7 +65,7 @@
     }
     if (ui.should_draw()) {
       const float spm = planner.steps_to_mm[axis];
-      MenuEditItemBase::draw_edit_screen(msg, LCD_Z_OFFSET_FUNC(spm * babystep.accum));
+      MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(spm * babystep.accum));
       #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
         const bool in_view = (true
           #if HAS_GRAPHICAL_LCD
@@ -81,7 +81,7 @@
           #endif
           lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
           lcd_put_wchar(':');
-          lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
+          lcd_put_u8str(BABYSTEP_TO_STR(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
         }
       #endif
     }
@@ -232,10 +232,10 @@ void menu_tune() {
   //
   #if ENABLED(LIN_ADVANCE) && DISABLED(SLIM_LCD_MENUS)
     #if EXTRUDERS == 1
-      EDIT_ITEM(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
+      EDIT_ITEM(float42_52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
     #elif EXTRUDERS > 1
       LOOP_L_N(n, EXTRUDERS)
-        EDIT_ITEM_N(float52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
+        EDIT_ITEM_N(float42_52, n, MSG_ADVANCE_K_E, &planner.extruder_advance_K[n], 0, 999);
     #endif
   #endif
 

Marlin/src/lcd/ultralcd.cpp

@@ -227,7 +227,7 @@ millis_t MarlinUI::next_button_update_ms; // = 0
     SETCURSOR(col, row);
     if (!string) return;
 
-    auto _newline = [&col, &row]() {
+    auto _newline = [&col, &row]{
       col = 0; row++;                 // Move col to string len (plus space)
       SETCURSOR(0, row);              // Simulate carriage return
     };

Marlin/src/libs/numtostr.cpp

@@ -174,9 +174,9 @@ const char* ftostr12ns(const float &f) {
   return &conv[3];
 }
 
-// Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
 const char* ftostr42_52(const float &f) {
-  if (f <= -10 || f >= 100) return ftostr52(f); // need more digits
+  if (f <= -10 || f >= 100) return ftostr52(f); // -23.45 / 123.45
   long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
   conv[2] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 1000));
   conv[3] = DIGIMOD(i, 100);
@@ -198,9 +198,9 @@ const char* ftostr52(const float &f) {
   return &conv[1];
 }
 
-// Convert signed float to fixed-length string with 12.345 / -2.345 or 023.456 / -23.456 format
-const char* ftostr43_53(const float &f) {
-  if (f <= -10 || f >= 100) return ftostr53(f); // need more digits
+// Convert signed float to fixed-length string with 12.345 / _2.345 / -2.345 or -23.45 / 123.45 format
+const char* ftostr53_63(const float &f) {
+  if (f <= -10 || f >= 100) return ftostr63(f); // -23.456 / 123.456
   long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
   conv[1] = (f >= 0 && f < 10) ? ' ' : MINUSOR(i, DIGIMOD(i, 10000));
   conv[2] = DIGIMOD(i, 1000);
@@ -212,7 +212,7 @@ const char* ftostr43_53(const float &f) {
 }
 
 // Convert signed float to fixed-length string with 023.456 / -23.456 format
-const char* ftostr53(const float &f) {
+const char* ftostr63(const float &f) {
   long i = (f * 10000 + (f < 0 ? -5: 5)) / 10;
   conv[0] = MINUSOR(i, DIGIMOD(i, 100000));
   conv[1] = DIGIMOD(i, 10000);
@@ -310,6 +310,19 @@ const char* ftostr52sign(const float &f) {
   return conv;
 }
 
+// Convert signed float to string with +12.345 format
+const char* ftostr53sign(const float &f) {
+  long i = (f * 1000 + (f < 0 ? -5: 5)) / 10;
+  conv[0] = MINUSOR(i, '+');
+  conv[1] = DIGIMOD(i, 10000);
+  conv[2] = DIGIMOD(i, 1000);
+  conv[3] = '.';
+  conv[4] = DIGIMOD(i, 100);
+  conv[5] = DIGIMOD(i, 10);
+  conv[6] = DIGIMOD(i, 1);
+  return conv;
+}
+
 // Convert unsigned float to string with ____4.5, __34.5, _234.5, 1234.5 format
 const char* ftostr51rj(const float &f) {
   const long i = ((f < 0 ? -f : f) * 100 + 5) / 10;

Marlin/src/libs/numtostr.h

@@ -58,17 +58,17 @@ const char* i16tostr4signrj(const int16_t x);
 // Convert unsigned float to string with 1.23 format
 const char* ftostr12ns(const float &x);
 
-// Convert signed float to fixed-length string with 12.34 / -2.34 or 023.45 / -23.45 format
+// Convert signed float to fixed-length string with 12.34 / _2.34 / -2.34 or -23.45 / 123.45 format
 const char* ftostr42_52(const float &x);
 
 // Convert signed float to fixed-length string with 023.45 / -23.45 format
 const char* ftostr52(const float &x);
 
 // Convert signed float to fixed-length string with 12.345 / -2.345 or 023.456 / -23.456 format
-const char* ftostr43_53(const float &x);
+const char* ftostr53_63(const float &x);
 
 // Convert signed float to fixed-length string with 023.456 / -23.456 format
-const char* ftostr53(const float &x);
+const char* ftostr63(const float &x);
 
 // Convert float to fixed-length string with +123.4 / -123.4 format
 const char* ftostr41sign(const float &x);
@@ -91,6 +91,9 @@ const char* ftostr52sp(const float &x);
 // Convert signed float to string with +123.45 format
 const char* ftostr52sign(const float &x);
 
+// Convert signed float to string with +12.345 format
+const char* ftostr53sign(const float &f);
+
 // Convert unsigned float to string with 1234.5 format omitting trailing zeros
 const char* ftostr51rj(const float &x);
 

Marlin/src/module/configuration_store.cpp

@@ -122,6 +122,11 @@
   #include "../feature/probe_temp_comp.h"
 #endif
 
+#include "../feature/controllerfan.h"
+#if ENABLED(CONTROLLER_FAN_EDITABLE)
+  void M710_report(const bool forReplay);
+#endif
+
 #pragma pack(push, 1) // No padding between variables
 
 typedef struct { uint16_t X, Y, Z, X2, Y2, Z2, Z3, Z4, E0, E1, E2, E3, E4, E5; } tmc_stepper_current_t;
@@ -293,6 +298,11 @@ typedef struct SettingsDataStruct {
   int16_t lcd_contrast;                                 // M250 C
 
   //
+  // Controller fan settings
+  //
+  controllerFan_settings_t controllerFan_settings;      // M710
+
+  //
   // POWER_LOSS_RECOVERY
   //
   bool recovery_enabled;                                // M413 S
@@ -881,6 +891,19 @@ void MarlinSettings::postprocess() {
     }
 
     //
+    // Controller Fan
+    //
+    {
+      _FIELD_TEST(controllerFan_settings);
+      #if ENABLED(USE_CONTROLLER_FAN)
+        const controllerFan_settings_t &cfs = controllerFan.settings;
+      #else
+        controllerFan_settings_t cfs = controllerFan_defaults;
+      #endif
+      EEPROM_WRITE(cfs);
+    }
+
+    //
     // Power-Loss Recovery
     //
     {
@@ -1720,6 +1743,19 @@ void MarlinSettings::postprocess() {
       }
 
       //
+      // Controller Fan
+      //
+      {
+        _FIELD_TEST(controllerFan_settings);
+        #if ENABLED(CONTROLLER_FAN_EDITABLE)
+          const controllerFan_settings_t &cfs = controllerFan.settings;
+        #else
+          controllerFan_settings_t cfs = { 0 };
+        #endif
+        EEPROM_READ(cfs);
+      }
+
+      //
       // Power-Loss Recovery
       //
       {
@@ -2591,6 +2627,13 @@ void MarlinSettings::reset() {
   #endif
 
   //
+  // Controller Fan
+  //
+  #if ENABLED(USE_CONTROLLER_FAN)
+    controllerFan.reset();
+  #endif
+
+  //
   // Power-Loss Recovery
   //
 
@@ -3154,6 +3197,10 @@ void MarlinSettings::reset() {
       SERIAL_ECHOLNPAIR("  M250 C", ui.contrast);
     #endif
 
+    #if ENABLED(CONTROLLER_FAN_EDITABLE)
+      M710_report(forReplay);
+    #endif
+
     #if ENABLED(POWER_LOSS_RECOVERY)
       CONFIG_ECHO_HEADING("Power-Loss Recovery:");
       CONFIG_ECHO_START();

Marlin/src/module/motion.cpp

@@ -218,7 +218,6 @@ inline void report_more_positions() {
 inline void report_logical_position(const xyze_pos_t &rpos) {
   const xyze_pos_t lpos = rpos.asLogical();
   SERIAL_ECHOPAIR_P(X_LBL, lpos.x, SP_Y_LBL, lpos.y, SP_Z_LBL, lpos.z, SP_E_LBL, lpos.e);
-  report_more_positions();
 }
 
 // Report the real current position according to the steppers.
@@ -237,10 +236,14 @@ void report_real_position() {
   #endif
 
   report_logical_position(npos);
+  report_more_positions();
 }
 
 // Report the logical current position according to the most recent G-code command
-void report_current_position() { report_logical_position(current_position); }
+void report_current_position() {
+  report_logical_position(current_position);
+  report_more_positions();
+}
 
 /**
  * Report the logical current position according to the most recent G-code command.
@@ -1776,6 +1779,13 @@ void homeaxis(const AxisEnum axis) {
         #endif
         homing_feedrate(axis)
       );
+
+      #if ENABLED(SENSORLESS_HOMING)
+        planner.synchronize();
+        #if IS_CORE
+          if (axis != NORMAL_AXIS) safe_delay(200);  // Short delay to allow belts to spring back
+        #endif
+      #endif
     }
   #endif
 

Marlin/src/module/thermistor/thermistor_202.h

@@ -0,0 +1,69 @@
+//
+// Unknown 200K thermistor on a Copymaster 3D hotend
+// Temptable sent from dealer technologyoutlet.co.uk
+//
+
+const short temptable_202[][2] PROGMEM = {
+  { OV(   1), 864 },
+  { OV(  35), 300 },
+  { OV(  38), 295 },
+  { OV(  41), 290 },
+  { OV(  44), 285 },
+  { OV(  47), 280 },
+  { OV(  51), 275 },
+  { OV(  55), 270 },
+  { OV(  60), 265 },
+  { OV(  65), 260 },
+  { OV(  70), 255 },
+  { OV(  76), 250 },
+  { OV(  83), 245 },
+  { OV(  90), 240 },
+  { OV(  98), 235 },
+  { OV( 107), 230 },
+  { OV( 116), 225 },
+  { OV( 127), 220 },
+  { OV( 138), 215 },
+  { OV( 151), 210 },
+  { OV( 164), 205 },
+  { OV( 179), 200 },
+  { OV( 195), 195 },
+  { OV( 213), 190 },
+  { OV( 232), 185 },
+  { OV( 253), 180 },
+  { OV( 275), 175 },
+  { OV( 299), 170 },
+  { OV( 325), 165 },
+  { OV( 352), 160 },
+  { OV( 381), 155 },
+  { OV( 411), 150 },
+  { OV( 443), 145 },
+  { OV( 476), 140 },
+  { OV( 511), 135 },
+  { OV( 546), 130 },
+  { OV( 581), 125 },
+  { OV( 617), 120 },
+  { OV( 652), 115 },
+  { OV( 687), 110 },
+  { OV( 720), 105 },
+  { OV( 753), 100 },
+  { OV( 783),  95 },
+  { OV( 812),  90 },
+  { OV( 839),  85 },
+  { OV( 864),  80 },
+  { OV( 886),  75 },
+  { OV( 906),  70 },
+  { OV( 924),  65 },
+  { OV( 940),  60 },
+  { OV( 954),  55 },
+  { OV( 966),  50 },
+  { OV( 976),  45 },
+  { OV( 985),  40 },
+  { OV( 992),  35 },
+  { OV( 998),  30 },
+  { OV(1003),  25 },
+  { OV(1007),  20 },
+  { OV(1011),  15 },
+  { OV(1014),  10 },
+  { OV(1016),   5 },
+  { OV(1018),   0 }
+};

Marlin/src/module/thermistor/thermistors.h

@@ -151,6 +151,9 @@
 #if ANY_THERMISTOR_IS(201) // Pt100 with LMV324 Overlord
   #include "thermistor_201.h"
 #endif
+#if ANY_THERMISTOR_IS(202) // 200K thermistor in Copymaker3D hotend
+  #include "thermistor_202.h"
+#endif
 #if ANY_THERMISTOR_IS(331) // Like table 1, but with 3V3 as input voltage for MEGA
   #include "thermistor_331.h"
 #endif

Marlin/src/pins/esp32/pins_E4D.h

@@ -42,49 +42,49 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          34
-#define Y_MIN_PIN          35
-#define Z_MIN_PIN          16   // 15
+#define X_MIN_PIN                             34
+#define Y_MIN_PIN                             35
+#define Z_MIN_PIN                             16  // 15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         12   // 34//27
-#define X_DIR_PIN          13   // 35//26
-#define X_ENABLE_PIN       17   // 0//17//25 // used free pin
-//#define X_CS_PIN            0
+#define X_STEP_PIN                            12  // 34//27
+#define X_DIR_PIN                             13  // 35//26
+#define X_ENABLE_PIN                          17  // 0//17//25 // used free pin
+//#define X_CS_PIN                             0
 
-#define Y_STEP_PIN         32   // 33
-#define Y_DIR_PIN          33   // 32
-#define Y_ENABLE_PIN       X_ENABLE_PIN
-//#define Y_CS_PIN           13
+#define Y_STEP_PIN                            32  // 33
+#define Y_DIR_PIN                             33  // 32
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+//#define Y_CS_PIN                            13
 
-#define Z_STEP_PIN         25   // 14
-#define Z_DIR_PIN          26   // 12
-#define Z_ENABLE_PIN       X_ENABLE_PIN
-//#define Z_CS_PIN            5   // SS_PIN
+#define Z_STEP_PIN                            25  // 14
+#define Z_DIR_PIN                             26  // 12
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        27   // 16
-#define E0_DIR_PIN         14   // 17
-#define E0_ENABLE_PIN      X_ENABLE_PIN
-//#define E0_CS_PIN          21
+#define E0_STEP_PIN                           27  // 16
+#define E0_DIR_PIN                            14  // 17
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2   // 4//2//(D8)
-#define FAN_PIN             0   // 2//15//13 (D9)
-#define HEATER_BED_PIN     15   // 15//0 //(D10)
+#define HEATER_0_PIN                           2  // 4//2//(D8)
+#define FAN_PIN                                0  // 2//15//13 (D9)
+#define HEATER_BED_PIN                        15  // 15//0 //(D10)
 
 // SPI
-#define SDSS                 5
+#define SDSS                                   5
 #define I2S_STEPPER_STREAM
-#define I2S_WS              23
-#define I2S_BCK             22
-#define I2S_DATA            21
+#define I2S_WS                                23
+#define I2S_BCK                               22
+#define I2S_DATA                              21

Marlin/src/pins/esp32/pins_ESP32.h

@@ -35,52 +35,52 @@
 // I2S (steppers & other output-only pins)
 //
 #define I2S_STEPPER_STREAM
-#define I2S_WS              25
-#define I2S_BCK             26
-#define I2S_DATA            27
+#define I2S_WS                                25
+#define I2S_BCK                               26
+#define I2S_DATA                              27
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           34
-#define Y_MIN_PIN           35
-#define Z_MIN_PIN           15
+#define X_MIN_PIN                             34
+#define Y_MIN_PIN                             35
+#define Z_MIN_PIN                             15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         128
-#define X_DIR_PIN          129
-#define X_ENABLE_PIN       130
-//#define X_CS_PIN           0
+#define X_STEP_PIN                           128
+#define X_DIR_PIN                            129
+#define X_ENABLE_PIN                         130
+//#define X_CS_PIN                             0
 
-#define Y_STEP_PIN         131
-#define Y_DIR_PIN          132
-#define Y_ENABLE_PIN       133
-//#define Y_CS_PIN          13
+#define Y_STEP_PIN                           131
+#define Y_DIR_PIN                            132
+#define Y_ENABLE_PIN                         133
+//#define Y_CS_PIN                            13
 
-#define Z_STEP_PIN         134
-#define Z_DIR_PIN          135
-#define Z_ENABLE_PIN       136
-//#define Z_CS_PIN           5 // SS_PIN
+#define Z_STEP_PIN                           134
+#define Z_DIR_PIN                            135
+#define Z_ENABLE_PIN                         136
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        137
-#define E0_DIR_PIN         138
-#define E0_ENABLE_PIN      139
-//#define E0_CS_PIN         21
+#define E0_STEP_PIN                          137
+#define E0_DIR_PIN                           138
+#define E0_ENABLE_PIN                        139
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          36   // Analog Input
-#define TEMP_BED_PIN        39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN         2
-#define FAN_PIN             13
-#define HEATER_BED_PIN       4
+#define HEATER_0_PIN                           2
+#define FAN_PIN                               13
+#define HEATER_BED_PIN                         4
 
 // SPI
-#define SDSS                 5
+#define SDSS                                   5

Marlin/src/pins/esp32/pins_MRR_ESPA.h

@@ -45,66 +45,66 @@
 #ifdef I2S_STEPPER_STREAM
   #undef I2S_STEPPER_STREAM
 #endif
-#define I2S_WS              -1
-#define I2S_BCK             -1
-#define I2S_DATA            -1
+#define I2S_WS                                -1
+#define I2S_BCK                               -1
+#define I2S_DATA                              -1
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         34
-#define Y_STOP_PIN         35
-#define Z_STOP_PIN         15
+#define X_STOP_PIN                            34
+#define Y_STOP_PIN                            35
+#define Z_STOP_PIN                            15
 
 //
 // Steppers
 //
-#define X_STEP_PIN         27
-#define X_DIR_PIN          26
-#define X_ENABLE_PIN       25
-//#define X_CS_PIN           21
+#define X_STEP_PIN                            27
+#define X_DIR_PIN                             26
+#define X_ENABLE_PIN                          25
+//#define X_CS_PIN                            21
 
-#define Y_STEP_PIN         33
-#define Y_DIR_PIN          32
-#define Y_ENABLE_PIN       X_ENABLE_PIN
-//#define Y_CS_PIN           22
+#define Y_STEP_PIN                            33
+#define Y_DIR_PIN                             32
+#define Y_ENABLE_PIN                X_ENABLE_PIN
+//#define Y_CS_PIN                            22
 
-#define Z_STEP_PIN         14
-#define Z_DIR_PIN          12
-#define Z_ENABLE_PIN       X_ENABLE_PIN
-//#define Z_CS_PIN            5 // SS_PIN
+#define Z_STEP_PIN                            14
+#define Z_DIR_PIN                             12
+#define Z_ENABLE_PIN                X_ENABLE_PIN
+//#define Z_CS_PIN                             5  // SS_PIN
 
-#define E0_STEP_PIN        16
-#define E0_DIR_PIN         17
-#define E0_ENABLE_PIN      X_ENABLE_PIN
-//#define E0_CS_PIN          21
+#define E0_STEP_PIN                           16
+#define E0_DIR_PIN                            17
+#define E0_ENABLE_PIN               X_ENABLE_PIN
+//#define E0_CS_PIN                           21
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define FAN_PIN            13
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define FAN_PIN                               13
+#define HEATER_BED_PIN                         4
 
 //
 // MicroSD card
 //
-#define MOSI_PIN           23
-#define MISO_PIN           19
-#define SCK_PIN            18
-#define SDSS                5
-#define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
+#define MOSI_PIN                              23
+#define MISO_PIN                              19
+#define SCK_PIN                               18
+#define SDSS                                   5
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
 // Hardware serial pins
 // Add the following to Configuration.h or Configuration_adv.h to assign
 // specific pins to hardware Serial1.
 // Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
 // MRR ESPA does not have enough spare pins for such reassignment.
-//#define HARDWARE_SERIAL1_RX 21
-//#define HARDWARE_SERIAL1_TX 22
+//#define HARDWARE_SERIAL1_RX                 21
+//#define HARDWARE_SERIAL1_TX                 22

Marlin/src/pins/esp32/pins_MRR_ESPE.h

@@ -43,9 +43,9 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         35
-#define Y_STOP_PIN         32
-#define Z_STOP_PIN         33
+#define X_STOP_PIN                            35
+#define Y_STOP_PIN                            32
+#define Z_STOP_PIN                            33
 
 //
 // Enable I2S stepper stream
@@ -53,72 +53,72 @@
 #undef I2S_STEPPER_STREAM
 #define I2S_STEPPER_STREAM
 
-#undef LIN_ADVANCE  // Currently, I2S stream does not work with linear advance
+#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance
 
-#define I2S_WS             26
-#define I2S_BCK            25
-#define I2S_DATA           27
+#define I2S_WS                                26
+#define I2S_BCK                               25
+#define I2S_DATA                              27
 
 //
 // Steppers
 //
-#define X_STEP_PIN        129
-#define X_DIR_PIN         130
-#define X_ENABLE_PIN      128
-//#define X_CS_PIN           21
-
-#define Y_STEP_PIN        132
-#define Y_DIR_PIN         133
-#define Y_ENABLE_PIN      131
-//#define Y_CS_PIN           22
-
-#define Z_STEP_PIN        135
-#define Z_DIR_PIN         136
-#define Z_ENABLE_PIN      134
-//#define Z_CS_PIN            5 // SS_PIN
-
-#define E0_STEP_PIN       138
-#define E0_DIR_PIN        139
-#define E0_ENABLE_PIN     137
-//#define E0_CS_PIN          21
-
-#define E1_STEP_PIN       141
-#define E1_DIR_PIN        142
-#define E1_ENABLE_PIN     140
-//#define E1_CS_PIN          22
-
-#define Z2_STEP_PIN       141
-#define Z2_DIR_PIN        142
-#define Z2_ENABLE_PIN     140
-//#define Z2_CS_PIN            5
+#define X_STEP_PIN                           129
+#define X_DIR_PIN                            130
+#define X_ENABLE_PIN                         128
+//#define X_CS_PIN                            21
+
+#define Y_STEP_PIN                           132
+#define Y_DIR_PIN                            133
+#define Y_ENABLE_PIN                         131
+//#define Y_CS_PIN                            22
+
+#define Z_STEP_PIN                           135
+#define Z_DIR_PIN                            136
+#define Z_ENABLE_PIN                         134
+//#define Z_CS_PIN                             5  // SS_PIN
+
+#define E0_STEP_PIN                          138
+#define E0_DIR_PIN                           139
+#define E0_ENABLE_PIN                        137
+//#define E0_CS_PIN                           21
+
+#define E1_STEP_PIN                          141
+#define E1_DIR_PIN                           142
+#define E1_ENABLE_PIN                        140
+//#define E1_CS_PIN                           22
+
+#define Z2_STEP_PIN                          141
+#define Z2_DIR_PIN                           142
+#define Z2_ENABLE_PIN                        140
+//#define Z2_CS_PIN                            5
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         36   // Analog Input
-#define TEMP_1_PIN         34   // Analog Input
-#define TEMP_BED_PIN       39   // Analog Input
+#define TEMP_0_PIN                            36  // Analog Input
+#define TEMP_1_PIN                            34  // Analog Input
+#define TEMP_BED_PIN                          39  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN      145 // 2
-#define FAN_PIN           146 // 15
-#define HEATER_BED_PIN    144 // 4
+#define HEATER_0_PIN                         145  // 2
+#define FAN_PIN                              146  // 15
+#define HEATER_BED_PIN                       144  // 4
 
-#define CONTROLLER_FAN_PIN 147
-//#define E0_AUTO_FAN_PIN 148 // need to update Configuration_adv.h @section extruder
-//#define E1_AUTO_FAN_PIN 149 // need to update Configuration_adv.h @section extruder
-#define FAN1_PIN 149
+#define CONTROLLER_FAN_PIN                   147
+//#define E0_AUTO_FAN_PIN                    148  // need to update Configuration_adv.h @section extruder
+//#define E1_AUTO_FAN_PIN                    149  // need to update Configuration_adv.h @section extruder
+#define FAN1_PIN                             149
 
 //
 // MicroSD card
 //
-#define MOSI_PIN           23
-#define MISO_PIN           19
-#define SCK_PIN            18
-#define SDSS                5
-#define USES_SHARED_SPI  // SPI is shared by SD card with TMC SPI drivers
+#define MOSI_PIN                              23
+#define MISO_PIN                              19
+#define SCK_PIN                               18
+#define SDSS                                   5
+#define USES_SHARED_SPI                           // SPI is shared by SD card with TMC SPI drivers
 
 //////////////////////////
 // LCDs and Controllers //
@@ -126,21 +126,21 @@
 
 #if HAS_GRAPHICAL_LCD
 
-  #define LCD_PINS_RS        13
-  #define LCD_PINS_ENABLE    17
-  #define LCD_PINS_D4        16
+  #define LCD_PINS_RS                         13
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         16
 
   #if ENABLED(CR10_STOCKDISPLAY)
 
-    #define BEEPER_PIN      151
+    #define BEEPER_PIN                       151
 
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define BEEPER_PIN      151
+    #define BEEPER_PIN                       151
 
-    //#define LCD_PINS_D5     150
-    //#define LCD_PINS_D6     152
-    //#define LCD_PINS_D7     153
+    //#define LCD_PINS_D5                    150
+    //#define LCD_PINS_D6                    152
+    //#define LCD_PINS_D7                    153
 
   #else
 
@@ -148,9 +148,9 @@
 
   #endif
 
-  #define BTN_EN1             0
-  #define BTN_EN2            12
-  #define BTN_ENC            14
+  #define BTN_EN1                              0
+  #define BTN_EN2                             12
+  #define BTN_ENC                             14
 
 #endif // HAS_GRAPHICAL_LCD
 
@@ -159,7 +159,7 @@
 // specific pins to hardware Serial1 and Serial2.
 // Note: Serial2 can be defined using HARDWARE_SERIAL2_RX and HARDWARE_SERIAL2_TX but
 // MRR ESPA does not have enough spare pins for such reassignment.
-//#define HARDWARE_SERIAL1_RX 21
-//#define HARDWARE_SERIAL1_TX 22
-//#define HARDWARE_SERIAL2_RX  2
-//#define HARDWARE_SERIAL2_TX  4
+//#define HARDWARE_SERIAL1_RX                 21
+//#define HARDWARE_SERIAL1_TX                 22
+//#define HARDWARE_SERIAL2_RX                  2
+//#define HARDWARE_SERIAL2_TX                  4

Marlin/src/pins/linux/pins_RAMPS_LINUX.h

@@ -49,7 +49,7 @@
   #define BOARD_INFO_NAME "RAMPS 1.4"
 #endif
 
-#define E2END 0xFFF // 4KB
+#define E2END 0xFFF                               // 4KB
 
 #define IS_RAMPS_EFB
 
@@ -57,85 +57,85 @@
 // Servos
 //
 #ifdef IS_RAMPS_13
-  #define SERVO0_PIN        7   // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
+  #define SERVO0_PIN                           7  // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
 #else
-  #define SERVO0_PIN       11
+  #define SERVO0_PIN                          11
 #endif
-#define SERVO1_PIN          6
-#define SERVO2_PIN          5
+#define SERVO1_PIN                             6
+#define SERVO2_PIN                             5
 #ifndef SERVO3_PIN
-  #define SERVO3_PIN        4
+  #define SERVO3_PIN                           4
 #endif
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN           3
+#define X_MIN_PIN                              3
 #ifndef X_MAX_PIN
-  #define X_MAX_PIN         2
+  #define X_MAX_PIN                            2
 #endif
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         54
-#define X_DIR_PIN          55
-#define X_ENABLE_PIN       38
+#define X_STEP_PIN                            54
+#define X_DIR_PIN                             55
+#define X_ENABLE_PIN                          38
 #ifndef X_CS_PIN
-  #define X_CS_PIN         53
+  #define X_CS_PIN                            53
 #endif
 
-#define Y_STEP_PIN         60
-#define Y_DIR_PIN          61
-#define Y_ENABLE_PIN       56
+#define Y_STEP_PIN                            60
+#define Y_DIR_PIN                             61
+#define Y_ENABLE_PIN                          56
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         49
+  #define Y_CS_PIN                            49
 #endif
 
-#define Z_STEP_PIN         46
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            46
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          62
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         40
+  #define Z_CS_PIN                            40
 #endif
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         24
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        42
+  #define E0_CS_PIN                           42
 #endif
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        44
+  #define E1_CS_PIN                           44
 #endif
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          1   // Analog Input
-#define TEMP_BED_PIN        2   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           2  // Analog Input
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
@@ -159,72 +159,72 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN     -1
+  #define MOSFET_D_PIN                        -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN      8
+  #define RAMPS_D8_PIN                         8
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN      9
+  #define RAMPS_D9_PIN                         9
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN    10
+  #define RAMPS_D10_PIN                       10
 #endif
 
-#define HEATER_0_PIN     RAMPS_D10_PIN
-
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN   RAMPS_D9_PIN
-  #define FAN_PIN        RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN   RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define FAN1_PIN       RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_SF)                     // Spindle, Fan
-  #define FAN_PIN        RAMPS_D8_PIN
-#else                                          // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
-  #define FAN_PIN        RAMPS_D9_PIN
-  #define HEATER_BED_PIN RAMPS_D8_PIN
+#define HEATER_0_PIN               RAMPS_D10_PIN
+
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define FAN_PIN                   RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define FAN1_PIN                  RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_SF)                        // Spindle, Fan
+  #define FAN_PIN                   RAMPS_D8_PIN
+#else                                             // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+  #define FAN_PIN                   RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN     MOSFET_D_PIN
+    #define FAN1_PIN                MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN MOSFET_D_PIN
+    #define HEATER_1_PIN            MOSFET_D_PIN
   #endif
 #endif
 
 #ifndef FAN_PIN
-  #define FAN_PIN           4   // IO pin. Buffer needed
+  #define FAN_PIN                              4  // IO pin. Buffer needed
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
+#define SDSS                                  53
+#define LED_PIN                               13
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN      5   // Analog Input on AUX2
+  #define FILWIDTH_PIN                         5  // Analog Input on AUX2
 #endif
 
 // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN    4
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        12
+  #define PS_ON_PIN                           12
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !defined(CASE_LIGHT_PIN) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if NUM_SERVOS <= 1 // Prefer the servo connector
-    #define CASE_LIGHT_PIN    6   // Hardware PWM
-  #elif HAS_FREE_AUX2_PINS        // try to use AUX 2
-    #define CASE_LIGHT_PIN   44   // Hardware PWM
+  #if NUM_SERVOS <= 1                             // Prefer the servo connector
+    #define CASE_LIGHT_PIN                     6  // Hardware PWM
+  #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
+    #define CASE_LIGHT_PIN                    44  // Hardware PWM
   #endif
 #endif
 
@@ -232,14 +232,14 @@
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER && !PIN_EXISTS(SPINDLE_LASER_ENA)
-  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // Prefer the servo connector
-    #define SPINDLE_LASER_ENA_PIN     4   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-    #define SPINDLE_DIR_PIN           5
-  #elif HAS_FREE_AUX2_PINS                // try to use AUX 2
-    #define SPINDLE_LASER_ENA_PIN    40   // Pullup or pulldown!
-    #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-    #define SPINDLE_DIR_PIN          65
+  #if !defined(NUM_SERVOS) || NUM_SERVOS == 0     // Prefer the servo connector
+    #define SPINDLE_LASER_ENA_PIN              4  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN              6  // Hardware PWM
+    #define SPINDLE_DIR_PIN                    5
+  #elif HAS_FREE_AUX2_PINS                        // try to use AUX 2
+    #define SPINDLE_LASER_ENA_PIN             40  // Pullup or pulldown!
+    #define SPINDLE_LASER_PWM_PIN             44  // Hardware PWM
+    #define SPINDLE_DIR_PIN                   65
   #endif
 #endif
 
@@ -247,13 +247,13 @@
 // Průša i3 MK2 Multiplexer Support
 //
 #ifndef E_MUX0_PIN
-  #define E_MUX0_PIN 40   // Z_CS_PIN
+  #define E_MUX0_PIN                          40  // Z_CS_PIN
 #endif
 #ifndef E_MUX1_PIN
-  #define E_MUX1_PIN 42   // E0_CS_PIN
+  #define E_MUX1_PIN                          42  // E0_CS_PIN
 #endif
 #ifndef E_MUX2_PIN
-  #define E_MUX2_PIN 44   // E1_CS_PIN
+  #define E_MUX2_PIN                          44  // E1_CS_PIN
 #endif
 
 /**
@@ -261,17 +261,17 @@
  */
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    66
+    #define TMC_SW_MOSI                       66
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    44
+    #define TMC_SW_MISO                       44
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     64
+    #define TMC_SW_SCK                        64
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -295,91 +295,91 @@
    */
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  40
+    #define X_SERIAL_TX_PIN                   40
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  63
+    #define X_SERIAL_RX_PIN                   63
   #endif
   #ifndef X2_SERIAL_TX_PIN
-    #define X2_SERIAL_TX_PIN -1
+    #define X2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef X2_SERIAL_RX_PIN
-    #define X2_SERIAL_RX_PIN -1
+    #define X2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  59
+    #define Y_SERIAL_TX_PIN                   59
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  64
+    #define Y_SERIAL_RX_PIN                   64
   #endif
   #ifndef Y2_SERIAL_TX_PIN
-    #define Y2_SERIAL_TX_PIN -1
+    #define Y2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Y2_SERIAL_RX_PIN
-    #define Y2_SERIAL_RX_PIN -1
+    #define Y2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  42
+    #define Z_SERIAL_TX_PIN                   42
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  65
+    #define Z_SERIAL_RX_PIN                   65
   #endif
   #ifndef Z2_SERIAL_TX_PIN
-    #define Z2_SERIAL_TX_PIN -1
+    #define Z2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef Z2_SERIAL_RX_PIN
-    #define Z2_SERIAL_RX_PIN -1
+    #define Z2_SERIAL_RX_PIN                  -1
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN 44
+    #define E0_SERIAL_TX_PIN                  44
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN 66
+    #define E0_SERIAL_RX_PIN                  66
   #endif
   #ifndef E1_SERIAL_TX_PIN
-    #define E1_SERIAL_TX_PIN -1
+    #define E1_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E1_SERIAL_RX_PIN
-    #define E1_SERIAL_RX_PIN -1
+    #define E1_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_TX_PIN
-    #define E2_SERIAL_TX_PIN -1
+    #define E2_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E2_SERIAL_RX_PIN
-    #define E2_SERIAL_RX_PIN -1
+    #define E2_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_TX_PIN
-    #define E3_SERIAL_TX_PIN -1
+    #define E3_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E3_SERIAL_RX_PIN
-    #define E3_SERIAL_RX_PIN -1
+    #define E3_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_TX_PIN
-    #define E4_SERIAL_TX_PIN -1
+    #define E4_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E4_SERIAL_RX_PIN
-    #define E4_SERIAL_RX_PIN -1
+    #define E4_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_TX_PIN
-    #define E5_SERIAL_TX_PIN -1
+    #define E5_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E5_SERIAL_RX_PIN
-    #define E5_SERIAL_RX_PIN -1
+    #define E5_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_TX_PIN
-    #define E6_SERIAL_TX_PIN -1
+    #define E6_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E6_SERIAL_RX_PIN
-    #define E6_SERIAL_RX_PIN -1
+    #define E6_SERIAL_RX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_TX_PIN
-    #define E7_SERIAL_TX_PIN -1
+    #define E7_SERIAL_TX_PIN                  -1
   #endif
   #ifndef E7_SERIAL_RX_PIN
-    #define E7_SERIAL_RX_PIN -1
+    #define E7_SERIAL_RX_PIN                  -1
   #endif
 #endif
 
@@ -394,62 +394,62 @@
   //
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS                       49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE                   51  // SID (MOSI)
+    #define LCD_PINS_D4                       52  // SCK (CLK) clock
 
   #elif BOTH(NEWPANEL, PANEL_ONE)
 
-    #define LCD_PINS_RS         40
-    #define LCD_PINS_ENABLE     42
-    #define LCD_PINS_D4         65
-    #define LCD_PINS_D5         66
-    #define LCD_PINS_D6         44
-    #define LCD_PINS_D7         64
+    #define LCD_PINS_RS                       40
+    #define LCD_PINS_ENABLE                   42
+    #define LCD_PINS_D4                       65
+    #define LCD_PINS_D5                       66
+    #define LCD_PINS_D6                       44
+    #define LCD_PINS_D7                       64
 
   #else
 
     #if ENABLED(CR10_STOCKDISPLAY)
 
-      #define LCD_PINS_RS       27
-      #define LCD_PINS_ENABLE   29
-      #define LCD_PINS_D4       25
+      #define LCD_PINS_RS                     27
+      #define LCD_PINS_ENABLE                 29
+      #define LCD_PINS_D4                     25
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      37
+        #define BEEPER_PIN                    37
       #endif
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define LCD_PINS_RS       64
-      #define LCD_PINS_ENABLE   44
-      #define LCD_PINS_D4       63
-      #define LCD_PINS_D5       40
-      #define LCD_PINS_D6       42
-      #define LCD_PINS_D7       65
+      #define LCD_PINS_RS                     64
+      #define LCD_PINS_ENABLE                 44
+      #define LCD_PINS_D4                     63
+      #define LCD_PINS_D5                     40
+      #define LCD_PINS_D6                     42
+      #define LCD_PINS_D7                     65
 
     #else
 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
-        #define LCD_PINS_DC     25   // Set as output on init
-        #define LCD_PINS_RS     27   // Pull low for 1s to init
+        #define LCD_PINS_DC                   25  // Set as output on init
+        #define LCD_PINS_RS                   27  // Pull low for 1s to init
         // DOGM SPI LCD Support
-        #define DOGLCD_CS       16
-        #define DOGLCD_MOSI     17
-        #define DOGLCD_SCK      23
-        #define DOGLCD_A0       LCD_PINS_DC
+        #define DOGLCD_CS                     16
+        #define DOGLCD_MOSI                   17
+        #define DOGLCD_SCK                    23
+        #define DOGLCD_A0            LCD_PINS_DC
       #else
-        #define LCD_PINS_RS     16
-        #define LCD_PINS_ENABLE 17
-        #define LCD_PINS_D4     23
-        #define LCD_PINS_D5     25
-        #define LCD_PINS_D6     27
+        #define LCD_PINS_RS                   16
+        #define LCD_PINS_ENABLE               17
+        #define LCD_PINS_D4                   23
+        #define LCD_PINS_D5                   25
+        #define LCD_PINS_D6                   27
       #endif
 
-      #define LCD_PINS_D7       29
+      #define LCD_PINS_D7                     29
 
       #if DISABLED(NEWPANEL)
-        #define BEEPER_PIN      33
+        #define BEEPER_PIN                    33
       #endif
 
     #endif
@@ -457,10 +457,10 @@
     #if DISABLED(NEWPANEL)
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK       38
-      //#define SHIFT_LD        42
-      //#define SHIFT_OUT       40
-      //#define SHIFT_EN        17
+      //#define SHIFT_CLK                     38
+      //#define SHIFT_LD                      42
+      //#define SHIFT_OUT                     40
+      //#define SHIFT_EN                      17
     #endif
 
   #endif
@@ -472,85 +472,85 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN                      37
 
       #if ENABLED(CR10_STOCKDISPLAY)
-        #define BTN_EN1         17
-        #define BTN_EN2         23
+        #define BTN_EN1                       17
+        #define BTN_EN2                       23
       #else
-        #define BTN_EN1         31
-        #define BTN_EN2         33
+        #define BTN_EN1                       31
+        #define BTN_EN2                       33
       #endif
 
-      #define BTN_ENC           35
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define BTN_ENC                         35
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN             39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1                         64
+      #define BTN_EN2                         59
+      #define BTN_ENC                         63
+      #define SD_DETECT_PIN                   42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          SDSS
-      #define KILL_PIN          41
+      #define BTN_EN1                         47
+      #define BTN_EN2                         43
+      #define BTN_ENC                         32
+      #define LCD_SDSS                      SDSS
+      #define KILL_PIN                        41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
-      #define BTN_ENC           -1
+      #define BTN_EN1                         22  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2                          7  // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_ENC                         -1
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define DOGLCD_CS         45
-      #define DOGLCD_A0         44
+      #define DOGLCD_CS                       45
+      #define DOGLCD_A0                       44
       #define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN        33
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define BEEPER_PIN                      33
+      #define STAT_LED_RED_PIN                32
+      #define STAT_LED_BLUE_PIN               35
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1                         22
+      #define BTN_EN2                          7
+      #define BTN_ENC                         39
 
-      #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
-      #define KILL_PIN          31
+      #define SD_DETECT_PIN                   -1  // Pin 49 for display sd interface, 72 for easy adapter board
+      #define KILL_PIN                        31
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
+      #define DOGLCD_CS                       29
+      #define DOGLCD_A0                       27
 
-      #define BEEPER_PIN        23
-      #define LCD_BACKLIGHT_PIN 33
+      #define BEEPER_PIN                      23
+      #define LCD_BACKLIGHT_PIN               33
 
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
+      #define BTN_EN1                         35
+      #define BTN_EN2                         37
+      #define BTN_ENC                         31
 
-      #define LCD_SDSS          SDSS
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define LCD_SDSS                      SDSS
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        41
 
     #elif ENABLED(MKS_MINI_12864)
 
-      #define DOGLCD_A0         27
-      #define DOGLCD_CS         25
+      #define DOGLCD_A0                       27
+      #define DOGLCD_CS                       25
 
       // GLCD features
       // Uncomment screen orientation
@@ -558,25 +558,25 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN                      37
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1                         31
+      #define BTN_EN2                         33
+      #define BTN_ENC                         35
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        64
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN                      42
       // not connected to a pin
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
+      #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
+      #define DOGLCD_A0                       44
+      #define DOGLCD_CS                       66
 
       // GLCD features
       // Uncomment screen orientation
@@ -584,16 +584,16 @@
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
 
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1                         40
+      #define BTN_EN2                         63
+      #define BTN_ENC                         59
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          64
+      #define SD_DETECT_PIN                   49
+      #define KILL_PIN                        64
 
     #elif ENABLED(ZONESTAR_LCD)
 
-      #define ADC_KEYPAD_PIN    12
+      #define ADC_KEYPAD_PIN                  12
 
     #elif ENABLED(AZSMZ_12864)
 
@@ -602,29 +602,29 @@
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN                      33
 
       // Buttons are directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
+        #define SHIFT_OUT                     40
+        #define SHIFT_CLK                     44
+        #define SHIFT_LD                      42
+        #define BTN_EN1                       64
+        #define BTN_EN2                       59
+        #define BTN_ENC                       63
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+        #define BTN_EN1                       59  // AUX2 PIN 3
+        #define BTN_EN2                       63  // AUX2 PIN 4
+        #define BTN_ENC                       49  // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1                       37
+        #define BTN_EN2                       35
+        #define BTN_ENC                       31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN                 49
+        #define KILL_PIN                      41
       #endif
 
     #endif

Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h

@@ -40,84 +40,84 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define Y_MIN_PIN          P1_26
-#define Z_MIN_PIN          P1_28
-#define Z_MAX_PIN          P1_29
+#define X_MIN_PIN                          P1_24
+#define Y_MIN_PIN                          P1_26
+#define Z_MIN_PIN                          P1_28
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (TH1)
-#define TEMP_BED_PIN        P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
+#define TEMP_0_PIN                      P0_23_A0  // A0 (TH1)
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 // EFB
-#define HEATER_0_PIN       P2_04
-#define HEATER_BED_PIN     P2_05
+#define HEATER_0_PIN                       P2_04
+#define HEATER_BED_PIN                     P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_07
+  #define FAN_PIN                          P2_07
 #endif
-#define FAN1_PIN           P0_26
+#define FAN1_PIN                           P0_26
 
-#define LCD_SDSS           P0_16   // LCD SD chip select
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define LCD_SDSS                           P0_16  // LCD SD chip select
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if ENABLED(AZSMZ_12864)
-  #define BEEPER_PIN       P1_30
-  #define DOGLCD_A0        P2_06
-  #define DOGLCD_CS        P1_22
-  #define BTN_EN1          P4_28
-  #define BTN_EN2          P1_27
-  #define BTN_ENC          P3_26
+  #define BEEPER_PIN                       P1_30
+  #define DOGLCD_A0                        P2_06
+  #define DOGLCD_CS                        P1_22
+  #define BTN_EN1                          P4_28
+  #define BTN_EN2                          P1_27
+  #define BTN_ENC                          P3_26
   #ifndef SDCARD_CONNECTION
-    #define SDCARD_CONNECTION LCD
+    #define SDCARD_CONNECTION                LCD
   #endif
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           LCD_SDSS
-  #define SD_DETECT_PIN    P3_25
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                        LCD_SDSS
+  #define SD_DETECT_PIN                    P3_25
 #elif SD_CONNECTION_IS(ONBOARD)
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -125,16 +125,16 @@
 //
 // Ethernet pins
 //
-#define ENET_MDIO          P1_17
-#define ENET_RX_ER         P1_14
-#define ENET_RXD1          P1_10
-#define ENET_MOC           P1_16
-#define REF_CLK            P1_15
-#define ENET_RXD0          P1_09
-#define ENET_CRS           P1_08
-#define ENET_TX_EN         P1_04
-#define ENET_TXD0          P1_00
-#define ENET_TXD1          P1_01
+#define ENET_MDIO                          P1_17
+#define ENET_RX_ER                         P1_14
+#define ENET_RXD1                          P1_10
+#define ENET_MOC                           P1_16
+#define REF_CLK                            P1_15
+#define ENET_RXD0                          P1_09
+#define ENET_CRS                           P1_08
+#define ENET_TX_EN                         P1_04
+#define ENET_TXD0                          P1_00
+#define ENET_TXD1                          P1_01
 
 /**
  *  PWMs

Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h

@@ -47,42 +47,42 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V, 1K series
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_15   // ETH
+  #define X_CS_PIN                         P1_15  // ETH
 #endif
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_14   // ETH
+  #define Y_CS_PIN                         P1_14  // ETH
 #endif
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_16   // ETH
+  #define Z_CS_PIN                         P1_16  // ETH
 #endif
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_17   // ETH
+  #define E0_CS_PIN                        P1_17  // ETH
 #endif
 
 //
@@ -90,13 +90,13 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P0_18   // ETH
+    #define TMC_SW_MOSI                    P0_18  // ETH
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_17   // ETH
+    #define TMC_SW_MISO                    P0_17  // ETH
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_15   // ETH
+    #define TMC_SW_SCK                     P0_15  // ETH
   #endif
 #endif
 
@@ -104,23 +104,23 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_24_A1   // A0 (T0)
-#define TEMP_BED_PIN        P0_23_A0   // A1 (T1)
+#define TEMP_0_PIN                      P0_24_A1  // A0 (T0)
+#define TEMP_BED_PIN                    P0_23_A0  // A1 (T1)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       P2_07
-#define HEATER_BED_PIN     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_BED_PIN                     P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
 // Unused
 //
-//#define PIN_P2_10        P2_10   // IBOOT-1
-//#define PIN_P0_27        P0_27   // Onboard SD Detect
+//#define PIN_P2_10                        P2_10  // IBOOT-1
+//#define PIN_P0_27                        P0_27  // Onboard SD Detect
 
 /**
  * LCD / Controller
@@ -134,16 +134,16 @@
  */
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       P1_31   // EXP1-1
+  #define BEEPER_PIN                       P1_31  // EXP1-1
 
-  #define BTN_EN1          P3_26   // EXP2-3
-  #define BTN_EN2          P3_25   // EXP2-5
-  #define BTN_ENC          P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-3
+  #define BTN_EN2                          P3_25  // EXP2-5
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define SD_DETECT_PIN    P0_27   // EXP2-7
-  #define LCD_PINS_RS      P0_16   // EXP1-4
-  #define LCD_PINS_ENABLE  P0_18   // (MOSI) EXP1-3
-  #define LCD_PINS_D4      P0_15   // (SCK)  EXP1-5
+  #define SD_DETECT_PIN                    P0_27  // EXP2-7
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_PINS_ENABLE                  P0_18  // (MOSI) EXP1-3
+  #define LCD_PINS_D4                      P0_15  // (SCK)  EXP1-5
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
@@ -162,11 +162,11 @@
  * Hardware SPI can't be used because P0_17 (MISO) is not brought out on this board.
  */
 #if ENABLED(SDSUPPORT)
-  #define SCK_PIN          P0_15   // EXP1-5
-  #define MISO_PIN         P0_16   // EXP1-4
-  #define MOSI_PIN         P0_18   // EXP1-3
-  #define SS_PIN           P1_30   // EXP1-2
-  #define SDSS             SS_PIN
+  #define SCK_PIN                          P0_15  // EXP1-5
+  #define MISO_PIN                         P0_16  // EXP1-4
+  #define MOSI_PIN                         P0_18  // EXP1-3
+  #define SS_PIN                           P1_30  // EXP1-2
+  #define SDSS                            SS_PIN
 #endif
 
 /**

Marlin/src/pins/lpc1768/pins_BIQU_BQ111_A4.h

@@ -45,56 +45,53 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN         P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN         P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN         P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN         P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN         P1_28   // 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN         P1_29   // 10k pullup to 3.3V, 1K series
-
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_0
-#define X_DIR_PIN          P0_5
-#define X_ENABLE_PIN       P0_4
-
-#define Y_STEP_PIN         P2_1
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define X_STEP_PIN                         P2_0
+#define X_DIR_PIN                          P0_5
+#define X_ENABLE_PIN                       P0_4
 
-#define Z_STEP_PIN         P2_2
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_1
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define E0_STEP_PIN        P2_3
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define Z_STEP_PIN                         P2_2
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
+#define E0_STEP_PIN                        P2_3
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
 //
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (T0)
-#define TEMP_BED_PIN        P0_24_A1   // A1 (T1)
-
+#define TEMP_0_PIN                      P0_23_A0  // A0 (T0)
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (T1)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       P2_7
-#define HEATER_BED_PIN     P2_5
+#define HEATER_0_PIN                       P2_7
+#define HEATER_BED_PIN                     P2_5
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_4
+  #define FAN_PIN                          P2_4
 #endif
 
 //
 // Unused
 //
-//#define PIN_P2_10         P2_10   // IBOOT-1
-//#define PIN_P0_27         P0_27   // Onboard SD Detect
+//#define PIN_P2_10                        P2_10  // IBOOT-1
+//#define PIN_P0_27                        P0_27  // Onboard SD Detect
 
 /**
  * LCD / Controller
@@ -108,16 +105,16 @@
  */
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN          P1_31   // EXP1-1
+  #define BEEPER_PIN                       P1_31  // EXP1-1
 
-  #define BTN_EN1             P3_26   // EXP2-3
-  #define BTN_EN2             P3_25   // EXP2-5
-  #define BTN_ENC             P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-3
+  #define BTN_EN2                          P3_25  // EXP2-5
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define SD_DETECT_PIN       P0_27   // EXP2-7
-  #define LCD_PINS_RS         P0_16   // EXP1-4
-  #define LCD_PINS_ENABLE     P0_18   // (MOSI) EXP1-3
-  #define LCD_PINS_D4         P0_15   // (SCK)  EXP1-5
+  #define SD_DETECT_PIN                    P0_27  // EXP2-7
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_PINS_ENABLE                  P0_18  // (MOSI) EXP1-3
+  #define LCD_PINS_D4                      P0_15  // (SCK)  EXP1-5
 
   #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
     #error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
@@ -129,7 +126,6 @@
 
 #endif // HAS_SPI_LCD
 
-
 /**
  * SD Card Reader
  *
@@ -138,15 +134,14 @@
  */
 #if ENABLED(SDSUPPORT)
 
-  #define SCK_PIN   P0_15   // EXP1-5
-  #define MISO_PIN  P0_16   // EXP1-4
-  #define MOSI_PIN  P0_18   // EXP1-3
-  #define SS_PIN    P1_30   // EXP1-2
-  #define SDSS      SS_PIN
+  #define SCK_PIN                          P0_15  // EXP1-5
+  #define MISO_PIN                         P0_16  // EXP1-4
+  #define MOSI_PIN                         P0_18  // EXP1-3
+  #define SS_PIN                           P1_30  // EXP1-2
+  #define SDSS                            SS_PIN
 
 #endif // SDSUPPORT
 
-
 /**
  *  PWMS
  *

Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h

@@ -33,31 +33,31 @@
 // Limit Switches
 //
 
-#define X_MIN_PIN          P1_29
-#define X_MAX_PIN          P1_28
-#define Y_MIN_PIN          P1_27
-#define Y_MAX_PIN          P1_26
-#define Z_MIN_PIN          P1_25
-#define Z_MAX_PIN          P1_24
+#define X_MIN_PIN                          P1_29
+#define X_MAX_PIN                          P1_28
+#define Y_MIN_PIN                          P1_27
+#define Y_MAX_PIN                          P1_26
+#define Z_MIN_PIN                          P1_25
+#define Z_MAX_PIN                          P1_24
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P0_04
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P4_28
+#define X_STEP_PIN                         P0_04
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P4_28
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P2_02
-#define Y_ENABLE_PIN       P2_00
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P2_02
+#define Y_ENABLE_PIN                       P2_00
 
-#define Z_STEP_PIN         P0_20
-#define Z_DIR_PIN          P0_21
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P0_20
+#define Z_DIR_PIN                          P0_21
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P0_11
-#define E0_DIR_PIN         P2_13
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P0_11
+#define E0_DIR_PIN                         P2_13
+#define E0_ENABLE_PIN                      P2_12
 
 /**
  * LCD / Controller
@@ -73,19 +73,19 @@
  */
 
 #if HAS_SPI_LCD
-  #define BTN_EN1          P3_26
-  #define BTN_EN2          P3_25
-  #define BTN_ENC          P2_11
+  #define BTN_EN1                          P3_26
+  #define BTN_EN2                          P3_25
+  #define BTN_ENC                          P2_11
 
-  #define SD_DETECT_PIN    P1_31
-  #define LCD_SDSS         P1_23
-  #define LCD_PINS_RS      P0_16
-  #define LCD_PINS_ENABLE  P0_18
-  #define LCD_PINS_D4      P0_15
+  #define SD_DETECT_PIN                    P1_31
+  #define LCD_SDSS                         P1_23
+  #define LCD_PINS_RS                      P0_16
+  #define LCD_PINS_ENABLE                  P0_18
+  #define LCD_PINS_D4                      P0_15
 
   #if ENABLED(MKS_MINI_12864)
-    #define DOGLCD_CS      P2_06
-    #define DOGLCD_A0      P0_16
+    #define DOGLCD_CS                      P2_06
+    #define DOGLCD_A0                      P0_16
   #endif
 #endif
 
@@ -97,14 +97,14 @@
 // https://www.facebook.com/groups/505736576548648/permalink/630639874058317/
 #ifndef SDCARD_CONNECTION
   #if EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
-    #define SDCARD_CONNECTION LCD
+    #define SDCARD_CONNECTION                LCD
   #else
-    #define SDCARD_CONNECTION ONBOARD
+    #define SDCARD_CONNECTION            ONBOARD
   #endif
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           P1_23
+  #define SS_PIN                           P1_23
 #endif
 
 // Trinamic driver support
@@ -137,49 +137,48 @@
   // When using any TMC SPI-based drivers, software SPI is used
   // because pins may be shared with the display or SD card.
   #define TMC_USE_SW_SPI
-  #define TMC_SW_MOSI       P0_18
-  #define TMC_SW_MISO       P0_17
+  #define TMC_SW_MOSI                      P0_18
+  #define TMC_SW_MISO                      P0_17
   // To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
-  #define TMC_SW_SCK        P0_15
+  #define TMC_SW_SCK                       P0_15
   // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
-  //#define TMC_SW_SCK        P2_06
+  //#define TMC_SW_SCK                     P2_06
 
   #if ENABLED(SOFTWARE_DRIVER_ENABLE)
 
     // Software enable allows the enable pins to be repurposed as chip-select pins.
     // Note: Requires the driver modules to be modified to always be enabled with the enable pin removed.
     #if AXIS_DRIVER_TYPE_X(TMC2130)
-      #define X_CS_PIN         P4_28
-      #undef  X_ENABLE_PIN
-      #define X_ENABLE_PIN     -1
+      #define X_CS_PIN                     P4_28
+      #undef X_ENABLE_PIN
+      #define X_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_Y(TMC2130)
-      #define Y_CS_PIN         P2_00
-      #undef  Y_ENABLE_PIN
-      #define Y_ENABLE_PIN     -1
+      #define Y_CS_PIN                     P2_00
+      #undef Y_ENABLE_PIN
+      #define Y_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_Z(TMC2130)
-      #define Z_CS_PIN         P0_19
-      #undef  Z_ENABLE_PIN
-      #define Z_ENABLE_PIN     -1
+      #define Z_CS_PIN                     P0_19
+      #undef Z_ENABLE_PIN
+      #define Z_ENABLE_PIN                 -1
     #endif
 
     #if AXIS_DRIVER_TYPE_E0(TMC2130)
-      #define E0_CS_PIN        P2_12
-      #undef  E0_ENABLE_PIN
-      #define E0_ENABLE_PIN    -1
+      #define E0_CS_PIN                    P2_12
+      #undef E0_ENABLE_PIN
+      #define E0_ENABLE_PIN                -1
     #endif
 
-
     #if AXIS_DRIVER_TYPE_E1(TMC2130)
-      #define E1_CS_PIN        P0_10
-      #undef  E1_ENABLE_PIN
-      #define E1_ENABLE_PIN    -1
+      #define E1_CS_PIN                    P0_10
+      #undef E1_ENABLE_PIN
+      #define E1_ENABLE_PIN                -1
     #endif
 
-  #else // !SOFTWARE_DRIVER_ENABLE
+  #else                                           // !SOFTWARE_DRIVER_ENABLE
 
     // A chip-select pin is needed for each driver.
 
@@ -192,11 +191,11 @@
       #if SD_CONNECTION_IS(LCD)
         #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_PINS_FOR_CS."
       #endif
-      #define X_CS_PIN      P1_23
-      #define Y_CS_PIN      P3_26
-      #define Z_CS_PIN      P2_11
-      #define E0_CS_PIN     P3_25
-      #define E1_CS_PIN     P1_31
+      #define X_CS_PIN                     P1_23
+      #define Y_CS_PIN                     P3_26
+      #define Z_CS_PIN                     P2_11
+      #define E0_CS_PIN                    P3_25
+      #define E1_CS_PIN                    P1_31
     #endif
 
     // Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -207,16 +206,16 @@
       #if SD_CONNECTION_IS(LCD)
         #error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
       #endif
-      #define X_CS_PIN      P0_02
-      #define Y_CS_PIN      P0_03
-      #define Z_CS_PIN      P2_06
+      #define X_CS_PIN                     P0_02
+      #define Y_CS_PIN                     P0_03
+      #define Z_CS_PIN                     P2_06
       // We use SD_DETECT_PIN for E0
       #undef SD_DETECT_PIN
-      #define E0_CS_PIN     P1_31
+      #define E0_CS_PIN                    P1_31
       // We use LCD_SDSS pin for E1
-      #undef  LCD_SDSS
-      #define LCD_SDSS      -1
-      #define E1_CS_PIN     P1_23
+      #undef LCD_SDSS
+      #define LCD_SDSS                     -1
+      #define E1_CS_PIN                    P1_23
     #endif
 
     // Example 3: Use the driver enable pins for chip-select.
@@ -224,11 +223,11 @@
     //            advanced features (like driver monitoring) will not be available.
     //#define SKR_USE_ENABLE_CS
     #if ENABLED(SKR_USE_ENABLE_FOR_CS)
-      #define X_CS_PIN      X_ENABLE_PIN
-      #define Y_CS_PIN      Y_ENABLE_PIN
-      #define Z_CS_PIN      Z_ENABLE_PIN
-      #define E0_CS_PIN     E0_ENABLE_PIN
-      #define E1_CS_PIN     E1_ENABLE_PIN
+      #define X_CS_PIN              X_ENABLE_PIN
+      #define Y_CS_PIN              Y_ENABLE_PIN
+      #define Z_CS_PIN              Z_ENABLE_PIN
+      #define E0_CS_PIN            E0_ENABLE_PIN
+      #define E1_CS_PIN            E1_ENABLE_PIN
     #endif
 
   #endif // SOFTWARE_DRIVER_ENABLE

Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h

@@ -32,107 +32,107 @@
 /**
  * Trinamic Stallguard pins
  */
-#define X_DIAG_PIN           P1_29   // X-
-#define Y_DIAG_PIN           P1_27   // Y-
-#define Z_DIAG_PIN           P1_25   // Z-
-#define E0_DIAG_PIN          P1_28   // X+
-#define E1_DIAG_PIN          P1_26   // Y+
+#define X_DIAG_PIN                         P1_29  // X-
+#define Y_DIAG_PIN                         P1_27  // Y-
+#define Z_DIAG_PIN                         P1_25  // Z-
+#define E0_DIAG_PIN                        P1_28  // X+
+#define E1_DIAG_PIN                        P1_26  // Y+
 
 /**
  * Limit Switches
  */
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN         X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN        P1_28   // X+
+    #define X_MAX_PIN                      P1_28  // X+
   #else
-    #define X_MIN_PIN        P1_28   // X+
+    #define X_MIN_PIN                      P1_28  // X+
   #endif
 #else
-  #define X_MIN_PIN          P1_29   // X-
-  #define X_MAX_PIN          P1_28   // X+
+  #define X_MIN_PIN                        P1_29  // X-
+  #define X_MAX_PIN                        P1_28  // X+
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN         Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN        P1_26   // Y+
+    #define Y_MAX_PIN                      P1_26  // Y+
   #else
-    #define Y_MIN_PIN        P1_26   // Y+
+    #define Y_MIN_PIN                      P1_26  // Y+
   #endif
 #else
-  #define Y_MIN_PIN          P1_27   // Y-
-  #define Y_MAX_PIN          P1_26   // Y+
+  #define Y_MIN_PIN                        P1_27  // Y-
+  #define Y_MAX_PIN                        P1_26  // Y+
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN         Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN        P1_24   // Z+
+    #define Z_MAX_PIN                      P1_24  // Z+
   #else
-    #define Z_MIN_PIN        P1_24   // Z+
+    #define Z_MIN_PIN                      P1_24  // Z+
   #endif
 #else
-  #define Z_MIN_PIN          P1_25   // Z-
-  #define Z_MAX_PIN          P1_24   // Z+
+  #define Z_MIN_PIN                        P1_25  // Z-
+  #define Z_MAX_PIN                        P1_24  // Z+
 #endif
 
-#define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
+#define ONBOARD_ENDSTOPPULLUPS                    // Board has built-in pullups
 
 //
 // Servos
 //
 #ifndef SERVO0_PIN
-  #define SERVO0_PIN       P2_00
+  #define SERVO0_PIN                       P2_00
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P1_24
+  #define Z_MIN_PROBE_PIN                  P1_24
 #endif
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_28
+  #define FIL_RUNOUT_PIN                   P1_28
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_06
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_06
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_17
+  #define X_CS_PIN                         P1_17
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_15
+  #define Y_CS_PIN                         P1_15
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10
+  #define Z_CS_PIN                         P1_10
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_08
+  #define E0_CS_PIN                        P1_08
 #endif
 
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_01
+  #define E1_CS_PIN                        P1_01
 #endif
 
 //
@@ -140,17 +140,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P4_28
+    #define TMC_SW_MOSI                    P4_28
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -172,20 +172,20 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P4_29
-  #define X_SERIAL_RX_PIN  P1_17
+  #define X_SERIAL_TX_PIN                  P4_29
+  #define X_SERIAL_RX_PIN                  P1_17
 
-  #define Y_SERIAL_TX_PIN  P1_16
-  #define Y_SERIAL_RX_PIN  P1_15
+  #define Y_SERIAL_TX_PIN                  P1_16
+  #define Y_SERIAL_RX_PIN                  P1_15
 
-  #define Z_SERIAL_TX_PIN  P1_14
-  #define Z_SERIAL_RX_PIN  P1_10
+  #define Z_SERIAL_TX_PIN                  P1_14
+  #define Z_SERIAL_RX_PIN                  P1_10
 
-  #define E0_SERIAL_TX_PIN P1_09
-  #define E0_SERIAL_RX_PIN P1_08
+  #define E0_SERIAL_TX_PIN                 P1_09
+  #define E0_SERIAL_RX_PIN                 P1_08
 
-  #define E1_SERIAL_TX_PIN P1_04
-  #define E1_SERIAL_RX_PIN P1_01
+  #define E1_SERIAL_TX_PIN                 P1_04
+  #define E1_SERIAL_RX_PIN                 P1_01
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -202,23 +202,23 @@
  *               EXP2                                               EXP1
  */
 
-#define EXPA1_03_PIN        P1_23
-#define EXPA1_04_PIN        P1_22
-#define EXPA1_05_PIN        P1_21
-#define EXPA1_06_PIN        P1_20
-#define EXPA1_07_PIN        P1_19
-#define EXPA1_08_PIN        P1_18
-#define EXPA1_09_PIN        P0_28
-#define EXPA1_10_PIN        P1_30
-
-#define EXPA2_03_PIN        -1
-#define EXPA2_04_PIN        P1_31
-#define EXPA2_05_PIN        P0_18
-#define EXPA2_06_PIN        P3_25
-#define EXPA2_07_PIN        P0_16
-#define EXPA2_08_PIN        P3_26
-#define EXPA2_09_PIN        P0_15
-#define EXPA2_10_PIN        P0_17
+#define EXPA1_03_PIN                       P1_23
+#define EXPA1_04_PIN                       P1_22
+#define EXPA1_05_PIN                       P1_21
+#define EXPA1_06_PIN                       P1_20
+#define EXPA1_07_PIN                       P1_19
+#define EXPA1_08_PIN                       P1_18
+#define EXPA1_09_PIN                       P0_28
+#define EXPA1_10_PIN                       P1_30
+
+#define EXPA2_03_PIN                       -1
+#define EXPA2_04_PIN                       P1_31
+#define EXPA2_05_PIN                       P0_18
+#define EXPA2_06_PIN                       P3_25
+#define EXPA2_07_PIN                       P0_16
+#define EXPA2_08_PIN                       P3_26
+#define EXPA2_09_PIN                       P0_15
+#define EXPA2_10_PIN                       P0_17
 
 #if HAS_SPI_LCD
 
@@ -247,75 +247,75 @@
     *                   LCD                             LCD
     */
 
-    #define LCD_PINS_RS    EXPA1_03_PIN
+    #define LCD_PINS_RS             EXPA1_03_PIN
 
-    #define BTN_EN1        EXPA1_06_PIN
-    #define BTN_EN2        EXPA1_04_PIN
-    #define BTN_ENC        EXPA1_08_PIN
+    #define BTN_EN1                 EXPA1_06_PIN
+    #define BTN_EN2                 EXPA1_04_PIN
+    #define BTN_ENC                 EXPA1_08_PIN
 
-    #define LCD_PINS_ENABLE EXPA1_05_PIN
-    #define LCD_PINS_D4    EXPA1_07_PIN
+    #define LCD_PINS_ENABLE         EXPA1_05_PIN
+    #define LCD_PINS_D4             EXPA1_07_PIN
 
   #elif ENABLED(CR10_STOCKDISPLAY)
 
-    #define LCD_PINS_RS    EXPA1_04_PIN
+    #define LCD_PINS_RS             EXPA1_04_PIN
 
-    #define BTN_EN1        EXPA1_08_PIN
-    #define BTN_EN2        EXPA1_06_PIN
-    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
+    #define BTN_EN1                 EXPA1_08_PIN
+    #define BTN_EN2                 EXPA1_06_PIN
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
 
-    #define LCD_PINS_ENABLE EXPA1_03_PIN
-    #define LCD_PINS_D4    EXPA1_05_PIN
+    #define LCD_PINS_ENABLE         EXPA1_03_PIN
+    #define LCD_PINS_D4             EXPA1_05_PIN
 
-  #else // !CR10_STOCKDISPLAY
+  #else                                           // !CR10_STOCKDISPLAY
 
-    #define LCD_PINS_RS    EXPA1_07_PIN
+    #define LCD_PINS_RS             EXPA1_07_PIN
 
-    #define BTN_EN1        EXPA2_08_PIN   // (31) J3-2 & AUX-4
-    #define BTN_EN2        EXPA2_06_PIN   // (33) J3-4 & AUX-4
-    #define BTN_ENC        EXPA1_09_PIN   // (58) open-drain
+    #define BTN_EN1                 EXPA2_08_PIN  // (31) J3-2 & AUX-4
+    #define BTN_EN2                 EXPA2_06_PIN  // (33) J3-4 & AUX-4
+    #define BTN_ENC                 EXPA1_09_PIN  // (58) open-drain
 
-    #define LCD_PINS_ENABLE EXPA1_08_PIN
-    #define LCD_PINS_D4    EXPA1_06_PIN
+    #define LCD_PINS_ENABLE         EXPA1_08_PIN
+    #define LCD_PINS_D4             EXPA1_06_PIN
 
-    #define LCD_SDSS       EXPA2_07_PIN   // (16) J3-7 & AUX-4
-    #define SD_DETECT_PIN  EXPA2_04_PIN   // (49) (NOT 5V tolerant)
+    #define LCD_SDSS                EXPA2_07_PIN  // (16) J3-7 & AUX-4
+    #define SD_DETECT_PIN           EXPA2_04_PIN  // (49) (NOT 5V tolerant)
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    EXPA1_08_PIN
-      #define DOGLCD_A0    EXPA1_07_PIN
-      #define DOGLCD_SCK   EXPA2_09_PIN
-      #define DOGLCD_MOSI  EXPA2_05_PIN
+      #define DOGLCD_CS             EXPA1_08_PIN
+      #define DOGLCD_A0             EXPA1_07_PIN
+      #define DOGLCD_SCK            EXPA2_09_PIN
+      #define DOGLCD_MOSI           EXPA2_05_PIN
 
-      #define LCD_BACKLIGHT_PIN -1
+      #define LCD_BACKLIGHT_PIN            -1
 
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN EXPA1_06_PIN   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN         EXPA1_06_PIN  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN EXPA1_05_PIN
+          #define RGB_LED_R_PIN     EXPA1_05_PIN
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN EXPA1_04_PIN
+          #define RGB_LED_G_PIN     EXPA1_04_PIN
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN EXPA1_03_PIN
+          #define RGB_LED_B_PIN     EXPA1_03_PIN
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    EXPA1_05_PIN
+        #define NEOPIXEL_PIN        EXPA1_05_PIN
       #endif
 
-    #else // !FYSETC_MINI_12864
+    #else                                         // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
 
-        #define DOGLCD_CS    EXPA1_05_PIN
-        #define DOGLCD_A0    EXPA1_04_PIN
-        #define DOGLCD_SCK   EXPA2_09_PIN
-        #define DOGLCD_MOSI  EXPA2_05_PIN
+        #define DOGLCD_CS           EXPA1_05_PIN
+        #define DOGLCD_A0           EXPA1_04_PIN
+        #define DOGLCD_SCK          EXPA2_09_PIN
+        #define DOGLCD_MOSI         EXPA2_05_PIN
 
       #elif ENABLED(ENDER2_STOCKDISPLAY)
 
@@ -331,21 +331,21 @@
          *                    EXP1
          */
 
-        #define BTN_EN1      EXPA1_08_PIN
-        #define BTN_EN2      EXPA1_06_PIN
-        #define BTN_ENC      EXPA1_09_PIN
-        #define DOGLCD_CS    EXPA1_04_PIN
-        #define DOGLCD_A0    EXPA1_05_PIN
-        #define DOGLCD_SCK   EXPA1_10_PIN
-        #define DOGLCD_MOSI  EXPA1_03_PIN
+        #define BTN_EN1             EXPA1_08_PIN
+        #define BTN_EN2             EXPA1_06_PIN
+        #define BTN_ENC             EXPA1_09_PIN
+        #define DOGLCD_CS           EXPA1_04_PIN
+        #define DOGLCD_A0           EXPA1_05_PIN
+        #define DOGLCD_SCK          EXPA1_10_PIN
+        #define DOGLCD_MOSI         EXPA1_03_PIN
         #define FORCE_SOFT_SPI
-        #define LCD_BACKLIGHT_PIN -1
+        #define LCD_BACKLIGHT_PIN          -1
       #endif
 
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 EXPA1_05_PIN
-        #define LCD_PINS_D6 EXPA1_04_PIN
-        #define LCD_PINS_D7 EXPA1_03_PIN
+        #define LCD_PINS_D5         EXPA1_05_PIN
+        #define LCD_PINS_D6         EXPA1_04_PIN
+        #define LCD_PINS_D7         EXPA1_03_PIN
       #endif
 
     #endif // !FYSETC_MINI_12864
@@ -359,11 +359,11 @@
 //
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           EXPA2_07_PIN
+  #define SS_PIN                    EXPA2_07_PIN
 #endif
 
 /**

Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h

@@ -37,58 +37,58 @@
 // SD Connection
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
 //
 // Servos
 //
-#define SERVO0_PIN         P2_00
+#define SERVO0_PIN                         P2_00
 
 //
 // TMC StallGuard DIAG pins
 //
-#define X_DIAG_PIN         P1_29   // X-STOP
-#define Y_DIAG_PIN         P1_28   // Y-STOP
-#define Z_DIAG_PIN         P1_27   // Z-STOP
-#define E0_DIAG_PIN        P1_26   // E0DET
-#define E1_DIAG_PIN        P1_25   // E1DET
+#define X_DIAG_PIN                         P1_29  // X-STOP
+#define Y_DIAG_PIN                         P1_28  // Y-STOP
+#define Z_DIAG_PIN                         P1_27  // Z-STOP
+#define E0_DIAG_PIN                        P1_26  // E0DET
+#define E1_DIAG_PIN                        P1_25  // E1DET
 
 //
 // Limit Switches
 //
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN       X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN      P1_26   // E0DET
+    #define X_MAX_PIN                      P1_26  // E0DET
   #else
-    #define X_MIN_PIN      P1_26   // E0DET
+    #define X_MIN_PIN                      P1_26  // E0DET
   #endif
 #else
-  #define X_STOP_PIN       P1_29   // X-STOP
+  #define X_STOP_PIN                       P1_29  // X-STOP
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN       Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN      P1_25   // E1DET
+    #define Y_MAX_PIN                      P1_25  // E1DET
   #else
-    #define Y_MIN_PIN      P1_25   // E1DET
+    #define Y_MIN_PIN                      P1_25  // E1DET
   #endif
 #else
-  #define Y_STOP_PIN       P1_28   // Y-STOP
+  #define Y_STOP_PIN                       P1_28  // Y-STOP
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN       Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN      P1_00   // PWRDET
+    #define Z_MAX_PIN                      P1_00  // PWRDET
   #else
-    #define Z_MIN_PIN      P1_00   // PWRDET
+    #define Z_MIN_PIN                      P1_00  // PWRDET
   #endif
 #else
   #ifndef Z_STOP_PIN
-    #define Z_STOP_PIN     P1_27   // Z-STOP
+    #define Z_STOP_PIN                     P1_27  // Z-STOP
   #endif
 #endif
 
@@ -96,86 +96,86 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P0_10
+  #define Z_MIN_PROBE_PIN                  P0_10
 #endif
 
 //
 // Filament Runout Sensor
 //
-#define FIL_RUNOUT_PIN     P1_26   // E0DET
-#define FIL_RUNOUT2_PIN    P1_25   // E1DET
+#define FIL_RUNOUT_PIN                     P1_26  // E0DET
+#define FIL_RUNOUT2_PIN                    P1_25  // E1DET
 
 //
 // Power Supply Control
 //
 #ifndef PS_ON_PIN
-  #define PS_ON_PIN        P1_00   // PWRDET
+  #define PS_ON_PIN                        P1_00  // PWRDET
 #endif
 
 //
 // Power Loss Detection
 //
 #ifndef POWER_LOSS_PIN
-  #define POWER_LOSS_PIN   P1_00   // PWRDET
+  #define POWER_LOSS_PIN                   P1_00  // PWRDET
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_06
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_06
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_10
+  #define X_CS_PIN                         P1_10
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_09
+  #define Y_CS_PIN                         P1_09
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_08
+  #define Z_CS_PIN                         P1_08
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_04
+  #define E0_CS_PIN                        P1_04
 #endif
 
-#define E1_STEP_PIN        P1_15
-#define E1_DIR_PIN         P1_14
-#define E1_ENABLE_PIN      P1_16
+#define E1_STEP_PIN                        P1_15
+#define E1_DIR_PIN                         P1_14
+#define E1_ENABLE_PIN                      P1_16
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_01
+  #define E1_CS_PIN                        P1_01
 #endif
 
-#define TEMP_1_PIN         P0_23_A0   // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_BED_PIN       P0_25_A2   // A0 (T0) - (67) - TEMP_BED_PIN
+#define TEMP_1_PIN                      P0_23_A0  // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_BED_PIN                    P0_25_A2  // A0 (T0) - (67) - TEMP_BED_PIN
 
 //
 // Software SPI pins for TMC2130 stepper drivers
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_17
+    #define TMC_SW_MOSI                    P1_17
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -197,23 +197,23 @@
   //
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P1_10
-  #define X_SERIAL_RX_PIN  P1_10
+  #define X_SERIAL_TX_PIN                  P1_10
+  #define X_SERIAL_RX_PIN                  P1_10
 
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_09
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_09
 
-  #define Z_SERIAL_TX_PIN  P1_08
-  #define Z_SERIAL_RX_PIN  P1_08
+  #define Z_SERIAL_TX_PIN                  P1_08
+  #define Z_SERIAL_RX_PIN                  P1_08
 
-  #define E0_SERIAL_TX_PIN P1_04
-  #define E0_SERIAL_RX_PIN P1_04
+  #define E0_SERIAL_TX_PIN                 P1_04
+  #define E0_SERIAL_RX_PIN                 P1_04
 
-  #define E1_SERIAL_TX_PIN P1_01
-  #define E1_SERIAL_RX_PIN P1_01
+  #define E1_SERIAL_TX_PIN                 P1_01
+  #define E1_SERIAL_RX_PIN                 P1_01
 
-  #define Z2_SERIAL_TX_PIN P1_01
-  #define Z2_SERIAL_RX_PIN P1_01
+  #define Z2_SERIAL_TX_PIN                 P1_01
+  #define Z2_SERIAL_RX_PIN                 P1_01
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -223,7 +223,7 @@
 // SD Connection
 //
 #if SD_CONNECTION_IS(LCD)
-  #define SS_PIN           P0_16
+  #define SS_PIN                           P0_16
 #endif
 
 /**
@@ -239,82 +239,82 @@
 #if HAS_SPI_LCD
   #if ENABLED(ANET_FULL_GRAPHICS_LCD)
 
-    #define LCD_PINS_RS    P1_23
+    #define LCD_PINS_RS                    P1_23
 
-    #define BTN_EN1        P1_20
-    #define BTN_EN2        P1_22
-    #define BTN_ENC        P1_18
+    #define BTN_EN1                        P1_20
+    #define BTN_EN2                        P1_22
+    #define BTN_ENC                        P1_18
 
-    #define LCD_PINS_ENABLE P1_21
-    #define LCD_PINS_D4    P1_19
+    #define LCD_PINS_ENABLE                P1_21
+    #define LCD_PINS_D4                    P1_19
 
   #elif ENABLED(CR10_STOCKDISPLAY)
-    #define BTN_ENC        P0_28   // (58) open-drain
-    #define LCD_PINS_RS    P1_22
+    #define BTN_ENC                        P0_28  // (58) open-drain
+    #define LCD_PINS_RS                    P1_22
 
-    #define BTN_EN1        P1_18
-    #define BTN_EN2        P1_20
+    #define BTN_EN1                        P1_18
+    #define BTN_EN2                        P1_20
 
-    #define LCD_PINS_ENABLE P1_23
-    #define LCD_PINS_D4    P1_21
+    #define LCD_PINS_ENABLE                P1_23
+    #define LCD_PINS_D4                    P1_21
 
   #else
-    #define BTN_ENC        P0_28   // (58) open-drain
-    #define LCD_PINS_RS    P1_19
+    #define BTN_ENC                        P0_28  // (58) open-drain
+    #define LCD_PINS_RS                    P1_19
 
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
+    #define BTN_EN1                        P3_26  // (31) J3-2 & AUX-4
+    #define BTN_EN2                        P3_25  // (33) J3-4 & AUX-4
 
-    #define LCD_PINS_ENABLE P1_18
-    #define LCD_PINS_D4    P1_20
+    #define LCD_PINS_ENABLE                P1_18
+    #define LCD_PINS_D4                    P1_20
 
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
+    #define LCD_SDSS                       P0_16  // (16) J3-7 & AUX-4
 
     #if SD_CONNECTION_IS(LCD)
-      #define SD_DETECT_PIN P1_31  // (49) (NOT 5V tolerant)
+      #define SD_DETECT_PIN                P1_31  // (49) (NOT 5V tolerant)
     #endif
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_CS    P1_18
-      #define DOGLCD_A0    P1_19
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define DOGLCD_CS                    P1_18
+      #define DOGLCD_A0                    P1_19
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
-      #define LCD_BACKLIGHT_PIN -1
+      #define LCD_BACKLIGHT_PIN            -1
 
-      #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN P1_20   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                P1_20  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN P1_21
+          #define RGB_LED_R_PIN            P1_21
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN P1_22
+          #define RGB_LED_G_PIN            P1_22
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN P1_23
+          #define RGB_LED_B_PIN            P1_23
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN    P1_21
+        #define NEOPIXEL_PIN               P1_21
       #endif
 
-    #else // !FYSETC_MINI_12864
+    #else                                         // !FYSETC_MINI_12864
 
       #if ENABLED(MKS_MINI_12864)
-        #define DOGLCD_CS   P1_21
-        #define DOGLCD_A0   P1_22
-        #define DOGLCD_SCK  P0_15
-        #define DOGLCD_MOSI P0_18
+        #define DOGLCD_CS                  P1_21
+        #define DOGLCD_A0                  P1_22
+        #define DOGLCD_SCK                 P0_15
+        #define DOGLCD_MOSI                P0_18
         #define FORCE_SOFT_SPI
       #endif
 
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 P1_21
-        #define LCD_PINS_D6 P1_22
-        #define LCD_PINS_D7 P1_23
+        #define LCD_PINS_D5                P1_21
+        #define LCD_PINS_D6                P1_22
+        #define LCD_PINS_D7                P1_23
       #endif
 
     #endif // !FYSETC_MINI_12864
@@ -327,7 +327,7 @@
 // Neopixel LED
 //
 #ifndef NEOPIXEL_PIN
-  #define NEOPIXEL_PIN      P1_24
+  #define NEOPIXEL_PIN                     P1_24
 #endif
 
 /**

Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h

@@ -40,13 +40,13 @@
 // Steppers
 //
 #ifndef E1_STEP_PIN
-  #define E1_STEP_PIN      P0_01
+  #define E1_STEP_PIN                      P0_01
 #endif
 #ifndef E1_DIR_PIN
-  #define E1_DIR_PIN       P0_00
+  #define E1_DIR_PIN                       P0_00
 #endif
 #ifndef E1_ENABLE_PIN
-  #define E1_ENABLE_PIN    P0_10
+  #define E1_ENABLE_PIN                    P0_10
 #endif
 
 //
@@ -54,64 +54,64 @@
 //  3.3V max when defined as an analog input
 //
 #ifndef TEMP_0_PIN
-  #define TEMP_0_PIN       P0_24_A1   // A1 (T1) - (68) - TEMP_0_PIN
+  #define TEMP_0_PIN                    P0_24_A1  // A1 (T1) - (68) - TEMP_0_PIN
 #endif
 #ifndef TEMP_1_PIN
-  #define TEMP_1_PIN       P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
+  #define TEMP_1_PIN                    P0_25_A2  // A2 (T2) - (69) - TEMP_1_PIN
 #endif
 #ifndef TEMP_BED_PIN
-  #define TEMP_BED_PIN     P0_23_A0   // A0 (T0) - (67) - TEMP_BED_PIN
+  #define TEMP_BED_PIN                  P0_23_A0  // A0 (T0) - (67) - TEMP_BED_PIN
 #endif
 
 #if HOTENDS == 1 && TEMP_SENSOR_PROBE
-  #define TEMP_PROBE_PIN   TEMP_1_PIN
+  #define TEMP_PROBE_PIN              TEMP_1_PIN
 #endif
 
 //
 // Heaters / Fans
 //
 #ifndef HEATER_0_PIN
-  #define HEATER_0_PIN     P2_07
+  #define HEATER_0_PIN                     P2_07
 #endif
 #if HOTENDS == 1
   #ifndef FAN1_PIN
-    #define FAN1_PIN       P2_04
+    #define FAN1_PIN                       P2_04
   #endif
 #else
   #ifndef HEATER_1_PIN
-    #define HEATER_1_PIN   P2_04
+    #define HEATER_1_PIN                   P2_04
   #endif
 #endif
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_03
+  #define FAN_PIN                          P2_03
 #endif
 #ifndef HEATER_BED_PIN
-  #define HEATER_BED_PIN   P2_05
+  #define HEATER_BED_PIN                   P2_05
 #endif
 
 //
 // LCD / Controller
 //
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_30   // (37) not 5V tolerant
+  #define BEEPER_PIN                       P1_30  // (37) not 5V tolerant
 #endif
 
 //
 // SD Support
 //
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif

Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h

@@ -44,63 +44,63 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_26   // PWM1[6]
-#define SERVO1_PIN         P1_18   // PWM1[1]
+#define SERVO0_PIN                         P1_26  // PWM1[6]
+#define SERVO1_PIN                         P1_18  // PWM1[1]
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P0_00
-#define X_MAX_PIN          P0_01
-#define Y_MIN_PIN          P0_10
-#define Y_MAX_PIN          P0_21
-#define Z_MIN_PIN          P2_13
-#define Z_MAX_PIN          P2_22
+#define X_MIN_PIN                          P0_00
+#define X_MAX_PIN                          P0_01
+#define Y_MIN_PIN                          P0_10
+#define Y_MAX_PIN                          P0_21
+#define Z_MIN_PIN                          P2_13
+#define Z_MAX_PIN                          P2_22
 
 //
 // Steppers
 //
 
-#define X_STEP_PIN         P1_01
-#define X_DIR_PIN          P1_04
-#define X_ENABLE_PIN       P0_26
+#define X_STEP_PIN                         P1_01
+#define X_DIR_PIN                          P1_04
+#define X_ENABLE_PIN                       P0_26
 
-#define Y_STEP_PIN         P1_10
-#define Y_DIR_PIN          P1_14
-#define Y_ENABLE_PIN       P1_08
+#define Y_STEP_PIN                         P1_10
+#define Y_DIR_PIN                          P1_14
+#define Y_ENABLE_PIN                       P1_08
 
-#define Z_STEP_PIN         P1_17
-#define Z_DIR_PIN          P4_29
-#define Z_ENABLE_PIN       P1_15
+#define Z_STEP_PIN                         P1_17
+#define Z_DIR_PIN                          P4_29
+#define Z_ENABLE_PIN                       P1_15
 
-#define E0_STEP_PIN        P0_05
-#define E0_DIR_PIN         P2_00
-#define E0_ENABLE_PIN      P4_28
+#define E0_STEP_PIN                        P0_05
+#define E0_DIR_PIN                         P2_00
+#define E0_ENABLE_PIN                      P4_28
 
-#define E1_STEP_PIN        P2_03
-#define E1_DIR_PIN         P2_04
-#define E1_ENABLE_PIN      P2_01
+#define E1_STEP_PIN                        P2_03
+#define E1_DIR_PIN                         P2_04
+#define E1_ENABLE_PIN                      P2_01
 
-#define E2_STEP_PIN        P2_07
-#define E2_DIR_PIN         P2_08
-#define E2_ENABLE_PIN      P2_05
+#define E2_STEP_PIN                        P2_07
+#define E2_DIR_PIN                         P2_08
+#define E2_ENABLE_PIN                      P2_05
 
 //
 // TMC2208 UART pins
 //
 #if HAS_TMC_UART
-  #define X_SERIAL_TX_PIN  P1_00
-  #define X_SERIAL_RX_PIN  P1_00
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_09
-  #define Z_SERIAL_TX_PIN  P1_16
-  #define Z_SERIAL_RX_PIN  P1_16
-  #define E0_SERIAL_TX_PIN P0_04
-  #define E0_SERIAL_RX_PIN P0_04
-  #define E1_SERIAL_TX_PIN P2_02
-  #define E1_SERIAL_RX_PIN P2_02
-  #define E2_SERIAL_TX_PIN P2_06
-  #define E2_SERIAL_RX_PIN P2_06
+  #define X_SERIAL_TX_PIN                  P1_00
+  #define X_SERIAL_RX_PIN                  P1_00
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_09
+  #define Z_SERIAL_TX_PIN                  P1_16
+  #define Z_SERIAL_RX_PIN                  P1_16
+  #define E0_SERIAL_TX_PIN                 P0_04
+  #define E0_SERIAL_RX_PIN                 P0_04
+  #define E1_SERIAL_TX_PIN                 P2_02
+  #define E1_SERIAL_RX_PIN                 P2_02
+  #define E2_SERIAL_TX_PIN                 P2_06
+  #define E2_SERIAL_RX_PIN                 P2_06
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -112,36 +112,36 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_24_A1   // AD0[0] on P0_23
-#define TEMP_BED_PIN        P0_23_A0   // AD0[1] on P0_24
+#define TEMP_0_PIN                      P0_24_A1  // AD0[0] on P0_23
+#define TEMP_BED_PIN                    P0_23_A0  // AD0[1] on P0_24
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P1_19 // Not a PWM pin, software PWM required
-#define HEATER_0_PIN       P3_26 // PWM1[3]
-#define FAN_PIN            P3_25 // Part cooling fan - connected to PWM1[2]
-#define E0_AUTO_FAN_PIN    P0_27 // Extruder cooling fan
+#define HEATER_BED_PIN                     P1_19  // Not a PWM pin, software PWM required
+#define HEATER_0_PIN                       P3_26  // PWM1[3]
+#define FAN_PIN                            P3_25  // Part cooling fan - connected to PWM1[2]
+#define E0_AUTO_FAN_PIN                    P0_27  // Extruder cooling fan
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P1_31
+#define LED_PIN                            P1_31
 
 //
 // LCD
 //
 #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
-  #define BEEPER_PIN       P0_19
-  #define BTN_EN1          P1_23
-  #define BTN_EN2          P1_24
-  #define BTN_ENC          P1_25
-  #define LCD_PINS_RS      P0_20
-  #define LCD_PINS_ENABLE  P0_21
-  #define LCD_PINS_D4      P2_11
-  #define LCD_PINS_D5      P0_22
-  #define LCD_PINS_D6      P1_29
-  #define LCD_PINS_D7      P1_28
+  #define BEEPER_PIN                       P0_19
+  #define BTN_EN1                          P1_23
+  #define BTN_EN2                          P1_24
+  #define BTN_ENC                          P1_25
+  #define LCD_PINS_RS                      P0_20
+  #define LCD_PINS_ENABLE                  P0_21
+  #define LCD_PINS_D4                      P2_11
+  #define LCD_PINS_D5                      P0_22
+  #define LCD_PINS_D6                      P1_29
+  #define LCD_PINS_D7                      P1_28
 #endif
 
 //
@@ -149,21 +149,21 @@
 //
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION LCD
+  #define SDCARD_CONNECTION                  LCD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           P0_16
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                           P0_16
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #endif

Marlin/src/pins/lpc1768/pins_MKS_SBASE.h

@@ -46,73 +46,73 @@
   //#define SDCARD_EEPROM_EMULATION
 #endif
 
-#define LED_PIN            P1_18   // Used as a status indicator
-#define LED2_PIN           P1_19
-#define LED3_PIN           P1_20
-#define LED4_PIN           P1_21
+#define LED_PIN                            P1_18  // Used as a status indicator
+#define LED2_PIN                           P1_19
+#define LED3_PIN                           P1_20
+#define LED4_PIN                           P1_21
 
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23   // J8-3 (low jitter)
-#define SERVO1_PIN         P2_12   // J8-4
-#define SERVO2_PIN         P2_11   // J8-5
-#define SERVO3_PIN         P4_28   // J8-6
+#define SERVO0_PIN                         P1_23  // J8-3 (low jitter)
+#define SERVO1_PIN                         P2_12  // J8-4
+#define SERVO2_PIN                         P2_11  // J8-5
+#define SERVO3_PIN                         P4_28  // J8-6
 
 //
 // Limit Switches - Not Interrupt Capable
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_28   // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V, 1K series
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_28  // The original Mks Sbase DIO19 has a 10k pullup to 3.3V or 5V, 1K series, so when using a Zprobe we must use DIO41 (J8 P1.22)
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V, 1K series
 
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P4_28   // Connector J8
+  #define Z_MIN_PROBE_PIN                  P4_28  // Connector J8
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-#define TEMP_2_PIN          P0_26_A3   // A3 (TH4)
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
+#define TEMP_2_PIN                      P0_26_A3  // A3 (TH4)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P2_06
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P2_06
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
@@ -124,56 +124,56 @@
 // 5V
 // NC
 // GND
-#define PIN_P0_17          P0_17
-#define PIN_P0_16          P0_16
-#define PIN_P0_15          P0_15
+#define PIN_P0_17                          P0_17
+#define PIN_P0_16                          P0_16
+#define PIN_P0_15                          P0_15
 
 //
 // Connector J8
 //
 
 // GND
-#define PIN_P1_22          P1_22
-#define PIN_P1_23          P1_23   // PWM Capable
-#define PIN_P2_12          P2_12   // Interrupt Capable
-#define PIN_P2_11          P2_11   // Interrupt Capable
+#define PIN_P1_22                          P1_22
+#define PIN_P1_23                          P1_23  // PWM Capable
+#define PIN_P2_12                          P2_12  // Interrupt Capable
+#define PIN_P2_11                          P2_11  // Interrupt Capable
 
 //
 // Průša i3 MK2 Multi Material Multiplexer Support
 //
 #if ENABLED(MK2_MULTIPLEXER)
-  #define E_MUX0_PIN       P1_23   // J8-3
-  #define E_MUX1_PIN       P2_12   // J8-4
-  #define E_MUX2_PIN       P2_11   // J8-5
+  #define E_MUX0_PIN                       P1_23  // J8-3
+  #define E_MUX1_PIN                       P2_12  // J8-4
+  #define E_MUX2_PIN                       P2_11  // J8-5
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          P0_25   // TH3 Connector
+#define PS_ON_PIN                          P0_25  // TH3 Connector
 
 //
 // Ethernet pins
 //
 #ifndef ULTIPANEL
-  #define ENET_MDIO        P1_17   // J12-4
-  #define ENET_RX_ER       P1_14   // J12-6
-  #define ENET_RXD1        P1_10   // J12-8
+  #define ENET_MDIO                        P1_17  // J12-4
+  #define ENET_RX_ER                       P1_14  // J12-6
+  #define ENET_RXD1                        P1_10  // J12-8
 #endif
 
-#define ENET_MOC           P1_16   // J12-3
-#define REF_CLK            P1_15   // J12-5
-#define ENET_RXD0          P1_09   // J12-7
-#define ENET_CRS           P1_08   // J12-9
-#define ENET_TX_EN         P1_04   // J12-10
-#define ENET_TXD0          P1_00   // J12-11
-#define ENET_TXD1          P1_01   // J12-12
+#define ENET_MOC                           P1_16  // J12-3
+#define REF_CLK                            P1_15  // J12-5
+#define ENET_RXD0                          P1_09  // J12-7
+#define ENET_CRS                           P1_08  // J12-9
+#define ENET_TX_EN                         P1_04  // J12-10
+#define ENET_TXD0                          P1_00  // J12-11
+#define ENET_TXD1                          P1_01  // J12-12
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(CUSTOM_CABLE)
 
@@ -189,27 +189,27 @@
    * If you can't find a pin to use for the LCD's SD_DETECT then comment out
    * SD_DETECT_PIN entirely and remove that wire from the the custom cable.
    */
-  #define SD_DETECT_PIN    P2_11   // J8-5 (moved from EXP2 P0.27)
-  #define SCK_PIN          P1_22   // J8-2 (moved from EXP2 P0.7)
-  #define MISO_PIN         P1_23   // J8-3 (moved from EXP2 P0.8)
-  #define MOSI_PIN         P2_12   // J8-4 (moved from EXP2 P0.9)
-  #define SS_PIN           P0_28
-  #define LPC_SOFTWARE_SPI  // With a custom cable we need software SPI because the
-                            // selected pins are not on a hardware SPI controller
+  #define SD_DETECT_PIN                    P2_11  // J8-5 (moved from EXP2 P0.27)
+  #define SCK_PIN                          P1_22  // J8-2 (moved from EXP2 P0.7)
+  #define MISO_PIN                         P1_23  // J8-3 (moved from EXP2 P0.8)
+  #define MOSI_PIN                         P2_12  // J8-4 (moved from EXP2 P0.9)
+  #define SS_PIN                           P0_28
+  #define LPC_SOFTWARE_SPI                        // With a custom cable we need software SPI because the
+                                                  // selected pins are not on a hardware SPI controller
 #elif SD_CONNECTION_IS(LCD)
   // use standard cable and header, SPI and SD detect sre shared with on-board SD card
   // hardware SPI is used for both SD cards. The detect pin is shred between the
   // LCD and onboard SD readers so we disable it.
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           P0_28
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN                           P0_28
 #elif SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #endif
 
 /**
@@ -226,17 +226,17 @@
  */
 
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_31   // EXP1.1
-  #define BTN_ENC          P1_30   // EXP1.2
-  #define BTN_EN1          P3_26   // EXP2.5
-  #define BTN_EN2          P3_25   // EXP2.3
-  #define LCD_PINS_RS      P0_16   // EXP1.4
-  #define LCD_SDSS         P0_28   // EXP2.4
-  #define LCD_PINS_ENABLE  P0_18   // EXP1.3
-  #define LCD_PINS_D4      P0_15   // EXP1.5
+  #define BEEPER_PIN                       P1_31  // EXP1.1
+  #define BTN_ENC                          P1_30  // EXP1.2
+  #define BTN_EN1                          P3_26  // EXP2.5
+  #define BTN_EN2                          P3_25  // EXP2.3
+  #define LCD_PINS_RS                      P0_16  // EXP1.4
+  #define LCD_SDSS                         P0_28  // EXP2.4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1.3
+  #define LCD_PINS_D4                      P0_15  // EXP1.5
   #if ANY(VIKI2, miniVIKI)
-    #define DOGLCD_SCK     SCK_PIN
-    #define DOGLCD_MOSI    MOSI_PIN
+    #define DOGLCD_SCK                   SCK_PIN
+    #define DOGLCD_MOSI                 MOSI_PIN
   #endif
 
   #if ENABLED(FYSETC_MINI_12864)
@@ -251,26 +251,26 @@
      * Pins 6, 7 & 8 on EXP2 are no connects. That means a second special
      * cable will be needed if the RGB LEDs are to be active.
      */
-    #define DOGLCD_CS      LCD_PINS_ENABLE // EXP1.3  (LCD_EN on FYSETC schematic)
-    #define DOGLCD_A0      LCD_PINS_RS     // EXP1.4  (LCD_A0 on FYSETC schematic)
-    #define DOGLCD_SCK     P2_11           // J8-5  (SCK on FYSETC schematic)
-    #define DOGLCD_MOSI    P4_28           // J8-6  (MOSI on FYSETC schematic)
+    #define DOGLCD_CS            LCD_PINS_ENABLE  // EXP1.3  (LCD_EN on FYSETC schematic)
+    #define DOGLCD_A0                LCD_PINS_RS  // EXP1.4  (LCD_A0 on FYSETC schematic)
+    #define DOGLCD_SCK                     P2_11  // J8-5  (SCK on FYSETC schematic)
+    #define DOGLCD_MOSI                    P4_28  // J8-6  (MOSI on FYSETC schematic)
 
-    //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+    //#define FORCE_SOFT_SPI                      // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
     #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
       #ifndef RGB_LED_R_PIN
-        #define RGB_LED_R_PIN P2_12        // J8-4  (LCD_D6 on FYSETC schematic)
+        #define RGB_LED_R_PIN              P2_12  // J8-4  (LCD_D6 on FYSETC schematic)
       #endif
       #ifndef RGB_LED_G_PIN
-        #define RGB_LED_G_PIN P1_23        // J8-3  (LCD_D5 on FYSETC schematic)
+        #define RGB_LED_G_PIN              P1_23  // J8-3  (LCD_D5 on FYSETC schematic)
       #endif
       #ifndef RGB_LED_B_PIN
-        #define RGB_LED_B_PIN P1_22        // J8-2  (LCD_D7 on FYSETC schematic)
+        #define RGB_LED_B_PIN              P1_22  // J8-2  (LCD_D7 on FYSETC schematic)
       #endif
     #elif ENABLED(FYSETC_MINI_12864_2_1)
-      #define NEOPIXEL_PIN P2_12
+      #define NEOPIXEL_PIN                 P2_12
     #endif
 
   #elif ENABLED(MINIPANEL)
@@ -291,29 +291,29 @@
 
 #if HAS_DRIVER(TMC2130)
   // J8
-  #define X_CS_PIN         P1_22
-  #define Y_CS_PIN         P1_23
-  #define Z_CS_PIN         P2_12
-  #define E0_CS_PIN        P2_11
-  #define E1_CS_PIN        P4_28
+  #define X_CS_PIN                         P1_22
+  #define Y_CS_PIN                         P1_23
+  #define Z_CS_PIN                         P2_12
+  #define E0_CS_PIN                        P2_11
+  #define E1_CS_PIN                        P4_28
 
 // Hardware SPI is on EXP2. See if you can make it work:
 // https://github.com/makerbase-mks/MKS-SBASE/issues/25
 #define TMC_USE_SW_SPI
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P0_03   // AUX1
+    #define TMC_SW_MOSI                    P0_03  // AUX1
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_02   // AUX1
+    #define TMC_SW_MISO                    P0_02  // AUX1
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_26   // TH4
+    #define TMC_SW_SCK                     P0_26  // TH4
   #endif
  #endif
 #endif
 
-#if MB(MKS_SBASE) && HAS_TMC220x
+#if MB(MKS_SBASE) && HAS_TMC_UART
 
   /**
    * TMC2208/TMC2209 stepper drivers
@@ -322,24 +322,24 @@
    * Worst case you may have to give up the LCD
    * RX pins need to be interrupt capable
    */
-  #define X_SERIAL_TX_PIN  P1_22   // J8-2
-  #define X_SERIAL_RX_PIN  P2_12   // J8-4 Interrupt Capable
-  #define Y_SERIAL_TX_PIN  P1_23   // J8-3
-  #define Y_SERIAL_RX_PIN  P2_11   // J8-5 Interrupt Capable
-  #define Z_SERIAL_TX_PIN  P2_12   // J8-4
-  #define Z_SERIAL_RX_PIN  P0_25   // TH3
-  #define E0_SERIAL_TX_PIN P4_28   // J8-6
-  #define E0_SERIAL_RX_PIN P0_26   // TH4
+  #define X_SERIAL_TX_PIN                  P1_22  // J8-2
+  #define X_SERIAL_RX_PIN                  P2_12  // J8-4 Interrupt Capable
+  #define Y_SERIAL_TX_PIN                  P1_23  // J8-3
+  #define Y_SERIAL_RX_PIN                  P2_11  // J8-5 Interrupt Capable
+  #define Z_SERIAL_TX_PIN                  P2_12  // J8-4
+  #define Z_SERIAL_RX_PIN                  P0_25  // TH3
+  #define E0_SERIAL_TX_PIN                 P4_28  // J8-6
+  #define E0_SERIAL_RX_PIN                 P0_26  // TH4
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
 #endif
 
 // UNUSED
-#define PIN_P0_27          P0_27   // EXP2/Onboard SD
-#define PIN_P0_28          P0_28   // EXP2
-#define PIN_P0_02          P0_02   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-#define PIN_P0_03          P0_03   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_27                          P0_27  // EXP2/Onboard SD
+#define PIN_P0_28                          P0_28  // EXP2
+#define PIN_P0_02                          P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+#define PIN_P0_03                          P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
 
 /**
  *  PWMs

Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h

@@ -41,100 +41,100 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23   // SERVO P1.23
-#define SERVO1_PIN         P2_00   // SERVO P2.0
+#define SERVO0_PIN                         P1_23  // SERVO P1.23
+#define SERVO1_PIN                         P2_00  // SERVO P2.0
 
 //
 // Trinamic Stallguard pins
 //
-#define X_DIAG_PIN         P1_29   // X-
-#define Y_DIAG_PIN         P1_27   // Y-
-#define Z_DIAG_PIN         P1_25   // Z-
-#define E0_DIAG_PIN        P1_28   // X+
-#define E1_DIAG_PIN        P1_26   // Y+
+#define X_DIAG_PIN                         P1_29  // X-
+#define Y_DIAG_PIN                         P1_27  // Y-
+#define Z_DIAG_PIN                         P1_25  // Z-
+#define E0_DIAG_PIN                        P1_28  // X+
+#define E1_DIAG_PIN                        P1_26  // Y+
 
 //
 // Limit Switches
 //
 #if X_STALL_SENSITIVITY
-  #define X_STOP_PIN       X_DIAG_PIN
+  #define X_STOP_PIN                  X_DIAG_PIN
   #if X_HOME_DIR < 0
-    #define X_MAX_PIN      P1_28   // X+
+    #define X_MAX_PIN                      P1_28  // X+
   #else
-    #define X_MIN_PIN      P1_28   // X+
+    #define X_MIN_PIN                      P1_28  // X+
   #endif
 #else
-  #define X_MIN_PIN        P1_29   // X-
-  #define X_MAX_PIN        P1_28   // X+
+  #define X_MIN_PIN                        P1_29  // X-
+  #define X_MAX_PIN                        P1_28  // X+
 #endif
 
 #if Y_STALL_SENSITIVITY
-  #define Y_STOP_PIN       Y_DIAG_PIN
+  #define Y_STOP_PIN                  Y_DIAG_PIN
   #if Y_HOME_DIR < 0
-    #define Y_MAX_PIN      P1_26   // Y+
+    #define Y_MAX_PIN                      P1_26  // Y+
   #else
-    #define Y_MIN_PIN      P1_26   // Y+
+    #define Y_MIN_PIN                      P1_26  // Y+
   #endif
 #else
-  #define Y_MIN_PIN        P1_27   // Y-
-  #define Y_MAX_PIN        P1_26   // Y+
+  #define Y_MIN_PIN                        P1_27  // Y-
+  #define Y_MAX_PIN                        P1_26  // Y+
 #endif
 
 #if Z_STALL_SENSITIVITY
-  #define Z_STOP_PIN       Z_DIAG_PIN
+  #define Z_STOP_PIN                  Z_DIAG_PIN
   #if Z_HOME_DIR < 0
-    #define Z_MAX_PIN      P1_24   // Z+
+    #define Z_MAX_PIN                      P1_24  // Z+
   #else
-    #define Z_MIN_PIN      P1_24   // Z+
+    #define Z_MIN_PIN                      P1_24  // Z+
   #endif
 #else
-  #define Z_MIN_PIN        P1_25   // Z-
-  #define Z_MAX_PIN        P1_24   // Z+
+  #define Z_MIN_PIN                        P1_25  // Z-
+  #define Z_MAX_PIN                        P1_24  // Z+
 #endif
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P1_24
+  #define Z_MIN_PROBE_PIN                  P1_24
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_02
-#define X_DIR_PIN          P2_03
-#define X_ENABLE_PIN       P2_01
+#define X_STEP_PIN                         P2_02
+#define X_DIR_PIN                          P2_03
+#define X_ENABLE_PIN                       P2_01
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_01
+  #define X_CS_PIN                         P1_01
 #endif
 
-#define Y_STEP_PIN         P0_19
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P2_08
+#define Y_STEP_PIN                         P0_19
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P2_08
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_08
+  #define Y_CS_PIN                         P1_08
 #endif
 
-#define Z_STEP_PIN         P0_22
-#define Z_DIR_PIN          P2_11
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P0_22
+#define Z_DIR_PIN                          P2_11
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10
+  #define Z_CS_PIN                         P1_10
 #endif
 
-#define E0_STEP_PIN        P2_13
-#define E0_DIR_PIN         P0_11
-#define E0_ENABLE_PIN      P2_12
+#define E0_STEP_PIN                        P2_13
+#define E0_DIR_PIN                         P0_11
+#define E0_ENABLE_PIN                      P2_12
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_15
+  #define E0_CS_PIN                        P1_15
 #endif
 
-#define E1_STEP_PIN        P0_01
-#define E1_DIR_PIN         P0_00
-#define E1_ENABLE_PIN      P0_10
+#define E1_STEP_PIN                        P0_01
+#define E1_DIR_PIN                         P0_00
+#define E1_ENABLE_PIN                      P0_10
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P1_17
+  #define E1_CS_PIN                        P1_17
 #endif
 
 //
@@ -142,17 +142,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P4_28
+    #define TMC_SW_MOSI                    P4_28
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P0_05
+    #define TMC_SW_MISO                    P0_05
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P0_04
+    #define TMC_SW_SCK                     P0_04
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -175,23 +175,23 @@
   // Software serial
   //
 
-  #define X_SERIAL_TX_PIN  P1_04
-  #define X_SERIAL_RX_PIN  P1_01
+  #define X_SERIAL_TX_PIN                  P1_04
+  #define X_SERIAL_RX_PIN                  P1_01
 
-  #define Y_SERIAL_TX_PIN  P1_09
-  #define Y_SERIAL_RX_PIN  P1_08
+  #define Y_SERIAL_TX_PIN                  P1_09
+  #define Y_SERIAL_RX_PIN                  P1_08
 
-  #define Z_SERIAL_TX_PIN  P1_14
-  #define Z_SERIAL_RX_PIN  P1_10
+  #define Z_SERIAL_TX_PIN                  P1_14
+  #define Z_SERIAL_RX_PIN                  P1_10
 
-  #define E0_SERIAL_TX_PIN P1_16
-  #define E0_SERIAL_RX_PIN P1_15
+  #define E0_SERIAL_TX_PIN                 P1_16
+  #define E0_SERIAL_RX_PIN                 P1_15
 
-  #define E1_SERIAL_TX_PIN P4_29
-  #define E1_SERIAL_RX_PIN P1_17
+  #define E1_SERIAL_TX_PIN                 P4_29
+  #define E1_SERIAL_RX_PIN                 P1_17
 
-  #define Z2_SERIAL_TX_PIN P4_29
-  #define Z2_SERIAL_RX_PIN P1_17
+  #define Z2_SERIAL_TX_PIN                 P4_29
+  #define Z2_SERIAL_RX_PIN                 P1_17
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -201,35 +201,35 @@
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN         P0_23_A0   // Analog Input A0 (TH1)
-#define TEMP_BED_PIN       P0_24_A1   // Analog Input A1 (TB)
-#define TEMP_1_PIN         P0_25_A2   // Analog Input A2 (TH2)
+#define TEMP_0_PIN                      P0_23_A0  // Analog Input A0 (TH1)
+#define TEMP_BED_PIN                    P0_24_A1  // Analog Input A1 (TB)
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input A2 (TH2)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
 #if HOTENDS == 1
   #ifndef FAN1_PIN
-    #define FAN1_PIN       P2_06
+    #define FAN1_PIN                       P2_06
   #endif
 #else
   #ifndef HEATER_1_PIN
-    #define HEATER_1_PIN   P2_06
+    #define HEATER_1_PIN                   P2_06
   #endif
 #endif
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_04
+  #define FAN_PIN                          P2_04
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P1_18   // Used as a status indicator
-#define LED2_PIN           P1_19
-#define LED3_PIN           P1_20
-#define LED4_PIN           P1_21
+#define LED_PIN                            P1_18  // Used as a status indicator
+#define LED2_PIN                           P1_19
+#define LED3_PIN                           P1_20
+#define LED4_PIN                           P1_21
 
 /**
  *                _____                                            _____
@@ -242,83 +242,83 @@
  *                EXP1                                             EXP2
  */
 #if HAS_SPI_LCD
-  #define BEEPER_PIN       P1_31
-  #define BTN_ENC          P1_30
+  #define BEEPER_PIN                       P1_31
+  #define BTN_ENC                          P1_30
 
   #if ENABLED(CR10_STOCKDISPLAY)
-    #define LCD_PINS_RS    P1_00
+    #define LCD_PINS_RS                    P1_00
 
-    #define BTN_EN1        P0_18
-    #define BTN_EN2        P0_15
+    #define BTN_EN1                        P0_18
+    #define BTN_EN2                        P0_15
 
-    #define LCD_PINS_ENABLE P1_22
-    #define LCD_PINS_D4    P0_17
+    #define LCD_PINS_ENABLE                P1_22
+    #define LCD_PINS_D4                    P0_17
 
   #else
 
-    #define BTN_EN1        P3_25
-    #define BTN_EN2        P3_26
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
 
-    #define LCD_SDSS       P0_28
+    #define LCD_SDSS                       P0_28
 
     #if ENABLED(MKS_12864OLED_SSD1306)
 
-      #define LCD_PINS_DC  P0_17
-      #define DOGLCD_CS    P0_16
-      #define DOGLCD_A0    LCD_PINS_DC
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define LCD_PINS_DC                  P0_17
+      #define DOGLCD_CS                    P0_16
+      #define DOGLCD_A0              LCD_PINS_DC
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
-      #define LCD_PINS_RS  P1_00
-      #define LCD_PINS_D7  P1_22
-      #define KILL_PIN     -1 // NC
+      #define LCD_PINS_RS                  P1_00
+      #define LCD_PINS_D7                  P1_22
+      #define KILL_PIN                     -1     // NC
 
-    #else // !MKS_12864OLED_SSD1306
+    #else                                         // !MKS_12864OLED_SSD1306
 
-      #define LCD_PINS_RS  P0_16
+      #define LCD_PINS_RS                  P0_16
 
-      #define LCD_PINS_ENABLE P0_18
-      #define LCD_PINS_D4  P0_15
+      #define LCD_PINS_ENABLE              P0_18
+      #define LCD_PINS_D4                  P0_15
 
       #if ENABLED(FYSETC_MINI_12864)
 
-        #define DOGLCD_CS  P0_18
-        #define DOGLCD_A0  P0_16
-        #define DOGLCD_SCK P0_07
-        #define DOGLCD_MOSI P1_20
+        #define DOGLCD_CS                  P0_18
+        #define DOGLCD_A0                  P0_16
+        #define DOGLCD_SCK                 P0_07
+        #define DOGLCD_MOSI                P1_20
 
-        #define LCD_BACKLIGHT_PIN -1
+        #define LCD_BACKLIGHT_PIN          -1
 
-        #define FORCE_SOFT_SPI      // Use this if default of hardware SPI causes display problems
-                                    //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+        #define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-        #define LCD_RESET_PIN P0_15   // Must be high or open for LCD to operate normally.
+        #define LCD_RESET_PIN              P0_15  // Must be high or open for LCD to operate normally.
 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
           #ifndef RGB_LED_R_PIN
-            #define RGB_LED_R_PIN P0_17
+            #define RGB_LED_R_PIN          P0_17
           #endif
           #ifndef RGB_LED_G_PIN
-            #define RGB_LED_G_PIN P1_00
+            #define RGB_LED_G_PIN          P1_00
           #endif
           #ifndef RGB_LED_B_PIN
-            #define RGB_LED_B_PIN P1_22
+            #define RGB_LED_B_PIN          P1_22
           #endif
         #elif ENABLED(FYSETC_MINI_12864_2_1)
-          #define NEOPIXEL_PIN    P0_17
+          #define NEOPIXEL_PIN             P0_17
         #endif
 
-      #else // !FYSETC_MINI_12864
+      #else                                       // !FYSETC_MINI_12864
 
         #if ENABLED(MKS_MINI_12864)
-          #define DOGLCD_CS  P0_17
-          #define DOGLCD_A0  P1_00
+          #define DOGLCD_CS                P0_17
+          #define DOGLCD_A0                P1_00
         #endif
 
         #if ENABLED(ULTIPANEL)
-          #define LCD_PINS_D5 P0_17
-          #define LCD_PINS_D6 P1_00
-          #define LCD_PINS_D7 P1_22
+          #define LCD_PINS_D5              P0_17
+          #define LCD_PINS_D6              P1_00
+          #define LCD_PINS_D7              P1_22
         #endif
 
       #endif // !FYSETC_MINI_12864
@@ -330,20 +330,20 @@
 #endif // HAS_SPI_LCD
 
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
-  #define SD_DETECT_PIN    P0_27
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
+  #define SD_DETECT_PIN                    P0_27
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
   #if SD_CONNECTION_IS(ONBOARD)
-    #define SS_PIN         ONBOARD_SD_CS_PIN
+    #define SS_PIN             ONBOARD_SD_CS_PIN
   #else
-    #define SS_PIN         P0_28
+    #define SS_PIN                         P0_28
   #endif
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
@@ -352,6 +352,6 @@
 //
 // Other Pins
 //
-//#define PIN_P0_02          P0_02   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PIN_P0_03          P0_03   // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-//#define PS_ON_PIN          P1_23   // SERVO P1.23
+//#define PIN_P0_02                        P0_02  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PIN_P0_03                        P0_03  // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PS_ON_PIN                        P1_23  // SERVO P1.23

Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h

@@ -51,58 +51,58 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_20   // (11)
-#define SERVO1_PIN         P1_21   // ( 6) also on J5-1
-#define SERVO2_PIN         P1_19   // ( 5)
-#define SERVO3_PIN         P1_18   // ( 4) 5V output
+#define SERVO0_PIN                         P1_20  // (11)
+#define SERVO1_PIN                         P1_21  // ( 6) also on J5-1
+#define SERVO2_PIN                         P1_19  // ( 5)
+#define SERVO3_PIN                         P1_18  // ( 4) 5V output
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // ( 3) 10k pullup to 3.3V, 1K series
-#define X_MAX_PIN          P1_25   // ( 2) 10k pullup to 3.3V, 1K series
-#define Y_MIN_PIN          P1_26   // (14) 10k pullup to 3.3V, 1K series
-#define Y_MAX_PIN          P1_27   // (15) 10k pullup to 3.3V, 1K series
-#define Z_MIN_PIN          P1_29   // (18) 10k pullup to 3.3V, 1K series
-#define Z_MAX_PIN          P1_28   // (19) 10k pullup to 3.3V, 1K series
-#define ONBOARD_ENDSTOPPULLUPS     // Board has built-in pullups
+#define X_MIN_PIN                          P1_24  // ( 3) 10k pullup to 3.3V, 1K series
+#define X_MAX_PIN                          P1_25  // ( 2) 10k pullup to 3.3V, 1K series
+#define Y_MIN_PIN                          P1_26  // (14) 10k pullup to 3.3V, 1K series
+#define Y_MAX_PIN                          P1_27  // (15) 10k pullup to 3.3V, 1K series
+#define Z_MIN_PIN                          P1_29  // (18) 10k pullup to 3.3V, 1K series
+#define Z_MAX_PIN                          P1_28  // (19) 10k pullup to 3.3V, 1K series
+#define ONBOARD_ENDSTOPPULLUPS                    // Board has built-in pullups
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01   // (54)
-#define X_DIR_PIN          P0_11   // (55)
-#define X_ENABLE_PIN       P0_10   // (38)
+#define X_STEP_PIN                         P2_01  // (54)
+#define X_DIR_PIN                          P0_11  // (55)
+#define X_ENABLE_PIN                       P0_10  // (38)
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P1_01   // ETH
+  #define X_CS_PIN                         P1_01  // ETH
 #endif
 
-#define Y_STEP_PIN         P2_02   // (60)
-#define Y_DIR_PIN          P0_20   // (61)
-#define Y_ENABLE_PIN       P0_19   // (56)
+#define Y_STEP_PIN                         P2_02  // (60)
+#define Y_DIR_PIN                          P0_20  // (61)
+#define Y_ENABLE_PIN                       P0_19  // (56)
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P1_04   // ETH
+  #define Y_CS_PIN                         P1_04  // ETH
 #endif
 
-#define Z_STEP_PIN         P2_03   // (46)
-#define Z_DIR_PIN          P0_22   // (48)
-#define Z_ENABLE_PIN       P0_21   // (62)
+#define Z_STEP_PIN                         P2_03  // (46)
+#define Z_DIR_PIN                          P0_22  // (48)
+#define Z_ENABLE_PIN                       P0_21  // (62)
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P1_10   // ETH
+  #define Z_CS_PIN                         P1_10  // ETH
 #endif
 
-#define E0_STEP_PIN        P2_00   // (26)
-#define E0_DIR_PIN         P0_05   // (28)
-#define E0_ENABLE_PIN      P0_04   // (24)
+#define E0_STEP_PIN                        P2_00  // (26)
+#define E0_DIR_PIN                         P0_05  // (28)
+#define E0_ENABLE_PIN                      P0_04  // (24)
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P1_14   // ETH
+  #define E0_CS_PIN                        P1_14  // ETH
 #endif
 
-#define E1_STEP_PIN        P2_08   // (36)
-#define E1_DIR_PIN         P2_13   // (34)
-#define E1_ENABLE_PIN      P4_29   // (30)
+#define E1_STEP_PIN                        P2_08  // (36)
+#define E1_DIR_PIN                         P2_13  // (34)
+#define E1_ENABLE_PIN                      P4_29  // (30)
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        -1
+  #define E1_CS_PIN                        -1
 #endif
 
 //
@@ -110,17 +110,17 @@
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_00   // ETH
+    #define TMC_SW_MOSI                    P1_00  // ETH
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_08   // ETH
+    #define TMC_SW_MISO                    P1_08  // ETH
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_09   // ETH
+    #define TMC_SW_SCK                     P1_09  // ETH
   #endif
 #endif
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -136,31 +136,31 @@
   // P2_13 E1-Dir
 
   #ifndef X_SERIAL_TX_PIN
-    #define X_SERIAL_TX_PIN  P0_01
+    #define X_SERIAL_TX_PIN                P0_01
   #endif
   #ifndef X_SERIAL_RX_PIN
-    #define X_SERIAL_RX_PIN  P0_01
+    #define X_SERIAL_RX_PIN                P0_01
   #endif
 
   #ifndef Y_SERIAL_TX_PIN
-    #define Y_SERIAL_TX_PIN  P0_00
+    #define Y_SERIAL_TX_PIN                P0_00
   #endif
   #ifndef Y_SERIAL_RX_PIN
-    #define Y_SERIAL_RX_PIN  P0_00
+    #define Y_SERIAL_RX_PIN                P0_00
   #endif
 
   #ifndef Z_SERIAL_TX_PIN
-    #define Z_SERIAL_TX_PIN  P2_13
+    #define Z_SERIAL_TX_PIN                P2_13
   #endif
   #ifndef Z_SERIAL_RX_PIN
-    #define Z_SERIAL_RX_PIN  P2_13
+    #define Z_SERIAL_RX_PIN                P2_13
   #endif
 
   #ifndef E0_SERIAL_TX_PIN
-    #define E0_SERIAL_TX_PIN P2_08
+    #define E0_SERIAL_TX_PIN               P2_08
   #endif
   #ifndef E0_SERIAL_RX_PIN
-    #define E0_SERIAL_RX_PIN P2_08
+    #define E0_SERIAL_RX_PIN               P2_08
   #endif
 
   // Reduce baud rate to improve software serial reliability
@@ -171,14 +171,14 @@
 // Temperature Sensors
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // A0 (T0) - (67) - TEMP_0_PIN
-#define TEMP_BED_PIN        P0_24_A1   // A1 (T1) - (68) - TEMP_BED_PIN
-#define TEMP_1_PIN          P0_25_A2   // A2 (T2) - (69) - TEMP_1_PIN
-#define TEMP_2_PIN          P0_26_A3   // A3 - (63) - J5-3 & AUX-2
-#define TEMP_3_PIN          P1_30_A4   // A4 - (37) - BUZZER_PIN
-//#define TEMP_4_PIN          P1_31_A5   // A5 - (49) - SD_DETECT_PIN
+#define TEMP_0_PIN                      P0_23_A0  // A0 (T0) - (67) - TEMP_0_PIN
+#define TEMP_BED_PIN                    P0_24_A1  // A1 (T1) - (68) - TEMP_BED_PIN
+#define TEMP_1_PIN                      P0_25_A2  // A2 (T2) - (69) - TEMP_1_PIN
+#define TEMP_2_PIN                      P0_26_A3  // A3 - (63) - J5-3 & AUX-2
+#define TEMP_3_PIN                      P1_30_A4  // A4 - (37) - BUZZER_PIN
+//#define TEMP_4_PIN                    P1_31_A5  // A5 - (49) - SD_DETECT_PIN
 //#define ??                  P0_03_A6   // A6 - ( 0)  - RXD0 - J4-4 & AUX-1
-#define FILWIDTH_PIN        P0_02_A7   // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
+#define FILWIDTH_PIN                    P0_02_A7  // A7 - ( 1)  - TXD0 - J4-5 & AUX-1
 
 //
 // Augmentation for auto-assigning RAMPS plugs
@@ -201,69 +201,69 @@
 // Heaters / Fans
 //
 #ifndef MOSFET_D_PIN
-  #define MOSFET_D_PIN     -1
+  #define MOSFET_D_PIN                     -1
 #endif
 #ifndef RAMPS_D8_PIN
-  #define RAMPS_D8_PIN     P2_07   // (8)
+  #define RAMPS_D8_PIN                     P2_07  // (8)
 #endif
 #ifndef RAMPS_D9_PIN
-  #define RAMPS_D9_PIN     P2_04   // (9)
+  #define RAMPS_D9_PIN                     P2_04  // (9)
 #endif
 #ifndef RAMPS_D10_PIN
-  #define RAMPS_D10_PIN    P2_05   // (10)
+  #define RAMPS_D10_PIN                    P2_05  // (10)
 #endif
 
-#define HEATER_0_PIN       RAMPS_D10_PIN
-
-#if ENABLED(IS_RAMPS_EFB)                      // Hotend, Fan, Bed
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EEF)                    // Hotend, Hotend, Fan
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-#elif ENABLED(IS_RAMPS_EEB)                    // Hotend, Hotend, Bed
-  #define HEATER_1_PIN     RAMPS_D9_PIN
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
-#elif ENABLED(IS_RAMPS_EFF)                    // Hotend, Fan, Fan
-  #define FAN1_PIN         RAMPS_D8_PIN
-#elif DISABLED(IS_RAMPS_SF)                    // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
-  #define HEATER_BED_PIN   RAMPS_D8_PIN
+#define HEATER_0_PIN               RAMPS_D10_PIN
+
+#if ENABLED(IS_RAMPS_EFB)                         // Hotend, Fan, Bed
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EEF)                       // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+#elif ENABLED(IS_RAMPS_EEB)                       // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              RAMPS_D9_PIN
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
+#elif ENABLED(IS_RAMPS_EFF)                       // Hotend, Fan, Fan
+  #define FAN1_PIN                  RAMPS_D8_PIN
+#elif DISABLED(IS_RAMPS_SF)                       // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
+  #define HEATER_BED_PIN            RAMPS_D8_PIN
   #if HOTENDS == 1
-    #define FAN1_PIN       MOSFET_D_PIN
+    #define FAN1_PIN                MOSFET_D_PIN
   #else
-    #define HEATER_1_PIN   MOSFET_D_PIN
+    #define HEATER_1_PIN            MOSFET_D_PIN
   #endif
 #endif
 
 #ifndef FAN_PIN
   #if EITHER(IS_RAMPS_EFB, IS_RAMPS_EFF)          // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D9_PIN
   #elif EITHER(IS_RAMPS_EEF, IS_RAMPS_SF)         // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN        RAMPS_D8_PIN
-  #elif ENABLED(IS_RAMPS_EEB)                  // Hotend, Hotend, Bed
-    #define FAN_PIN        P1_18               // (4) IO pin. Buffer needed
-  #else                                        // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
-    #define FAN_PIN        RAMPS_D9_PIN
+    #define FAN_PIN                 RAMPS_D8_PIN
+  #elif ENABLED(IS_RAMPS_EEB)                     // Hotend, Hotend, Bed
+    #define FAN_PIN                        P1_18  // (4) IO pin. Buffer needed
+  #else                                           // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
+    #define FAN_PIN                 RAMPS_D9_PIN
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // (13)
+#define LED_PIN                            P4_28  // (13)
 
 // define digital pin 5 for the filament runout sensor. Use the RAMPS 1.4 digital input 5 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_19   // (5)
+  #define FIL_RUNOUT_PIN                   P1_19  // (5)
 #endif
 
-#define PS_ON_PIN          P2_12   // (12)
+#define PS_ON_PIN                          P2_12  // (12)
 
 #if !defined(MAX6675_SS_PIN) && DISABLED(USE_ZMAX_PLUG)
-  #define MAX6675_SS_PIN   P1_28
+  #define MAX6675_SS_PIN                   P1_28
 #endif
 
 #if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENA_PIN)
-  #if !defined(NUM_SERVOS) || NUM_SERVOS < 4   // Try to use servo connector
-    #define CASE_LIGHT_PIN P1_18   // (4) MUST BE HARDWARE PWM
+  #if !defined(NUM_SERVOS) || NUM_SERVOS < 4      // Try to use servo connector
+    #define CASE_LIGHT_PIN                 P1_18  // (4) MUST BE HARDWARE PWM
   #endif
 #endif
 
@@ -279,19 +279,19 @@
       #error "LASER_FEATURE requires 3 free servo pins."
     #endif
   #endif
-  #define SPINDLE_LASER_ENA_PIN SERVO1_PIN   // (6) Pin should have a pullup/pulldown!
-  #define SPINDLE_LASER_PWM_PIN SERVO3_PIN   // (4) MUST BE HARDWARE PWM
-  #define SPINDLE_DIR_PIN       SERVO2_PIN   // (5)
+  #define SPINDLE_LASER_ENA_PIN       SERVO1_PIN  // (6) Pin should have a pullup/pulldown!
+  #define SPINDLE_LASER_PWM_PIN       SERVO3_PIN  // (4) MUST BE HARDWARE PWM
+  #define SPINDLE_DIR_PIN             SERVO2_PIN  // (5)
 #endif
 
 //
 // Průša i3 MK2 Multiplexer Support
 //
 #if SERIAL_PORT != 0 && SERIAL_PORT_2 != 0
-  #define E_MUX0_PIN       P0_03   // ( 0) Z_CS_PIN
-  #define E_MUX1_PIN       P0_02   // ( 1) E0_CS_PIN
+  #define E_MUX0_PIN                       P0_03  // ( 0) Z_CS_PIN
+  #define E_MUX1_PIN                       P0_02  // ( 1) E0_CS_PIN
 #endif
-#define E_MUX2_PIN         P0_26   // (63) E1_CS_PIN
+#define E_MUX2_PIN                         P0_26  // (63) E1_CS_PIN
 
 /**
  * LCD / Controller
@@ -322,101 +322,101 @@
   // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
   // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
 
-  #define BEEPER_PIN       P2_11   // J3-3 & AUX-4
+  #define BEEPER_PIN                       P2_11  // J3-3 & AUX-4
 
-  #define BTN_EN1          P0_16   // J3-7 & AUX-4
-  #define BTN_EN2          P1_23   // J3-5 & AUX-4
-  #define BTN_ENC          P3_25   // J3-4 & AUX-4
+  #define BTN_EN1                          P0_16  // J3-7 & AUX-4
+  #define BTN_EN2                          P1_23  // J3-5 & AUX-4
+  #define BTN_ENC                          P3_25  // J3-4 & AUX-4
 
-  #define LCD_PINS_RS      P0_15   // J3-9 & AUX-4 (CS)
-  #define LCD_PINS_ENABLE  P0_18   // J3-10 & AUX-3 (SID, MOSI)
-  #define LCD_PINS_D4      P2_06   // J3-8 & AUX-3 (SCK, CLK)
+  #define LCD_PINS_RS                      P0_15  // J3-9 & AUX-4 (CS)
+  #define LCD_PINS_ENABLE                  P0_18  // J3-10 & AUX-3 (SID, MOSI)
+  #define LCD_PINS_D4                      P2_06  // J3-8 & AUX-3 (SCK, CLK)
 
 #elif HAS_SPI_LCD
 
-  //#define SCK_PIN          P0_15   // (52)  system defined J3-9 & AUX-3
-  //#define MISO_PIN         P0_17   // (50)  system defined J3-10 & AUX-3
-  //#define MOSI_PIN         P0_18   // (51)  system defined J3-10 & AUX-3
-  //#define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS)
+  //#define SCK_PIN                        P0_15  // (52)  system defined J3-9 & AUX-3
+  //#define MISO_PIN                       P0_17  // (50)  system defined J3-10 & AUX-3
+  //#define MOSI_PIN                       P0_18  // (51)  system defined J3-10 & AUX-3
+  //#define SS_PIN                         P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS)
 
   #if ENABLED(FYSETC_MINI_12864)
-    #define BEEPER_PIN     P1_01
-    #define BTN_ENC        P1_04
+    #define BEEPER_PIN                     P1_01
+    #define BTN_ENC                        P1_04
   #else
-    #define BEEPER_PIN     P1_30   // (37) not 5V tolerant
-    #define BTN_ENC        P2_11   // (35) J3-3 & AUX-4
+    #define BEEPER_PIN                     P1_30  // (37) not 5V tolerant
+    #define BTN_ENC                        P2_11  // (35) J3-3 & AUX-4
   #endif
 
-  #define BTN_EN1          P3_26   // (31) J3-2 & AUX-4
-  #define BTN_EN2          P3_25   // (33) J3-4 & AUX-4
+  #define BTN_EN1                          P3_26  // (31) J3-2 & AUX-4
+  #define BTN_EN2                          P3_25  // (33) J3-4 & AUX-4
 
-  #define SD_DETECT_PIN    P1_31   // (49) J3-1 & AUX-3 (NOT 5V tolerant)
-  #define KILL_PIN         P1_22   // (41) J5-4 & AUX-4
-  #define LCD_PINS_RS      P0_16   // (16) J3-7 & AUX-4
-  #define LCD_SDSS         P0_16   // (16) J3-7 & AUX-4
+  #define SD_DETECT_PIN                    P1_31  // (49) J3-1 & AUX-3 (NOT 5V tolerant)
+  #define KILL_PIN                         P1_22  // (41) J5-4 & AUX-4
+  #define LCD_PINS_RS                      P0_16  // (16) J3-7 & AUX-4
+  #define LCD_SDSS                         P0_16  // (16) J3-7 & AUX-4
 
   #if ENABLED(NEWPANEL)
     #if ENABLED(REPRAPWORLD_KEYPAD)
-      #define SHIFT_OUT    P0_18   // (51) (MOSI) J3-10 & AUX-3
-      #define SHIFT_CLK    P0_15   // (52) (SCK)  J3-9 & AUX-3
-      #define SHIFT_LD     P1_31   // (49)        J3-1 & AUX-3 (NOT 5V tolerant)
+      #define SHIFT_OUT                    P0_18  // (51) (MOSI) J3-10 & AUX-3
+      #define SHIFT_CLK                    P0_15  // (52) (SCK)  J3-9 & AUX-3
+      #define SHIFT_LD                     P1_31  // (49)        J3-1 & AUX-3 (NOT 5V tolerant)
     #endif
   #else
-    //#define SHIFT_CLK      P3_26   // (31)  J3-2 & AUX-4
-    //#define SHIFT_LD       P3_25   // (33)  J3-4 & AUX-4
-    //#define SHIFT_OUT      P2_11   // (35)  J3-3 & AUX-4
-    //#define SHIFT_EN       P1_22   // (41)  J5-4 & AUX-4
+    //#define SHIFT_CLK                    P3_26  // (31)  J3-2 & AUX-4
+    //#define SHIFT_LD                     P3_25  // (33)  J3-4 & AUX-4
+    //#define SHIFT_OUT                    P2_11  // (35)  J3-3 & AUX-4
+    //#define SHIFT_EN                     P1_22  // (41)  J5-4 & AUX-4
   #endif
 
   #if ANY(VIKI2, miniVIKI)
     // #define LCD_SCREEN_ROT_180
 
-    #define DOGLCD_CS      P0_16   // (16)
-    #define DOGLCD_A0      P2_06   // (59) J3-8 & AUX-2
-    #define DOGLCD_SCK     SCK_PIN
-    #define DOGLCD_MOSI    MOSI_PIN
+    #define DOGLCD_CS                      P0_16  // (16)
+    #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
+    #define DOGLCD_SCK                   SCK_PIN
+    #define DOGLCD_MOSI                 MOSI_PIN
 
-    #define STAT_LED_BLUE_PIN P0_26 //(63)  may change if cable changes
-    #define STAT_LED_RED_PIN P1_21 // ( 6)  may change if cable changes
+    #define STAT_LED_BLUE_PIN              P0_26  //(63)  may change if cable changes
+    #define STAT_LED_RED_PIN               P1_21  // ( 6)  may change if cable changes
   #else
 
     #if ENABLED(FYSETC_MINI_12864)
-      #define DOGLCD_SCK   P0_15
-      #define DOGLCD_MOSI  P0_18
+      #define DOGLCD_SCK                   P0_15
+      #define DOGLCD_MOSI                  P0_18
 
       // EXP1 on LCD adapter is not usable - using Ethernet connector instead
-      #define DOGLCD_CS    P1_09
-      #define DOGLCD_A0    P1_14
-      //#define FORCE_SOFT_SPI    // Use this if default of hardware SPI causes display problems
-                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
+      #define DOGLCD_CS                    P1_09
+      #define DOGLCD_A0                    P1_14
+      //#define FORCE_SOFT_SPI                    // Use this if default of hardware SPI causes display problems
+                                                  //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 
-      #define LCD_RESET_PIN P0_16   // Must be high or open for LCD to operate normally.
+      #define LCD_RESET_PIN                P0_16  // Must be high or open for LCD to operate normally.
 
       #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
         #ifndef RGB_LED_R_PIN
-          #define RGB_LED_R_PIN P1_00
+          #define RGB_LED_R_PIN            P1_00
         #endif
         #ifndef RGB_LED_G_PIN
-          #define RGB_LED_G_PIN P1_01
+          #define RGB_LED_G_PIN            P1_01
         #endif
         #ifndef RGB_LED_B_PIN
-          #define RGB_LED_B_PIN P1_08
+          #define RGB_LED_B_PIN            P1_08
         #endif
       #elif ENABLED(FYSETC_MINI_12864_2_1)
-        #define NEOPIXEL_PIN P1_00
+        #define NEOPIXEL_PIN               P1_00
       #endif
     #else
-      #define DOGLCD_CS    P0_26   // (63) J5-3 & AUX-2
-      #define DOGLCD_A0    P2_06   // (59) J3-8 & AUX-2
+      #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
+      #define DOGLCD_A0                    P2_06  // (59) J3-8 & AUX-2
     #endif
 
-    #define LCD_BACKLIGHT_PIN P0_16 //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
-    #define LCD_PINS_ENABLE P0_18  // (51) (MOSI) J3-10 & AUX-3
-    #define LCD_PINS_D4    P0_15   // (52) (SCK)  J3-9 & AUX-3
+    #define LCD_BACKLIGHT_PIN              P0_16  //(16) J3-7 & AUX-4 - only used on DOGLCD controllers
+    #define LCD_PINS_ENABLE                P0_18  // (51) (MOSI) J3-10 & AUX-3
+    #define LCD_PINS_D4                    P0_15  // (52) (SCK)  J3-9 & AUX-3
     #if ENABLED(ULTIPANEL)
-      #define LCD_PINS_D5  P1_17   // (71) ENET_MDIO
-      #define LCD_PINS_D6  P1_14   // (73) ENET_RX_ER
-      #define LCD_PINS_D7  P1_10   // (75) ENET_RXD1
+      #define LCD_PINS_D5                  P1_17  // (71) ENET_MDIO
+      #define LCD_PINS_D6                  P1_14  // (73) ENET_RX_ER
+      #define LCD_PINS_D7                  P1_10  // (75) ENET_RXD1
     #endif
   #endif
 
@@ -434,38 +434,38 @@
 // Ethernet pins
 //
 #if DISABLED(ULTIPANEL)
-  #define ENET_MDIO        P1_17   // (71)  J12-4
-  #define ENET_RX_ER       P1_14   // (73)  J12-6
-  #define ENET_RXD1        P1_10   // (75)  J12-8
+  #define ENET_MDIO                        P1_17  // (71)  J12-4
+  #define ENET_RX_ER                       P1_14  // (73)  J12-6
+  #define ENET_RXD1                        P1_10  // (75)  J12-8
 #endif
-#define ENET_MOC           P1_16   // (70)  J12-3
-#define REF_CLK            P1_15   // (72)  J12-5
-#define ENET_RXD0          P1_09   // (74)  J12-7
-#define ENET_CRS           P1_08   // (76)  J12-9
-#define ENET_TX_EN         P1_04   // (77)  J12-10
-#define ENET_TXD0          P1_00   // (78)  J12-11
-#define ENET_TXD1          P1_01   // (79)  J12-12
+#define ENET_MOC                           P1_16  // (70)  J12-3
+#define REF_CLK                            P1_15  // (72)  J12-5
+#define ENET_RXD0                          P1_09  // (74)  J12-7
+#define ENET_CRS                           P1_08  // (76)  J12-9
+#define ENET_TX_EN                         P1_04  // (77)  J12-10
+#define ENET_TXD0                          P1_00  // (78)  J12-11
+#define ENET_TXD1                          P1_01  // (79)  J12-12
 
 //
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15   // (52)  system defined J3-9 & AUX-3
-  #define MISO_PIN         P0_17   // (50)  system defined J3-10 & AUX-3
-  #define MOSI_PIN         P0_18   // (51)  system defined J3-10 & AUX-3
-  #define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
+  #define SCK_PIN                          P0_15  // (52)  system defined J3-9 & AUX-3
+  #define MISO_PIN                         P0_17  // (50)  system defined J3-10 & AUX-3
+  #define MOSI_PIN                         P0_18  // (51)  system defined J3-10 & AUX-3
+  #define SS_PIN                           P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif

Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h

@@ -41,80 +41,79 @@
 //
 // Servos
 //
-#define SERVO0_PIN        P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_28
-#define X_MAX_PIN          P1_25
-#define Y_MIN_PIN          P2_11
-#define Y_MAX_PIN          -1
-#define Z_MIN_PIN          P1_27
-#define Z_MAX_PIN          -1
-#define Z_PROBE            P1_22
+#define X_MIN_PIN                          P1_28
+#define X_MAX_PIN                          P1_25
+#define Y_MIN_PIN                          P2_11
+#define Y_MAX_PIN                          -1
+#define Z_MIN_PIN                          P1_27
+#define Z_MAX_PIN                          -1
+#define Z_PROBE                            P1_22
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 
-#define HEATER_BED_PIN     P2_05
-#define HEATER_BED2_PIN    P2_04
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P2_06
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_BED2_PIN                    P2_04
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P2_06
 #ifndef FAN_PIN
-  #define FAN_PIN          P1_24
+  #define FAN_PIN                          P1_24
 #endif
-#define FAN1_PIN           P1_26
+#define FAN1_PIN                           P1_26
 
 //
 // Display
 //
 
 #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
-    #define LCD_PINS_RS         P0_16
-    #define LCD_PINS_ENABLE     P0_18
-    #define LCD_PINS_D4         P0_15
-    #define LCD_PINS_D5         P1_00
-    #define LCD_PINS_D6         P1_01
-    #define LCD_PINS_D7         P1_04
-    #define BEEPER_PIN          P1_31
-
-    #define BTN_EN1             P3_25
-    #define BTN_EN2             P3_26
-    #define BTN_ENC             P1_30
-
-    #define SD_DETECT_PIN       -1
+    #define LCD_PINS_RS                    P0_16
+    #define LCD_PINS_ENABLE                P0_18
+    #define LCD_PINS_D4                    P0_15
+    #define LCD_PINS_D5                    P1_00
+    #define LCD_PINS_D6                    P1_01
+    #define LCD_PINS_D7                    P1_04
+    #define BEEPER_PIN                     P1_31
+
+    #define BTN_EN1                        P3_25
+    #define BTN_EN2                        P3_26
+    #define BTN_ENC                        P1_30
+
+    #define SD_DETECT_PIN                  -1
 #endif // REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER

Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h

@@ -41,93 +41,92 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define X_MAX_PIN          P1_27
-#define Y_MIN_PIN          P1_25
-#define Y_MAX_PIN          P1_28
-#define Z_MIN_PIN          P1_26
-#define Z_MAX_PIN          P1_29
+#define X_MIN_PIN                          P1_24
+#define X_MAX_PIN                          P1_27
+#define Y_MIN_PIN                          P1_25
+#define Y_MAX_PIN                          P1_28
+#define Z_MIN_PIN                          P1_26
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01
-#define X_DIR_PIN          P0_11
-#define X_ENABLE_PIN       P0_10
+#define X_STEP_PIN                         P2_01
+#define X_DIR_PIN                          P0_11
+#define X_ENABLE_PIN                       P0_10
 #ifndef X_CS_PIN
-  #define X_CS_PIN         P0_10 // BSD2660 default
+  #define X_CS_PIN                         P0_10  // BSD2660 default
 #endif
 
-#define Y_STEP_PIN         P2_02
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_02
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P0_19
 #ifndef Y_CS_PIN
-  #define Y_CS_PIN         P0_19 // BSD2660 default
+  #define Y_CS_PIN                         P0_19  // BSD2660 default
 #endif
 
-#define Z_STEP_PIN         P2_03
-#define Z_DIR_PIN          P0_22
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P2_03
+#define Z_DIR_PIN                          P0_22
+#define Z_ENABLE_PIN                       P0_21
 #ifndef Z_CS_PIN
-  #define Z_CS_PIN         P0_21 // BSD2660 default
+  #define Z_CS_PIN                         P0_21  // BSD2660 default
 #endif
 
-#define E0_STEP_PIN        P2_00
-#define E0_DIR_PIN         P0_05
-#define E0_ENABLE_PIN      P0_04
+#define E0_STEP_PIN                        P2_00
+#define E0_DIR_PIN                         P0_05
+#define E0_ENABLE_PIN                      P0_04
 #ifndef E0_CS_PIN
-  #define E0_CS_PIN        P0_04 // BSD2660 default
+  #define E0_CS_PIN                        P0_04  // BSD2660 default
 #endif
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 #ifndef E1_CS_PIN
-  #define E1_CS_PIN        P4_29 // BSD2660 default
+  #define E1_CS_PIN                        P4_29  // BSD2660 default
 #endif
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
-#define TEMP_1_PIN          P0_25_A2   // A2 (TH3)
-
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
+#define TEMP_1_PIN                      P0_25_A2  // A2 (TH3)
 
 //
 // Heaters / Fans
 //
 
-#define HEATER_BED_PIN     P2_07
-#define HEATER_0_PIN       P2_04
-#define HEATER_1_PIN       P2_05
+#define HEATER_BED_PIN                     P2_07
+#define HEATER_0_PIN                       P2_04
+#define HEATER_1_PIN                       P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P0_26
+  #define FAN_PIN                          P0_26
 #endif
-#define FAN1_PIN           P1_22
+#define FAN1_PIN                           P1_22
 
 //
 // Display
 //
 
 #if ANY(VIKI2, miniVIKI)
-  #define BEEPER_PIN       P1_31
-  #define DOGLCD_A0        P2_06
-  #define DOGLCD_CS        P0_16
+  #define BEEPER_PIN                       P1_31
+  #define DOGLCD_A0                        P2_06
+  #define DOGLCD_CS                        P0_16
 
-  #define BTN_EN1          P3_25
-  #define BTN_EN2          P3_26
-  #define BTN_ENC          P2_11
+  #define BTN_EN1                          P3_25
+  #define BTN_EN2                          P3_26
+  #define BTN_ENC                          P2_11
 
-  #define SD_DETECT_PIN    P1_18
-  #define SDSS             P1_21
+  #define SD_DETECT_PIN                    P1_18
+  #define SDSS                             P1_21
 
-  #define STAT_LED_RED_PIN P1_19
-  #define STAT_LED_BLUE_PIN P1_20
+  #define STAT_LED_RED_PIN                 P1_19
+  #define STAT_LED_BLUE_PIN                P1_20
 #endif

Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h

@@ -37,74 +37,74 @@
 //
 // LED
 //
-#define LED_PIN            P1_18
+#define LED_PIN                            P1_18
 
 //
 // Servos
 //
-#define SERVO0_PIN         P1_29
+#define SERVO0_PIN                         P1_29
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         P1_24
-#define Y_STOP_PIN         P1_26
-#define Z_STOP_PIN         P1_28
+#define X_STOP_PIN                         P1_24
+#define Y_STOP_PIN                         P1_26
+#define Z_STOP_PIN                         P1_28
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P2_04
+  #define FIL_RUNOUT_PIN                   P2_04
 #endif
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN         P0_25_A2   // Analog Input (P0_25)
+  #define FILWIDTH_PIN                  P0_25_A2  // Analog Input (P0_25)
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_01
-#define X_DIR_PIN          P0_11
-#define X_ENABLE_PIN       P0_10
+#define X_STEP_PIN                         P2_01
+#define X_DIR_PIN                          P0_11
+#define X_ENABLE_PIN                       P0_10
 
-#define Y_STEP_PIN         P2_02
-#define Y_DIR_PIN          P0_20
-#define Y_ENABLE_PIN       P0_19
+#define Y_STEP_PIN                         P2_02
+#define Y_DIR_PIN                          P0_20
+#define Y_ENABLE_PIN                       P0_19
 
-#define Z_STEP_PIN         P2_03
-#define Z_DIR_PIN          P0_22
-#define Z_ENABLE_PIN       P0_21
+#define Z_STEP_PIN                         P2_03
+#define Z_DIR_PIN                          P0_22
+#define Z_ENABLE_PIN                       P0_21
 
-#define E0_STEP_PIN        P2_00
-#define E0_DIR_PIN         P0_05
-#define E0_ENABLE_PIN      P0_04
+#define E0_STEP_PIN                        P2_00
+#define E0_DIR_PIN                         P0_05
+#define E0_ENABLE_PIN                      P0_04
 
 //
 // DIGIPOT slave addresses
 //
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2C   // unshifted slave address for first DIGIPOT
+  #define DIGIPOT_I2C_ADDRESS_A 0x2C              // unshifted slave address for first DIGIPOT
 #endif
 
 #ifndef DIGIPOT_I2C_ADDRESS_B
-  #define DIGIPOT_I2C_ADDRESS_B 0x2E   // unshifted slave address for second DIGIPOT
+  #define DIGIPOT_I2C_ADDRESS_B 0x2E              // unshifted slave address for second DIGIPOT
 #endif
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_BED_PIN        P0_23_A0   // A0 (TH1)
-#define TEMP_0_PIN          P0_24_A1   // A1 (TH2)
+#define TEMP_BED_PIN                    P0_23_A0  // A0 (TH1)
+#define TEMP_0_PIN                      P0_24_A1  // A1 (TH2)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_07
-#define HEATER_0_PIN       P2_05
+#define HEATER_BED_PIN                     P2_07
+#define HEATER_0_PIN                       P2_05
 #ifndef FAN_PIN
-  #define FAN_PIN          P0_26
+  #define FAN_PIN                          P0_26
 #endif
-#define FAN1_PIN           P1_25
+#define FAN1_PIN                           P1_25
 
 //
 // Display
@@ -118,61 +118,61 @@
     // 10-pin IDC connector trimmed or replaced with a 12-pin IDC connector to fit J3.
     // Requires REVERSE_ENCODER_DIRECTION in Configuration.h
 
-    #define BEEPER_PIN     P2_11   // J3-3 & AUX-4
+    #define BEEPER_PIN                     P2_11  // J3-3 & AUX-4
 
-    #define BTN_EN1        P0_16   // J3-7 & AUX-4
-    #define BTN_EN2        P1_23   // J3-5 & AUX-4
-    #define BTN_ENC        P3_25   // J3-4 & AUX-4
+    #define BTN_EN1                        P0_16  // J3-7 & AUX-4
+    #define BTN_EN2                        P1_23  // J3-5 & AUX-4
+    #define BTN_ENC                        P3_25  // J3-4 & AUX-4
 
-    #define LCD_PINS_RS    P0_15   // J3-9 & AUX-4 (CS)
-    #define LCD_PINS_ENABLE P0_18  // J3-10 & AUX-3 (SID, MOSI)
-    #define LCD_PINS_D4    P2_06   // J3-8 & AUX-3 (SCK, CLK)
+    #define LCD_PINS_RS                    P0_15  // J3-9 & AUX-4 (CS)
+    #define LCD_PINS_ENABLE                P0_18  // J3-10 & AUX-3 (SID, MOSI)
+    #define LCD_PINS_D4                    P2_06  // J3-8 & AUX-3 (SCK, CLK)
 
   #else
 
-    #define BTN_EN1        P3_26   // (31) J3-2 & AUX-4
-    #define BTN_EN2        P3_25   // (33) J3-4 & AUX-4
-    #define BTN_ENC        P2_11   // (35) J3-3 & AUX-4
+    #define BTN_EN1                        P3_26  // (31) J3-2 & AUX-4
+    #define BTN_EN2                        P3_25  // (33) J3-4 & AUX-4
+    #define BTN_ENC                        P2_11  // (35) J3-3 & AUX-4
 
-    #define SD_DETECT_PIN  P1_31   // (49) not 5V tolerant   J3-1 & AUX-3
-    #define KILL_PIN       P1_22   // (41) J5-4 & AUX-4
-    #define LCD_PINS_RS    P0_16   // (16) J3-7 & AUX-4
-    #define LCD_SDSS       P0_16   // (16) J3-7 & AUX-4
-    #define LCD_BACKLIGHT_PIN P0_16 // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
-    #define LCD_PINS_ENABLE P0_18  // (51) (MOSI) J3-10 & AUX-3
-    #define LCD_PINS_D4    P0_15   // (52) (SCK)  J3-9 & AUX-3
+    #define SD_DETECT_PIN                  P1_31  // (49) not 5V tolerant   J3-1 & AUX-3
+    #define KILL_PIN                       P1_22  // (41) J5-4 & AUX-4
+    #define LCD_PINS_RS                    P0_16  // (16) J3-7 & AUX-4
+    #define LCD_SDSS                       P0_16  // (16) J3-7 & AUX-4
+    #define LCD_BACKLIGHT_PIN              P0_16  // (16) J3-7 & AUX-4 - only used on DOGLCD controllers
+    #define LCD_PINS_ENABLE                P0_18  // (51) (MOSI) J3-10 & AUX-3
+    #define LCD_PINS_D4                    P0_15  // (52) (SCK)  J3-9 & AUX-3
 
-    #define DOGLCD_A0      P2_06   // (59) J3-8 & AUX-2
+    #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
 
     #if ENABLED(REPRAPWORLD_KEYPAD)
-      #define SHIFT_OUT    P0_18   // (51)  (MOSI) J3-10 & AUX-3
-      #define SHIFT_CLK    P0_15   // (52)  (SCK)  J3-9 & AUX-3
-      #define SHIFT_LD     P1_31   // (49)  not 5V tolerant   J3-1 & AUX-3
+      #define SHIFT_OUT                    P0_18  // (51)  (MOSI) J3-10 & AUX-3
+      #define SHIFT_CLK                    P0_15  // (52)  (SCK)  J3-9 & AUX-3
+      #define SHIFT_LD                     P1_31  // (49)  not 5V tolerant   J3-1 & AUX-3
     #elif DISABLED(NEWPANEL)
-      //#define SHIFT_OUT  P2_11   // (35)  J3-3 & AUX-4
-      //#define SHIFT_CLK  P3_26   // (31)  J3-2 & AUX-4
-      //#define SHIFT_LD   P3_25   // (33)  J3-4 & AUX-4
-      //#define SHIFT_EN   P1_22   // (41)  J5-4 & AUX-4
+      //#define SHIFT_OUT                  P2_11  // (35)  J3-3 & AUX-4
+      //#define SHIFT_CLK                  P3_26  // (31)  J3-2 & AUX-4
+      //#define SHIFT_LD                   P3_25  // (33)  J3-4 & AUX-4
+      //#define SHIFT_EN                   P1_22  // (41)  J5-4 & AUX-4
     #endif
 
     #if ANY(VIKI2, miniVIKI)
       //#define LCD_SCREEN_ROT_180
 
-      #define BEEPER_PIN   P1_30   // (37) may change if cable changes
-      #define DOGLCD_CS    P0_26   // (63) J5-3 & AUX-2
-      #define DOGLCD_SCK   SCK_PIN
-      #define DOGLCD_MOSI  MOSI_PIN
+      #define BEEPER_PIN                   P1_30  // (37) may change if cable changes
+      #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
+      #define DOGLCD_SCK                 SCK_PIN
+      #define DOGLCD_MOSI               MOSI_PIN
 
-      #define STAT_LED_BLUE_PIN P0_26   // (63)  may change if cable changes
-      #define STAT_LED_RED_PIN  P1_21   // ( 6)  may change if cable changes
+      #define STAT_LED_BLUE_PIN            P0_26  // (63)  may change if cable changes
+      #define STAT_LED_RED_PIN             P1_21  // ( 6)  may change if cable changes
     #else
       #if ENABLED(ULTIPANEL)
-        #define LCD_PINS_D5 P1_17   // (71) ENET_MDIO
-        #define LCD_PINS_D6 P1_14   // (73) ENET_RX_ER
-        #define LCD_PINS_D7 P1_10   // (75) ENET_RXD1
+        #define LCD_PINS_D5                P1_17  // (71) ENET_MDIO
+        #define LCD_PINS_D6                P1_14  // (73) ENET_RX_ER
+        #define LCD_PINS_D7                P1_10  // (75) ENET_RXD1
       #endif
-      #define BEEPER_PIN   P1_30   // (37) not 5V tolerant
-      #define DOGLCD_CS    P0_16   // (16)
+      #define BEEPER_PIN                   P1_30  // (37) not 5V tolerant
+      #define DOGLCD_CS                    P0_16  // (16)
     #endif
 
     #if ENABLED(MINIPANEL)
@@ -199,22 +199,22 @@
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_15
-  #define MISO_PIN         P0_17
-  #define MOSI_PIN         P0_18
-  #define SS_PIN           P1_23
+  #define SCK_PIN                          P0_15
+  #define MISO_PIN                         P0_17
+  #define MOSI_PIN                         P0_18
+  #define SS_PIN                           P1_23
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif

Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h

@@ -40,53 +40,53 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
-#define X_CS_PIN           P1_10   // Ethernet Expansion - Pin 9
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
+#define X_CS_PIN                           P1_10  // Ethernet Expansion - Pin 9
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
-#define Y_CS_PIN           P1_09   // Ethernet Expansion - Pin 10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
+#define Y_CS_PIN                           P1_09  // Ethernet Expansion - Pin 10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
-#define Z_CS_PIN           P1_00   // Ethernet Expansion - Pin 11
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
+#define Z_CS_PIN                           P1_00  // Ethernet Expansion - Pin 11
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
-#define E0_CS_PIN          P1_04   // Ethernet Expansion - Pin 12
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
+#define E0_CS_PIN                          P1_04  // Ethernet Expansion - Pin 12
 
 //
 // Default pins for TMC software SPI
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_16   // Ethernet Expansion - Pin 5
+    #define TMC_SW_MOSI                    P1_16  // Ethernet Expansion - Pin 5
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_17   // Ethernet Expansion - Pin 6
+    #define TMC_SW_MISO                    P1_17  // Ethernet Expansion - Pin 6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_08   // Ethernet Expansion - Pin 7
+    #define TMC_SW_SCK                     P1_08  // Ethernet Expansion - Pin 7
   #endif
 #endif
 
@@ -94,42 +94,42 @@
 // Analog Inputs
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // P0_23
-#define TEMP_BED_PIN        P0_24_A1   // P0_24
+#define TEMP_0_PIN                      P0_23_A0  // P0_23
+#define TEMP_BED_PIN                    P0_24_A1  // P0_24
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07   // FET 1
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07  // FET 1
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06   // FET 3
+  #define FAN_PIN                          P2_06  // FET 3
 #endif
 
 //
 // Auto fans
 //
-#define AUTO_FAN_PIN       P2_04   // FET 4
+#define AUTO_FAN_PIN                       P2_04  // FET 4
 
-#define ORIG_E0_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // Play LED
+#define LED_PIN                            P4_28  // Play LED
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if HAS_CUTTER
   #undef HEATER_0_PIN
-  #define SPINDLE_LASER_ENA_PIN     P2_07   // FET 1
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
   #undef HEATER_BED_PIN
-  #define SPINDLE_LASER_PWM_PIN     P2_05   // Bed FET
+  #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
   #undef FAN_PIN
-  #define SPINDLE_DIR_PIN           P2_06   // FET 3
+  #define SPINDLE_DIR_PIN                  P2_06  // FET 3
 #endif
 
 //
@@ -144,18 +144,18 @@
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       P0_27   // EXP2-7 - open drain
+  #define BEEPER_PIN                       P0_27  // EXP2-7 - open drain
 
-  #define BTN_EN1          P3_26   // EXP2-5
-  #define BTN_EN2          P3_25   // EXP2-3
-  #define BTN_ENC          P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-5
+  #define BTN_EN2                          P3_25  // EXP2-3
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define LCD_PINS_RS      P0_16   // EXP1-4
-  #define LCD_SDSS         P0_28   // EXP2-4
-  #define LCD_PINS_ENABLE  P0_18   // EXP1-3
-  #define LCD_PINS_D4      P0_15   // EXP1-5
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_SDSS                         P0_28  // EXP2-4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1-3
+  #define LCD_PINS_D4                      P0_15  // EXP1-5
 
-  #define KILL_PIN         P2_11   // EXP2-10
+  #define KILL_PIN                         P2_11  // EXP2-10
 
   #if ENABLED(SDSUPPORT)
     #error "SDSUPPORT is not currently supported by the Cohesion3D boards"
@@ -166,13 +166,13 @@
 //
 // Ethernet pins
 //
-#define ENET_MDIO          P1_17
-#define ENET_RX_ER         P1_14
-#define ENET_RXD1          P1_10
-#define ENET_MOC           P1_16
-#define REF_CLK            P1_15
-#define ENET_RXD0          P1_09
-#define ENET_CRS           P1_08
-#define ENET_TX_EN         P1_04
-#define ENET_TXD0          P1_00
-#define ENET_TXD1          P1_01
+#define ENET_MDIO                          P1_17
+#define ENET_RX_ER                         P1_14
+#define ENET_RXD1                          P1_10
+#define ENET_MOC                           P1_16
+#define REF_CLK                            P1_15
+#define ENET_RXD0                          P1_09
+#define ENET_CRS                           P1_08
+#define ENET_TX_EN                         P1_04
+#define ENET_TXD0                          P1_00
+#define ENET_TXD1                          P1_01

Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h

@@ -40,70 +40,70 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P2_04
+#define SERVO0_PIN                         P2_04
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24   // 10k pullup to 3.3V
-#define X_MAX_PIN          P1_25   // 10k pullup to 3.3V
-#define Y_MIN_PIN          P1_26   // 10k pullup to 3.3V
-#define Y_MAX_PIN          P1_27   // 10k pullup to 3.3V
-#define Z_MIN_PIN          P1_28   // 10k pullup to 3.3V
-#define Z_MAX_PIN          P1_29   // 10k pullup to 3.3V
+#define X_MIN_PIN                          P1_24  // 10k pullup to 3.3V
+#define X_MAX_PIN                          P1_25  // 10k pullup to 3.3V
+#define Y_MIN_PIN                          P1_26  // 10k pullup to 3.3V
+#define Y_MAX_PIN                          P1_27  // 10k pullup to 3.3V
+#define Z_MIN_PIN                          P1_28  // 10k pullup to 3.3V
+#define Z_MAX_PIN                          P1_29  // 10k pullup to 3.3V
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  P1_29
+  #define Z_MIN_PROBE_PIN                  P1_29
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
-#define X_CS_PIN           P1_10   // Ethernet Expansion - Pin 9
-
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
-#define Y_CS_PIN           P1_09   // Ethernet Expansion - Pin 10
-
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
-#define Z_CS_PIN           P1_00   // Ethernet Expansion - Pin 11
-
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
-#define E0_CS_PIN          P1_04   // Ethernet Expansion - Pin 12
-
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
-#define E1_CS_PIN          P1_01   // Ethernet Expansion - Pin 14
-
-#define E2_STEP_PIN        P1_20
-#define E2_DIR_PIN         P1_19
-#define E2_ENABLE_PIN      P1_21
-#define E2_CS_PIN          P1_18   // FET 6
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
+#define X_CS_PIN                           P1_10  // Ethernet Expansion - Pin 9
+
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
+#define Y_CS_PIN                           P1_09  // Ethernet Expansion - Pin 10
+
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
+#define Z_CS_PIN                           P1_00  // Ethernet Expansion - Pin 11
+
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
+#define E0_CS_PIN                          P1_04  // Ethernet Expansion - Pin 12
+
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
+#define E1_CS_PIN                          P1_01  // Ethernet Expansion - Pin 14
+
+#define E2_STEP_PIN                        P1_20
+#define E2_DIR_PIN                         P1_19
+#define E2_ENABLE_PIN                      P1_21
+#define E2_CS_PIN                          P1_18  // FET 6
 
 //
 // Default pins for TMC software SPI
 //
 #if ENABLED(TMC_USE_SW_SPI)
   #ifndef TMC_SW_MOSI
-    #define TMC_SW_MOSI    P1_16   // Ethernet Expansion - Pin 5
+    #define TMC_SW_MOSI                    P1_16  // Ethernet Expansion - Pin 5
   #endif
   #ifndef TMC_SW_MISO
-    #define TMC_SW_MISO    P1_17   // Ethernet Expansion - Pin 6
+    #define TMC_SW_MISO                    P1_17  // Ethernet Expansion - Pin 6
   #endif
   #ifndef TMC_SW_SCK
-    #define TMC_SW_SCK     P1_08   // Ethernet Expansion - Pin 7
+    #define TMC_SW_SCK                     P1_08  // Ethernet Expansion - Pin 7
   #endif
 #endif
 
@@ -111,42 +111,42 @@
 // Analog Inputs
 //  3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0
-#define TEMP_BED_PIN        P0_24_A1
-#define TEMP_1_PIN          P0_25_A2
+#define TEMP_0_PIN                      P0_23_A0
+#define TEMP_BED_PIN                    P0_24_A1
+#define TEMP_1_PIN                      P0_25_A2
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
-  #define FILWIDTH_PIN      P0_26_A3
+  #define FILWIDTH_PIN                  P0_26_A3
 #else
-  #define TEMP_2_PIN        P0_26_A3
+  #define TEMP_2_PIN                    P0_26_A3
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07   // FET 1
-#define HEATER_1_PIN       P1_23   // FET 2
-#define HEATER_2_PIN       P1_22   // FET 3
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07  // FET 1
+#define HEATER_1_PIN                       P1_23  // FET 2
+#define HEATER_2_PIN                       P1_22  // FET 3
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06   // FET 4
+  #define FAN_PIN                          P2_06  // FET 4
 #endif
 
 //
 // Auto fans
 //
 #if HOTENDS == 3
-  #define AUTO_FAN_PIN     P1_18   // FET 6
+  #define AUTO_FAN_PIN                     P1_18  // FET 6
 #else
-  #define AUTO_FAN_PIN     P1_22   // FET 3
+  #define AUTO_FAN_PIN                     P1_22  // FET 3
 #endif
-#define ORIG_E0_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN  AUTO_FAN_PIN
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // Misc. Functions
 //
-#define LED_PIN            P4_28   // Play LED
+#define LED_PIN                            P4_28  // Play LED
 
 //
 // M3/M4/M5 - Spindle/Laser Control
@@ -155,9 +155,9 @@
   #undef HEATER_0_PIN
   #undef HEATER_BED_PIN
   #undef FAN_PIN
-  #define SPINDLE_LASER_ENA_PIN P2_07   // FET 1
-  #define SPINDLE_LASER_PWM_PIN P2_05   // Bed FET
-  #define SPINDLE_DIR_PIN       P2_06   // FET 4
+  #define SPINDLE_LASER_ENA_PIN            P2_07  // FET 1
+  #define SPINDLE_LASER_PWM_PIN            P2_05  // Bed FET
+  #define SPINDLE_DIR_PIN                  P2_06  // FET 4
 #endif
 
 //
@@ -173,54 +173,54 @@
 
 #if ENABLED(FYSETC_MINI_12864)
 
-  #define FORCE_SOFT_SPI    // REQUIRED - results in LCD soft SPI mode 3
+  #define FORCE_SOFT_SPI                          // REQUIRED - results in LCD soft SPI mode 3
 
-  #define BEEPER_PIN      P1_31   // EXP1-1
-  #define BTN_ENC         P1_30   // EXP1-2
-  #define DOGLCD_CS       P0_18   // EXP1-3
-  #define DOGLCD_A0       P0_16   // EXP1-4
-  #define LCD_RESET_PIN   P0_15   // EXP1-5
+  #define BEEPER_PIN                       P1_31  // EXP1-1
+  #define BTN_ENC                          P1_30  // EXP1-2
+  #define DOGLCD_CS                        P0_18  // EXP1-3
+  #define DOGLCD_A0                        P0_16  // EXP1-4
+  #define LCD_RESET_PIN                    P0_15  // EXP1-5
 
   // A custom cable is REQUIRED for EXP2 cable because the SCK & MOSI on the card's EXP2 are dedicated
   // to the onboard SD card.  All required EXP2 signals come from the Ethernet connector.  Pin 1 of this
   // connector is the one nearest the motor power connector.
-  #define DOGLCD_SCK      P1_17   // EXP2-2  =>  Ethernet pin  5 (bottom, 3 from left)
-  #define BTN_EN2         P1_09   // EXP2-3  =>  Ethernet pin  9 (bottom, 5 from left)
-  #define BTN_EN1         P1_04   // EXP2-5  =>  Ethernet pin 11 (bottom, 6 from left)
-  #define DOGLCD_MOSI     P1_01   // EXP2-6  =>  Ethernet pin 13 (bottom, 7 from left)
+  #define DOGLCD_SCK                       P1_17  // EXP2-2  =>  Ethernet pin  5 (bottom, 3 from left)
+  #define BTN_EN2                          P1_09  // EXP2-3  =>  Ethernet pin  9 (bottom, 5 from left)
+  #define BTN_EN1                          P1_04  // EXP2-5  =>  Ethernet pin 11 (bottom, 6 from left)
+  #define DOGLCD_MOSI                      P1_01  // EXP2-6  =>  Ethernet pin 13 (bottom, 7 from left)
 
   // A custom EXP1 cable is required colored LEDs. Pins 1-5, 9, 10 of the cable go to pins 1-5, 9, 10
   // on the board's EXP1 connector. Pins 6, 7, and 8 of the EXP1 cable go to the Ethernet connector.
   // Rev 1.2 displays do NOT require the RGB LEDs. 2.0 and 2.1 displays do require RGB.
   #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
     #ifndef RGB_LED_R_PIN
-      #define RGB_LED_R_PIN P1_16 // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
+      #define RGB_LED_R_PIN                P1_16  // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
     #endif
     #ifndef RGB_LED_G_PIN
-      #define RGB_LED_G_PIN P1_10 // EXP1-7  =>  Ethernet pin 10 (top row, 5 from left)
+      #define RGB_LED_G_PIN                P1_10  // EXP1-7  =>  Ethernet pin 10 (top row, 5 from left)
     #endif
     #ifndef RGB_LED_B_PIN
-      #define RGB_LED_B_PIN P1_00 // EXP1-8  =>  Ethernet pin 12 (top row, 6 from left)
+      #define RGB_LED_B_PIN                P1_00  // EXP1-8  =>  Ethernet pin 12 (top row, 6 from left)
     #endif
   #elif ENABLED(FYSETC_MINI_12864_2_1)
-    #define NEOPIXEL_PIN  P1_16   // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
+    #define NEOPIXEL_PIN                   P1_16  // EXP1-6  =>  Ethernet pin  6 (top row, 3 from left)
   #endif
 
 #elif HAS_SPI_LCD
 
-  #define BEEPER_PIN      P1_31   // EXP1-1
-  //#define SD_DETECT_PIN P0_27   // EXP2-7
+  #define BEEPER_PIN                       P1_31  // EXP1-1
+  //#define SD_DETECT_PIN                  P0_27  // EXP2-7
 
-  #define BTN_EN1         P3_26   // EXP2-5
-  #define BTN_EN2         P3_25   // EXP2-3
-  #define BTN_ENC         P1_30   // EXP1-2
+  #define BTN_EN1                          P3_26  // EXP2-5
+  #define BTN_EN2                          P3_25  // EXP2-3
+  #define BTN_ENC                          P1_30  // EXP1-2
 
-  #define LCD_PINS_RS     P0_16   // EXP1-4
-  #define LCD_SDSS        P0_28   // EXP2-4
-  #define LCD_PINS_ENABLE P0_18   // EXP1-3
-  #define LCD_PINS_D4     P0_15   // EXP1-5
+  #define LCD_PINS_RS                      P0_16  // EXP1-4
+  #define LCD_SDSS                         P0_28  // EXP2-4
+  #define LCD_PINS_ENABLE                  P0_18  // EXP1-3
+  #define LCD_PINS_D4                      P0_15  // EXP1-5
 
-  #define KILL_PIN        P2_11   // EXP2-10
+  #define KILL_PIN                         P2_11  // EXP2-10
 
 #endif // HAS_SPI_LCD
 
@@ -228,22 +228,22 @@
 // SD Support
 //
 #ifndef SDCARD_CONNECTION
-  #define SDCARD_CONNECTION ONBOARD
+  #define SDCARD_CONNECTION              ONBOARD
 #endif
 
-#define ONBOARD_SD_CS_PIN  P0_06   // Chip select for "System" SD card
+#define ONBOARD_SD_CS_PIN                  P0_06  // Chip select for "System" SD card
 
 #if SD_CONNECTION_IS(LCD)
-  #define SCK_PIN          P0_07   // (52)  system defined J3-9 & AUX-3
-  #define MISO_PIN         P0_08   // (50)  system defined J3-10 & AUX-3
-  #define MOSI_PIN         P0_09   // (51)  system defined J3-10 & AUX-3
-  #define SS_PIN           P1_23   // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
+  #define SCK_PIN                          P0_07  // (52)  system defined J3-9 & AUX-3
+  #define MISO_PIN                         P0_08  // (50)  system defined J3-10 & AUX-3
+  #define MOSI_PIN                         P0_09  // (51)  system defined J3-10 & AUX-3
+  #define SS_PIN                           P1_23  // (53)  system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
 #elif SD_CONNECTION_IS(ONBOARD)
   #undef SD_DETECT_PIN
-  #define SCK_PIN          P0_07
-  #define MISO_PIN         P0_08
-  #define MOSI_PIN         P0_09
-  #define SS_PIN           ONBOARD_SD_CS_PIN
+  #define SCK_PIN                          P0_07
+  #define MISO_PIN                         P0_08
+  #define MOSI_PIN                         P0_09
+  #define SS_PIN               ONBOARD_SD_CS_PIN
 #elif SD_CONNECTION_IS(CUSTOM_CABLE)
   #error "No custom SD drive cable defined for this board."
 #endif
@@ -251,16 +251,16 @@
 //
 // Ethernet pins
 //
-//#define ENET_MDIO          P1_17   // Ethernet pin  5 (bottom, 3 from left)
-//#define ENET_RX_ER         P1_14
-//#define ENET_RXD1          P1_10   // Ethernet pin 10 (top row, 5 from left)
-//#define ENET_MOC           P1_16   // Ethernet pin  6 (top row, 3 from left)
-//#define REF_CLK            P1_15
-//#define ENET_RXD0          P1_09   // Ethernet pin  9 (bottom, 5 from left)
-//#define ENET_CRS           P1_08   // Ethernet pin  8 (top row, 4 from left) - INPUT ONLY
-//#define ENET_TX_EN         P1_04   // Ethernet pin 11 (bottom, 6 from left)
-//#define ENET_TXD0          P1_00   // Ethernet pin 12 (top row, 6 from left)
-//#define ENET_TXD1          P1_01   // Ethernet pin 13 (bottom, 7 from left)
+//#define ENET_MDIO                        P1_17  // Ethernet pin  5 (bottom, 3 from left)
+//#define ENET_RX_ER                       P1_14
+//#define ENET_RXD1                        P1_10  // Ethernet pin 10 (top row, 5 from left)
+//#define ENET_MOC                         P1_16  // Ethernet pin  6 (top row, 3 from left)
+//#define REF_CLK                          P1_15
+//#define ENET_RXD0                        P1_09  // Ethernet pin  9 (bottom, 5 from left)
+//#define ENET_CRS                         P1_08  // Ethernet pin  8 (top row, 4 from left) - INPUT ONLY
+//#define ENET_TX_EN                       P1_04  // Ethernet pin 11 (bottom, 6 from left)
+//#define ENET_TXD0                        P1_00  // Ethernet pin 12 (top row, 6 from left)
+//#define ENET_TXD1                        P1_01  // Ethernet pin 13 (bottom, 7 from left)
 
 /**
  *  EXP1 pins

Marlin/src/pins/lpc1769/pins_MKS_SGEN.h

@@ -47,10 +47,10 @@
 
 //#undef BTN_EN1
 //#undef BTN_EN2
-//#define BTN_EN1            P1_23   // EXP2.5
-//#define BTN_EN2            P1_22   // EXP2.3
+//#define BTN_EN1                          P1_23  // EXP2.5
+//#define BTN_EN2                          P1_22  // EXP2.3
 
-#if HAS_TMC220x
+#if HAS_TMC_UART
   /**
    * TMC2208/TMC2209 stepper drivers
    *
@@ -58,16 +58,16 @@
    * In the worst case you may have to give up the LCD.
    * RX pins must be interrupt-capable.
    */
-  #define X_SERIAL_TX_PIN  P4_29   // J8-2
-  #define X_SERIAL_RX_PIN  P4_29   // J8-2
+  #define X_SERIAL_TX_PIN                  P4_29  // J8-2
+  #define X_SERIAL_RX_PIN                  P4_29  // J8-2
 
-  #define Y_SERIAL_TX_PIN  P2_08   // J8-3
-  #define Y_SERIAL_RX_PIN  P2_08   // J8-3
+  #define Y_SERIAL_TX_PIN                  P2_08  // J8-3
+  #define Y_SERIAL_RX_PIN                  P2_08  // J8-3
 
-  #define Z_SERIAL_TX_PIN  P2_11   // J8-4
-  #define Z_SERIAL_RX_PIN  P2_11   // J8-4
-  #define E0_SERIAL_TX_PIN P2_13   // J8-5
-  #define E0_SERIAL_RX_PIN P2_13   // J8-5
+  #define Z_SERIAL_TX_PIN                  P2_11  // J8-4
+  #define Z_SERIAL_RX_PIN                  P2_11  // J8-4
+  #define E0_SERIAL_TX_PIN                 P2_13  // J8-5
+  #define E0_SERIAL_RX_PIN                 P2_13  // J8-5
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200

Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h

@@ -41,79 +41,79 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P1_23
+#define SERVO0_PIN                         P1_23
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          P1_24
-#define X_MAX_PIN          P1_25
-#define Y_MIN_PIN          P1_26
-#define Y_MAX_PIN          P1_27
-#define Z_MIN_PIN          P1_28
-#define Z_MAX_PIN          P1_29
+#define X_MIN_PIN                          P1_24
+#define X_MAX_PIN                          P1_25
+#define Y_MIN_PIN                          P1_26
+#define Y_MAX_PIN                          P1_27
+#define Z_MIN_PIN                          P1_28
+#define Z_MAX_PIN                          P1_29
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P0_05
-#define X_ENABLE_PIN       P0_04
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P0_05
+#define X_ENABLE_PIN                       P0_04
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P0_11
-#define Y_ENABLE_PIN       P0_10
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P0_11
+#define Y_ENABLE_PIN                       P0_10
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P0_20
-#define Z_ENABLE_PIN       P0_19
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P0_20
+#define Z_ENABLE_PIN                       P0_19
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P0_22
-#define E0_ENABLE_PIN      P0_21
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P0_22
+#define E0_ENABLE_PIN                      P0_21
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 //
 // Temperature Sensors
 // 3.3V max when defined as an analog input
 //
-#define TEMP_0_PIN          P0_23_A0   // (T1)
-#define TEMP_BED_PIN        P0_24_A1   // (T2)
-#define TEMP_1_PIN          P0_25_A2   // (T3)
-#define TEMP_2_PIN          P0_26_A3   // (T4)
+#define TEMP_0_PIN                      P0_23_A0  // (T1)
+#define TEMP_BED_PIN                    P0_24_A1  // (T2)
+#define TEMP_1_PIN                      P0_25_A2  // (T3)
+#define TEMP_2_PIN                      P0_26_A3  // (T4)
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
-#define HEATER_1_PIN       P1_23
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
+#define HEATER_1_PIN                       P1_23
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06
+  #define FAN_PIN                          P2_06
 #endif
-#define FAN1_PIN           P2_04
+#define FAN1_PIN                           P2_04
 
 //
 // LCD / Controller
 //
 #if ANY(VIKI2, miniVIKI)
 
-  #define BEEPER_PIN       P1_31
-  #define DOGLCD_A0        P2_11
-  #define DOGLCD_CS        P0_16
+  #define BEEPER_PIN                       P1_31
+  #define DOGLCD_A0                        P2_11
+  #define DOGLCD_CS                        P0_16
 
-  #define BTN_EN1          P3_25
-  #define BTN_EN2          P3_26
-  #define BTN_ENC          P1_30
+  #define BTN_EN1                          P3_25
+  #define BTN_EN2                          P3_26
+  #define BTN_ENC                          P1_30
 
-  #define SD_DETECT_PIN    P1_18
-  #define SDSS             P1_21
+  #define SD_DETECT_PIN                    P1_18
+  #define SDSS                             P1_21
 
-  #define STAT_LED_RED_PIN  P1_19
-  #define STAT_LED_BLUE_PIN P1_20
+  #define STAT_LED_RED_PIN                 P1_19
+  #define STAT_LED_BLUE_PIN                P1_20
 
 #elif HAS_SPI_LCD
 

Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h

@@ -41,58 +41,58 @@
 //
 // Servos
 //
-#define SERVO0_PIN         P2_04
+#define SERVO0_PIN                         P2_04
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         P1_24
-#define Y_STOP_PIN         P1_25
-#define Z_STOP_PIN         P1_26
+#define X_STOP_PIN                         P1_24
+#define Y_STOP_PIN                         P1_25
+#define Z_STOP_PIN                         P1_26
 
 //
 // Filament Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   P1_27
+  #define FIL_RUNOUT_PIN                   P1_27
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         P2_00
-#define X_DIR_PIN          P1_16
-#define X_ENABLE_PIN       P1_17
+#define X_STEP_PIN                         P2_00
+#define X_DIR_PIN                          P1_16
+#define X_ENABLE_PIN                       P1_17
 
-#define Y_STEP_PIN         P2_01
-#define Y_DIR_PIN          P1_10
-#define Y_ENABLE_PIN       P1_09
+#define Y_STEP_PIN                         P2_01
+#define Y_DIR_PIN                          P1_10
+#define Y_ENABLE_PIN                       P1_09
 
-#define Z_STEP_PIN         P2_02
-#define Z_DIR_PIN          P1_15
-#define Z_ENABLE_PIN       P1_14
+#define Z_STEP_PIN                         P2_02
+#define Z_DIR_PIN                          P1_15
+#define Z_ENABLE_PIN                       P1_14
 
-#define E0_STEP_PIN        P2_03
-#define E0_DIR_PIN         P1_04
-#define E0_ENABLE_PIN      P1_08
+#define E0_STEP_PIN                        P2_03
+#define E0_DIR_PIN                         P1_04
+#define E0_ENABLE_PIN                      P1_08
 
-#define E1_STEP_PIN        P2_08
-#define E1_DIR_PIN         P2_13
-#define E1_ENABLE_PIN      P4_29
+#define E1_STEP_PIN                        P2_08
+#define E1_DIR_PIN                         P2_13
+#define E1_ENABLE_PIN                      P4_29
 
 #if HAS_TMC_UART
   //
   // TMC220x stepper drivers
   // Software serial
   //
-  #define X_SERIAL_TX_PIN  P0_04
-  #define X_SERIAL_RX_PIN  P0_05
-  #define Y_SERIAL_TX_PIN  P0_10
-  #define Y_SERIAL_RX_PIN  P0_11
-  #define Z_SERIAL_TX_PIN  P0_19
-  #define Z_SERIAL_RX_PIN  P0_20
-  #define E0_SERIAL_TX_PIN P0_22
-  #define E0_SERIAL_RX_PIN P0_21
+  #define X_SERIAL_TX_PIN                  P0_04
+  #define X_SERIAL_RX_PIN                  P0_05
+  #define Y_SERIAL_TX_PIN                  P0_10
+  #define Y_SERIAL_RX_PIN                  P0_11
+  #define Z_SERIAL_TX_PIN                  P0_19
+  #define Z_SERIAL_RX_PIN                  P0_20
+  #define E0_SERIAL_TX_PIN                 P0_22
+  #define E0_SERIAL_RX_PIN                 P0_21
 
   // Reduce baud rate to improve software serial reliability
   #define TMC_BAUD_RATE 19200
@@ -102,50 +102,50 @@
 // Temp Sensors
 //  3.3V max when defined as an Analog Input!
 //
-#if TEMP_SENSOR_0 == 20         // PT100 Adapter
-  #define TEMP_0_PIN        P0_02_A7   // Analog Input
+#if TEMP_SENSOR_0 == 20                           // PT100 Adapter
+  #define TEMP_0_PIN                    P0_02_A7  // Analog Input
 #else
-  #define TEMP_0_PIN        P0_23_A0   // Analog Input P0_23
+  #define TEMP_0_PIN                    P0_23_A0  // Analog Input P0_23
 #endif
 
-#define TEMP_BED_PIN        P0_24_A1   // Analog Input P0_24
-#define TEMP_1_PIN          P0_25_A2   // Analog Input P0_25
+#define TEMP_BED_PIN                    P0_24_A1  // Analog Input P0_24
+#define TEMP_1_PIN                      P0_25_A2  // Analog Input P0_25
 
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
-  #define FILWIDTH_PIN      P0_26_A3   // Analog Input P0_26
+  #define FILWIDTH_PIN                  P0_26_A3  // Analog Input P0_26
 #else
-  #define TEMP_2_PIN        P0_26_A3   // Analog Input P0_26
+  #define TEMP_2_PIN                    P0_26_A3  // Analog Input P0_26
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_BED_PIN     P2_05
-#define HEATER_0_PIN       P2_07
+#define HEATER_BED_PIN                     P2_05
+#define HEATER_0_PIN                       P2_07
 #ifndef FAN_PIN
-  #define FAN_PIN          P2_06
+  #define FAN_PIN                          P2_06
 #endif
-#define FAN1_PIN           P1_22
+#define FAN1_PIN                           P1_22
 
 //
 // Auto fans
 //
-#define AUTO_FAN_PIN       P1_22   // FET 3
-#define ORIG_E0_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E1_AUTO_FAN_PIN  AUTO_FAN_PIN
-#define ORIG_E2_AUTO_FAN_PIN  AUTO_FAN_PIN
+#define AUTO_FAN_PIN                       P1_22  // FET 3
+#define ORIG_E0_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E1_AUTO_FAN_PIN        AUTO_FAN_PIN
+#define ORIG_E2_AUTO_FAN_PIN        AUTO_FAN_PIN
 
 //
 // SD Card
 //
 
-#define SDCARD_CONNECTION ONBOARD
+#define SDCARD_CONNECTION                ONBOARD
 
-#define SCK_PIN            P0_07
-#define MISO_PIN           P0_08
-#define MOSI_PIN           P0_09
-#define ONBOARD_SD_CS_PIN  P0_06
-#define SS_PIN             ONBOARD_SD_CS_PIN
+#define SCK_PIN                            P0_07
+#define MISO_PIN                           P0_08
+#define MOSI_PIN                           P0_09
+#define ONBOARD_SD_CS_PIN                  P0_06
+#define SS_PIN                 ONBOARD_SD_CS_PIN
 
 //
 // LCD / Controller
@@ -170,14 +170,14 @@
  */
 
 #if ENABLED(CR10_STOCKDISPLAY)
-  #define BEEPER_PIN       P1_31
-  #define BTN_EN1          P3_26
-  #define BTN_EN2          P3_25
-  #define BTN_ENC          P1_30
-  #define LCD_PINS_RS      P0_16
-  #define LCD_PINS_ENABLE  P0_18
-  #define LCD_PINS_D4      P0_15
-  #define KILL_PIN         P2_11
+  #define BEEPER_PIN                       P1_31
+  #define BTN_EN1                          P3_26
+  #define BTN_EN2                          P3_25
+  #define BTN_ENC                          P1_30
+  #define LCD_PINS_RS                      P0_16
+  #define LCD_PINS_ENABLE                  P0_18
+  #define LCD_PINS_D4                      P0_15
+  #define KILL_PIN                         P2_11
 #elif HAS_SPI_LCD
   #error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
 #endif

Marlin/src/pins/mega/pins_CHEAPTRONIC.h

@@ -33,46 +33,46 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN          3
-#define Y_STOP_PIN          2
-#define Z_STOP_PIN          5
+#define X_STOP_PIN                             3
+#define Y_STOP_PIN                             2
+#define Z_STOP_PIN                             5
 
 //
 // Steppers
 //
-#define X_STEP_PIN         14
-#define X_DIR_PIN          15
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            14
+#define X_DIR_PIN                             15
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         35
-#define Y_DIR_PIN          36
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            35
+#define Y_DIR_PIN                             36
+#define Y_ENABLE_PIN                          31
 
-#define Z_STEP_PIN         40
-#define Z_DIR_PIN          41
-#define Z_ENABLE_PIN       37
+#define Z_STEP_PIN                            40
+#define Z_DIR_PIN                             41
+#define Z_ENABLE_PIN                          37
 
-#define E0_STEP_PIN        26
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN      25
+#define E0_STEP_PIN                           26
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                         25
 
-#define E1_STEP_PIN        33
-#define E1_DIR_PIN         34
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           33
+#define E1_DIR_PIN                            34
+#define E1_ENABLE_PIN                         30
 
 //
 // Temperature sensors
 //
-#define TEMP_0_PIN         15   // Analog Input
-#define TEMP_1_PIN         14   // Analog Input
-#define TEMP_BED_PIN       13   // Analog Input
+#define TEMP_0_PIN                            15  // Analog Input
+#define TEMP_1_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          13  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       19   // EXTRUDER 1
-#define HEATER_1_PIN       23   // EXTRUDER 2
-#define HEATER_BED_PIN     22
+#define HEATER_0_PIN                          19  // EXTRUDER 1
+#define HEATER_1_PIN                          23  // EXTRUDER 2
+#define HEATER_BED_PIN                        22
 
 //
 // LCD / Controller

Marlin/src/pins/mega/pins_CHEAPTRONICv2.h

@@ -36,101 +36,101 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          30
-#define X_MAX_PIN          31
-#define Y_MIN_PIN          32
-#define Y_MAX_PIN          33
-#define Z_MIN_PIN          34
-#define Z_MAX_PIN          35
+#define X_MIN_PIN                             30
+#define X_MAX_PIN                             31
+#define Y_MIN_PIN                             32
+#define Y_MAX_PIN                             33
+#define Z_MIN_PIN                             34
+#define Z_MAX_PIN                             35
 
 //
 // Steppers
 //
-#define X_STEP_PIN         17
-#define X_DIR_PIN          16
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            17
+#define X_DIR_PIN                             16
+#define X_ENABLE_PIN                          48
 
-#define Y_STEP_PIN         54
-#define Y_DIR_PIN          47
-#define Y_ENABLE_PIN       55
+#define Y_STEP_PIN                            54
+#define Y_DIR_PIN                             47
+#define Y_ENABLE_PIN                          55
 
-#define Z_STEP_PIN         57
-#define Z_DIR_PIN          56
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            57
+#define Z_DIR_PIN                             56
+#define Z_ENABLE_PIN                          62
 
-#define E0_STEP_PIN        23
-#define E0_DIR_PIN         22
-#define E0_ENABLE_PIN      24
+#define E0_STEP_PIN                           23
+#define E0_DIR_PIN                            22
+#define E0_ENABLE_PIN                         24
 
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         25
-#define E1_ENABLE_PIN      27
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            25
+#define E1_ENABLE_PIN                         27
 
-#define E2_STEP_PIN        29
-#define E2_DIR_PIN         28
-#define E2_ENABLE_PIN      39
+#define E2_STEP_PIN                           29
+#define E2_DIR_PIN                            28
+#define E2_ENABLE_PIN                         39
 
 //
 // Temperature sensors
 //
-#define TEMP_0_PIN         15
-#define TEMP_1_PIN         13
-#define TEMP_2_PIN         14
-#define TEMP_3_PIN         11   // should be used for chamber temperature control
-#define TEMP_BED_PIN       12
+#define TEMP_0_PIN                            15
+#define TEMP_1_PIN                            13
+#define TEMP_2_PIN                            14
+#define TEMP_3_PIN                            11  // should be used for chamber temperature control
+#define TEMP_BED_PIN                          12
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        6
-#define HEATER_1_PIN        7
-#define HEATER_2_PIN        8
-#define HEATER_BED_PIN      9
+#define HEATER_0_PIN                           6
+#define HEATER_1_PIN                           7
+#define HEATER_2_PIN                           8
+#define HEATER_BED_PIN                         9
 #ifndef FAN_PIN
-  #define FAN_PIN           3
+  #define FAN_PIN                              3
 #endif
-#define FAN2_PIN           58   // additional fan or light control output
+#define FAN2_PIN                              58  // additional fan or light control output
 
 //
 // Other board specific pins
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   37   // board input labeled as F-DET
+  #define FIL_RUNOUT_PIN                      37  // board input labeled as F-DET
 #endif
-#define Z_MIN_PROBE_PIN    36   // additional external board input labeled as E-SENS (should be used for Z-probe)
-#define LED_PIN            13
-#define SPINDLE_ENABLE_PIN  4   // additional PWM pin 1 at JP1 connector - should be used for laser control too
-#define EXT_2               5   // additional PWM pin 2 at JP1 connector
-#define EXT_3               2   // additional PWM pin 3 at JP1 connector
-#define PS_ON_PIN          45
-#define KILL_PIN           46
+#define Z_MIN_PROBE_PIN                       36  // additional external board input labeled as E-SENS (should be used for Z-probe)
+#define LED_PIN                               13
+#define SPINDLE_ENABLE_PIN                     4  // additional PWM pin 1 at JP1 connector - should be used for laser control too
+#define EXT_2                                  5  // additional PWM pin 2 at JP1 connector
+#define EXT_3                                  2  // additional PWM pin 3 at JP1 connector
+#define PS_ON_PIN                             45
+#define KILL_PIN                              46
 
 #ifndef FILWIDTH_PIN
-  #define FILWIDTH_PIN     11   // shared with TEMP_3 analog input
+  #define FILWIDTH_PIN                        11  // shared with TEMP_3 analog input
 #endif
 
 //
 // LCD / Controller
 //
-#define LCD_PINS_RS        19
-#define LCD_PINS_ENABLE    42
-#define LCD_PINS_D4        18
-#define LCD_PINS_D5        38
-#define LCD_PINS_D6        41
-#define LCD_PINS_D7        40
+#define LCD_PINS_RS                           19
+#define LCD_PINS_ENABLE                       42
+#define LCD_PINS_D4                           18
+#define LCD_PINS_D5                           38
+#define LCD_PINS_D6                           41
+#define LCD_PINS_D7                           40
 
 //
 // Beeper, SD Card, Encoder
 //
-#define BEEPER_PIN         44
+#define BEEPER_PIN                            44
 
 #if ENABLED(SDSUPPORT)
-  #define SDSS             53
-  #define SD_DETECT_PIN    49
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       49
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1          11
-  #define BTN_EN2          12
-  #define BTN_ENC          43
+  #define BTN_EN1                             11
+  #define BTN_EN2                             12
+  #define BTN_ENC                             43
 #endif

Marlin/src/pins/mega/pins_CNCONTROLS_11.h

@@ -34,115 +34,115 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         43
-#define Y_STOP_PIN         45
-#define Z_STOP_PIN         42
+#define X_STOP_PIN                            43
+#define Y_STOP_PIN                            45
+#define Z_STOP_PIN                            42
 
 //
 // Steppers
 //
-#define X_STEP_PIN         34
-#define X_DIR_PIN          36
-#define X_ENABLE_PIN       35
+#define X_STEP_PIN                            34
+#define X_DIR_PIN                             36
+#define X_ENABLE_PIN                          35
 
-#define Y_STEP_PIN         37
-#define Y_DIR_PIN          39
-#define Y_ENABLE_PIN       38
+#define Y_STEP_PIN                            37
+#define Y_DIR_PIN                             39
+#define Y_ENABLE_PIN                          38
 
-#define Z_STEP_PIN         40
-#define Z_DIR_PIN          48
-#define Z_ENABLE_PIN       41
+#define Z_STEP_PIN                            40
+#define Z_DIR_PIN                             48
+#define Z_ENABLE_PIN                          41
 
-#define E0_STEP_PIN        29
-#define E0_DIR_PIN         28
-#define E0_ENABLE_PIN       3
+#define E0_STEP_PIN                           29
+#define E0_DIR_PIN                            28
+#define E0_ENABLE_PIN                          3
 
-#define E1_STEP_PIN        61
-#define E1_DIR_PIN         62
-#define E1_ENABLE_PIN      60
+#define E1_STEP_PIN                           61
+#define E1_DIR_PIN                            62
+#define E1_ENABLE_PIN                         60
 
-#define E2_STEP_PIN        15
-#define E2_DIR_PIN         14
-#define E2_ENABLE_PIN      16
+#define E2_STEP_PIN                           15
+#define E2_DIR_PIN                            14
+#define E2_ENABLE_PIN                         16
 
-#define E3_STEP_PIN        44
-#define E3_DIR_PIN         49
-#define E3_ENABLE_PIN      47
+#define E3_STEP_PIN                           44
+#define E3_DIR_PIN                            49
+#define E3_ENABLE_PIN                         47
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          3   // Analog Input.  3 for tool2 -> 2 for chambertemp
-#define TEMP_2_PIN          2   // Analog Input.  9 for tool3 -> 2 for chambertemp
-#define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 2 for chambertemp
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             3  // Analog Input.  3 for tool2 -> 2 for chambertemp
+#define TEMP_2_PIN                             2  // Analog Input.  9 for tool3 -> 2 for chambertemp
+#define TEMP_3_PIN                            11  // Analog Input. 11 for tool4 -> 2 for chambertemp
+#define TEMP_BED_PIN                           1  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  //#define TEMP_CHAMBER_PIN 2  // Analog Input
+  //#define TEMP_CHAMBER_PIN                   2  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        5
-#define HEATER_1_PIN       58
-#define HEATER_2_PIN       64
-#define HEATER_3_PIN       46
-#define HEATER_BED_PIN      2
+#define HEATER_0_PIN                           5
+#define HEATER_1_PIN                          58
+#define HEATER_2_PIN                          64
+#define HEATER_3_PIN                          46
+#define HEATER_BED_PIN                         2
 
 #ifndef FAN_PIN
-  //#define FAN_PIN         7   // common PWM pin for all tools
+  //#define FAN_PIN                            7  // common PWM pin for all tools
 #endif
 
-#define ORIG_E0_AUTO_FAN_PIN 7
-#define ORIG_E1_AUTO_FAN_PIN 7
-#define ORIG_E2_AUTO_FAN_PIN 7
-#define ORIG_E3_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                   7
+#define ORIG_E1_AUTO_FAN_PIN                   7
+#define ORIG_E2_AUTO_FAN_PIN                   7
+#define ORIG_E3_AUTO_FAN_PIN                   7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      13
+#define SDSS                                  53
+#define SD_DETECT_PIN                         13
 
 // Tools
 
-//#define TOOL_0_PIN           4
-//#define TOOL_1_PIN          59
-//#define TOOL_2_PIN           8
-//#define TOOL_3_PIN          30
-//#define TOOL_PWM_PIN         7   // common PWM pin for all tools
+//#define TOOL_0_PIN                           4
+//#define TOOL_1_PIN                          59
+//#define TOOL_2_PIN                           8
+//#define TOOL_3_PIN                          30
+//#define TOOL_PWM_PIN                         7  // common PWM pin for all tools
 
 // Common I/O
 
-//#define FIL_RUNOUT_PIN      -1
-//#define PWM_1_PIN           11
-//#define PWM_2_PIN           10
-//#define SPARE_IO            12
+//#define FIL_RUNOUT_PIN                      -1
+//#define PWM_1_PIN                           11
+//#define PWM_2_PIN                           10
+//#define SPARE_IO                            12
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN          6
+#define BEEPER_PIN                             6
 
 // Pins for DOGM SPI LCD Support
-#define DOGLCD_A0          26
-#define DOGLCD_CS          24
-#define DOGLCD_MOSI        -1
-#define DOGLCD_SCK         -1
+#define DOGLCD_A0                             26
+#define DOGLCD_CS                             24
+#define DOGLCD_MOSI                           -1
+#define DOGLCD_SCK                            -1
 
-#define BTN_EN1            23
-#define BTN_EN2            25
-#define BTN_ENC            27
+#define BTN_EN1                               23
+#define BTN_EN2                               25
+#define BTN_ENC                               27
 
 // Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT          19
-#define SHIFT_LD           18
-#define SHIFT_CLK          17
+#define SHIFT_OUT                             19
+#define SHIFT_LD                              18
+#define SHIFT_CLK                             17
 
-//#define UI1                31
-//#define UI2                22
+//#define UI1                                 31
+//#define UI2                                 22
 
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   31
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      31

Marlin/src/pins/mega/pins_CNCONTROLS_12.h

@@ -34,122 +34,122 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         19
-#define Y_STOP_PIN         22
-#define Z_STOP_PIN         23
+#define X_STOP_PIN                            19
+#define Y_STOP_PIN                            22
+#define Z_STOP_PIN                            23
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          27
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             27
+#define X_ENABLE_PIN                          26
 
-#define Y_STEP_PIN         28
-#define Y_DIR_PIN          30
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            28
+#define Y_DIR_PIN                             30
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         31
-#define Z_DIR_PIN          33
-#define Z_ENABLE_PIN       32
+#define Z_STEP_PIN                            31
+#define Z_DIR_PIN                             33
+#define Z_ENABLE_PIN                          32
 
-#define E0_STEP_PIN        57
-#define E0_DIR_PIN         55
-#define E0_ENABLE_PIN      58
+#define E0_STEP_PIN                           57
+#define E0_DIR_PIN                            55
+#define E0_ENABLE_PIN                         58
 
-#define E1_STEP_PIN        61
-#define E1_DIR_PIN         62
-#define E1_ENABLE_PIN      60
+#define E1_STEP_PIN                           61
+#define E1_DIR_PIN                            62
+#define E1_ENABLE_PIN                         60
 
-#define E2_STEP_PIN        46
-#define E2_DIR_PIN         66
-#define E2_ENABLE_PIN      44
+#define E2_STEP_PIN                           46
+#define E2_DIR_PIN                            66
+#define E2_ENABLE_PIN                         44
 
-#define E3_STEP_PIN        45
-#define E3_DIR_PIN         69
-#define E3_ENABLE_PIN      47
+#define E3_STEP_PIN                           45
+#define E3_DIR_PIN                            69
+#define E3_ENABLE_PIN                         47
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input.  9 for tool2 -> 13 for chambertemp
-#define TEMP_2_PIN         13   // Analog Input. 10 for tool3 -> 13 for chambertemp
-#define TEMP_3_PIN         11   // Analog Input. 11 for tool4 -> 13 for chambertemp
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input.  9 for tool2 -> 13 for chambertemp
+#define TEMP_2_PIN                            13  // Analog Input. 10 for tool3 -> 13 for chambertemp
+#define TEMP_3_PIN                            11  // Analog Input. 11 for tool4 -> 13 for chambertemp
+#define TEMP_BED_PIN                          14  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  //#define TEMP_CHAMBER_PIN 13 // Analog Input
+  //#define TEMP_CHAMBER_PIN                  13  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       11
-#define HEATER_1_PIN        9
-#define HEATER_2_PIN        6
-#define HEATER_3_PIN        3
-#define HEATER_BED_PIN     24
+#define HEATER_0_PIN                          11
+#define HEATER_1_PIN                           9
+#define HEATER_2_PIN                           6
+#define HEATER_3_PIN                           3
+#define HEATER_BED_PIN                        24
 
 #ifndef FAN_PIN
-  #define FAN_PIN           5   // 5 is PWMtool3 -> 7 is common PWM pin for all tools
+  #define FAN_PIN                              5  // 5 is PWMtool3 -> 7 is common PWM pin for all tools
 #endif
 
-#define ORIG_E0_AUTO_FAN_PIN 7
-#define ORIG_E1_AUTO_FAN_PIN 7
-#define ORIG_E2_AUTO_FAN_PIN 7
-#define ORIG_E3_AUTO_FAN_PIN 7
+#define ORIG_E0_AUTO_FAN_PIN                   7
+#define ORIG_E1_AUTO_FAN_PIN                   7
+#define ORIG_E2_AUTO_FAN_PIN                   7
+#define ORIG_E3_AUTO_FAN_PIN                   7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      15
+#define SDSS                                  53
+#define SD_DETECT_PIN                         15
 
 // Tools
 
-//#define TOOL_0_PIN         56
-//#define TOOL_0_PWM_PIN     10   // red warning led at dual extruder
-//#define TOOL_1_PIN         59
-//#define TOOL_1_PWM_PIN      8   // lights at dual extruder
-//#define TOOL_2_PIN          4
-//#define TOOL_2_PWM_PIN      5
-//#define TOOL_3_PIN         14
-//#define TOOL_3_PWM_PIN      2
+//#define TOOL_0_PIN                          56
+//#define TOOL_0_PWM_PIN                      10  // red warning led at dual extruder
+//#define TOOL_1_PIN                          59
+//#define TOOL_1_PWM_PIN                       8  // lights at dual extruder
+//#define TOOL_2_PIN                           4
+//#define TOOL_2_PWM_PIN                       5
+//#define TOOL_3_PIN                          14
+//#define TOOL_3_PWM_PIN                       2
 
 // Common I/O
 
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   18
+  #define FIL_RUNOUT_PIN                      18
 #endif
-//#define PWM_1_PIN          12
-//#define PWM_2_PIN          13
-//#define SPARE_IO           17
+//#define PWM_1_PIN                           12
+//#define PWM_2_PIN                           13
+//#define SPARE_IO                            17
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         16
+#define BEEPER_PIN                            16
 
 // Pins for DOGM SPI LCD Support
-#define DOGLCD_A0          39
-#define DOGLCD_CS          35
-#define DOGLCD_MOSI        48
-#define DOGLCD_SCK         49
+#define DOGLCD_A0                             39
+#define DOGLCD_CS                             35
+#define DOGLCD_MOSI                           48
+#define DOGLCD_SCK                            49
 #define LCD_SCREEN_ROT_180
 
 // The encoder and click button
-#define BTN_EN1            36
-#define BTN_EN2            34
-#define BTN_ENC            38
+#define BTN_EN1                               36
+#define BTN_EN2                               34
+#define BTN_ENC                               38
 
 // Hardware buttons for manual movement of XYZ
-#define SHIFT_OUT          42
-#define SHIFT_LD           41
-#define SHIFT_CLK          40
+#define SHIFT_OUT                             42
+#define SHIFT_LD                              41
+#define SHIFT_CLK                             40
 
-//#define UI1              43
-//#define UI2              37
+//#define UI1                                 43
+//#define UI2                                 37
 
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   10   // TOOL_0_PWM_PIN
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      10  // TOOL_0_PWM_PIN

Marlin/src/pins/mega/pins_CNCONTROLS_15.h

@@ -34,79 +34,79 @@
 //
 // Servos
 //
-#define SERVO0_PIN          6
+#define SERVO0_PIN                             6
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN         34
-#define Y_STOP_PIN         39
-#define Z_STOP_PIN         62
+#define X_STOP_PIN                            34
+#define Y_STOP_PIN                            39
+#define Z_STOP_PIN                            62
 
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  49
+  #define Z_MIN_PROBE_PIN                     49
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         14
-#define X_DIR_PIN          25
-#define X_ENABLE_PIN       26
+#define X_STEP_PIN                            14
+#define X_DIR_PIN                             25
+#define X_ENABLE_PIN                          26
 
-#define Y_STEP_PIN         11
-#define Y_DIR_PIN          12
-#define Y_ENABLE_PIN       15
+#define Y_STEP_PIN                            11
+#define Y_DIR_PIN                             12
+#define Y_ENABLE_PIN                          15
 
-#define Z_STEP_PIN         24
-#define Z_DIR_PIN          27
-#define Z_ENABLE_PIN       28
+#define Z_STEP_PIN                            24
+#define Z_DIR_PIN                             27
+#define Z_ENABLE_PIN                          28
 
-#define E0_STEP_PIN        64
-#define E0_DIR_PIN         65
-#define E0_ENABLE_PIN      63
+#define E0_STEP_PIN                           64
+#define E0_DIR_PIN                            65
+#define E0_ENABLE_PIN                         63
 
 //
 // Temperature Sensors
 // Analog Inputs
 //
-#define TEMP_0_PIN          2   // Analog Input
-#define TEMP_BED_PIN        4   // Analog Input
+#define TEMP_0_PIN                             2  // Analog Input
+#define TEMP_BED_PIN                           4  // Analog Input
 
 #ifndef TEMP_CHAMBER_PIN
-  #define TEMP_CHAMBER_PIN  5   // Analog Input
+  #define TEMP_CHAMBER_PIN                     5  // Analog Input
 #endif
 
 //
 // Heaters
 //
-#define HEATER_0_PIN        4
-#define HEATER_BED_PIN     32
-#define HEATER_CHAMBER_PIN 33
+#define HEATER_0_PIN                           4
+#define HEATER_BED_PIN                        32
+#define HEATER_CHAMBER_PIN                    33
 
 //
 // Fans
 //
-#define FAN_PIN               8
-#define ORIG_E0_AUTO_FAN_PIN 30
-#define ORIG_E1_AUTO_FAN_PIN 30
-#define ORIG_E2_AUTO_FAN_PIN 30
-#define ORIG_E3_AUTO_FAN_PIN 30
-//#define ORIG_CHAMBER_AUTO_FAN_PIN 10
+#define FAN_PIN                                8
+#define ORIG_E0_AUTO_FAN_PIN                  30
+#define ORIG_E1_AUTO_FAN_PIN                  30
+#define ORIG_E2_AUTO_FAN_PIN                  30
+#define ORIG_E3_AUTO_FAN_PIN                  30
+//#define ORIG_CHAMBER_AUTO_FAN_PIN           10
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      40
+#define SDSS                                  53
+#define SD_DETECT_PIN                         40
 
 // Common I/O
 
-#define FIL_RUNOUT_PIN      9
-//#define FIL_RUNOUT_PIN     29  // encoder sensor
-//#define PWM_1_PIN          12
-//#define PWM_2_PIN          13
-//#define SPARE_IO           17
-#define BEEPER_PIN         13
-#define STAT_LED_BLUE_PIN  -1
-#define STAT_LED_RED_PIN   10 // 31
+#define FIL_RUNOUT_PIN                         9
+//#define FIL_RUNOUT_PIN                      29  // encoder sensor
+//#define PWM_1_PIN                           12
+//#define PWM_2_PIN                           13
+//#define SPARE_IO                            17
+#define BEEPER_PIN                            13
+#define STAT_LED_BLUE_PIN                     -1
+#define STAT_LED_RED_PIN                      10  // 31

Marlin/src/pins/mega/pins_EINSTART-S.h

@@ -35,48 +35,48 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         44
-#define Y_STOP_PIN         43
-#define Z_STOP_PIN         42
+#define X_STOP_PIN                            44
+#define Y_STOP_PIN                            43
+#define Z_STOP_PIN                            42
 
 //
 // Steppers
 //
-#define X_STEP_PIN         76
-#define X_DIR_PIN          75
-#define X_ENABLE_PIN       73
+#define X_STEP_PIN                            76
+#define X_DIR_PIN                             75
+#define X_ENABLE_PIN                          73
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          32
-#define Y_ENABLE_PIN       72
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             32
+#define Y_ENABLE_PIN                          72
 
-#define Z_STEP_PIN         34
-#define Z_DIR_PIN          35
-#define Z_ENABLE_PIN       33
+#define Z_STEP_PIN                            34
+#define Z_DIR_PIN                             35
+#define Z_ENABLE_PIN                          33
 
-#define E0_STEP_PIN        36
-#define E0_DIR_PIN         37
-#define E0_ENABLE_PIN      30
+#define E0_STEP_PIN                           36
+#define E0_DIR_PIN                            37
+#define E0_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          0   // Analog Input
-#define TEMP_BED_PIN        1   // Analog Input
+#define TEMP_0_PIN                             0  // Analog Input
+#define TEMP_BED_PIN                           1  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       83
-#define HEATER_BED_PIN     38
+#define HEATER_0_PIN                          83
+#define HEATER_BED_PIN                        38
 
-#define FAN_PIN            82
+#define FAN_PIN                               82
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN             4
+#define SDSS                                  53
+#define LED_PIN                                4
 
 //////////////////////////
 // LCDs and Controllers //
@@ -90,24 +90,24 @@
 // u8glib constructor
 // U8GLIB_SH1106_128X64 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, LCD_PINS_DC, LCD_PINS_RS);
 
-#define LCD_PINS_DC        78
-#define LCD_PINS_RS        79
+#define LCD_PINS_DC                           78
+#define LCD_PINS_RS                           79
 // DOGM SPI LCD Support
-#define DOGLCD_CS           3
-#define DOGLCD_MOSI         2
-#define DOGLCD_SCK          5
-#define DOGLCD_A0           2
+#define DOGLCD_CS                              3
+#define DOGLCD_MOSI                            2
+#define DOGLCD_SCK                             5
+#define DOGLCD_A0                              2
 
 //
 // LCD Display input pins
 //
-#define BTN_UP             25
-#define BTN_DWN            26
-#define BTN_LFT            27
-#define BTN_RT             28
+#define BTN_UP                                25
+#define BTN_DWN                               26
+#define BTN_LFT                               27
+#define BTN_RT                                28
 
 // 'OK' button
-#define BTN_ENC            29
+#define BTN_ENC                               29
 
 // Set Kill to right arrow, same as RIGID_PANEL
-#define KILL_PIN           28
+#define KILL_PIN                              28

Marlin/src/pins/mega/pins_ELEFU_3.h

@@ -34,115 +34,115 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          35
-#define X_MAX_PIN          34
-#define Y_MIN_PIN          33
-#define Y_MAX_PIN          32
-#define Z_MIN_PIN          31
-#define Z_MAX_PIN          30
+#define X_MIN_PIN                             35
+#define X_MAX_PIN                             34
+#define Y_MIN_PIN                             33
+#define Y_MAX_PIN                             32
+#define Z_MIN_PIN                             31
+#define Z_MAX_PIN                             30
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  30
+  #define Z_MIN_PROBE_PIN                     30
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         49
-#define X_DIR_PIN          13
-#define X_ENABLE_PIN       48
+#define X_STEP_PIN                            49
+#define X_DIR_PIN                             13
+#define X_ENABLE_PIN                          48
 
-#define Y_STEP_PIN         11
-#define Y_DIR_PIN           9
-#define Y_ENABLE_PIN       12
+#define Y_STEP_PIN                            11
+#define Y_DIR_PIN                              9
+#define Y_ENABLE_PIN                          12
 
-#define Z_STEP_PIN          7
-#define Z_DIR_PIN           6
-#define Z_ENABLE_PIN        8
+#define Z_STEP_PIN                             7
+#define Z_DIR_PIN                              6
+#define Z_ENABLE_PIN                           8
 
-#define E0_STEP_PIN        40
-#define E0_DIR_PIN         41
-#define E0_ENABLE_PIN      37
+#define E0_STEP_PIN                           40
+#define E0_DIR_PIN                            41
+#define E0_ENABLE_PIN                         37
 
-#define E1_STEP_PIN        18
-#define E1_DIR_PIN         19
-#define E1_ENABLE_PIN      38
+#define E1_STEP_PIN                           18
+#define E1_DIR_PIN                            19
+#define E1_ENABLE_PIN                         38
 
-#define E2_STEP_PIN        43
-#define E2_DIR_PIN         47
-#define E2_ENABLE_PIN      42
+#define E2_STEP_PIN                           43
+#define E2_DIR_PIN                            47
+#define E2_ENABLE_PIN                         42
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          3   // Analog Input
-#define TEMP_1_PIN          2   // Analog Input
-#define TEMP_2_PIN          1   // Analog Input
-#define TEMP_BED_PIN        0   // Analog Input
+#define TEMP_0_PIN                             3  // Analog Input
+#define TEMP_1_PIN                             2  // Analog Input
+#define TEMP_2_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                           0  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       45   // 12V PWM1
-#define HEATER_1_PIN       46   // 12V PWM2
-#define HEATER_2_PIN       17   // 12V PWM3
-#define HEATER_BED_PIN     44   // DOUBLE 12V PWM
+#define HEATER_0_PIN                          45  // 12V PWM1
+#define HEATER_1_PIN                          46  // 12V PWM2
+#define HEATER_2_PIN                          17  // 12V PWM3
+#define HEATER_BED_PIN                        44  // DOUBLE 12V PWM
 
 #ifndef FAN_PIN
-  #define FAN_PIN          16   // 5V PWM
+  #define FAN_PIN                             16  // 5V PWM
 #endif
 
 //
 // Misc. Functions
 //
-#define PS_ON_PIN          10   // Set to -1 if using a manual switch on the PWRSW Connector
-#define SLEEP_WAKE_PIN     26   // This feature still needs work
-#define PHOTOGRAPH_PIN     29
+#define PS_ON_PIN                             10  // Set to -1 if using a manual switch on the PWRSW Connector
+#define SLEEP_WAKE_PIN                        26  // This feature still needs work
+#define PHOTOGRAPH_PIN                        29
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         36
+#define BEEPER_PIN                            36
 
 #if ENABLED(RA_CONTROL_PANEL)
 
-  #define SDSS             53
-  #define SD_DETECT_PIN    28
+  #define SDSS                                53
+  #define SD_DETECT_PIN                       28
 
-  #define BTN_EN1          14
-  #define BTN_EN2          39
-  #define BTN_ENC          15
+  #define BTN_EN1                             14
+  #define BTN_EN2                             39
+  #define BTN_ENC                             15
 
 #endif // RA_CONTROL_PANEL
 
 #if ENABLED(RA_DISCO)
   // variables for which pins the TLC5947 is using
-  #define TLC_CLOCK_PIN    25
-  #define TLC_BLANK_PIN    23
-  #define TLC_XLAT_PIN     22
-  #define TLC_DATA_PIN     24
+  #define TLC_CLOCK_PIN                       25
+  #define TLC_BLANK_PIN                       23
+  #define TLC_XLAT_PIN                        22
+  #define TLC_DATA_PIN                        24
 
   // We also need to define pin to port number mapping for the 2560 to match the pins listed above.
   // If you change the TLC pins, update this as well per the 2560 datasheet! This currently only works with the RA Board.
-  #define TLC_CLOCK_BIT     3
+  #define TLC_CLOCK_BIT                        3
   #define TLC_CLOCK_PORT    &PORTA
 
-  #define TLC_BLANK_BIT     1
+  #define TLC_BLANK_BIT                        1
   #define TLC_BLANK_PORT    &PORTA
 
-  #define TLC_DATA_BIT      2
+  #define TLC_DATA_BIT                         2
   #define TLC_DATA_PORT     &PORTA
 
-  #define TLC_XLAT_BIT      0
+  #define TLC_XLAT_BIT                         0
   #define TLC_XLAT_PORT     &PORTA
 
   // Change this to match your situation. Lots of TLCs takes up the arduino SRAM very quickly, so be careful
   // Leave it at at least 1 if you have enabled RA_LIGHTING
   // The number of TLC5947 boards chained together for use with the animation, additional ones will repeat the animation on them, but are not individually addressable and mimic those before them. You can leave the default at 2 even if you only have 1 TLC5947 module.
-  #define NUM_TLCS          2
+  #define NUM_TLCS                             2
 
   // These TRANS_ARRAY values let you change the order the LEDs on the lighting modules will animate for chase functions.
   // Modify them according to your specific situation.

Marlin/src/pins/mega/pins_GT2560_REV_A.h

@@ -39,102 +39,102 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          22
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          26
-#define Y_MAX_PIN          28
-#define Z_MIN_PIN          30
-#define Z_MAX_PIN          32
+#define X_MIN_PIN                             22
+#define X_MAX_PIN                             24
+#define Y_MIN_PIN                             26
+#define Y_MAX_PIN                             28
+#define Z_MIN_PIN                             30
+#define Z_MAX_PIN                             32
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
-#define E0_STEP_PIN        43
-#define E0_DIR_PIN         45
-#define E0_ENABLE_PIN      41
+#define E0_STEP_PIN                           43
+#define E0_DIR_PIN                            45
+#define E0_ENABLE_PIN                         41
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8
-#define TEMP_1_PIN          9
-#define TEMP_BED_PIN       10
+#define TEMP_0_PIN                             8
+#define TEMP_1_PIN                             9
+#define TEMP_BED_PIN                          10
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define SUICIDE_PIN        54   // Must be enabled at startup to keep power flowing
-#define KILL_PIN           -1
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define SUICIDE_PIN                           54  // Must be enabled at startup to keep power flowing
+#define KILL_PIN                              -1
 
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
     #if ENABLED(MKS_MINI_12864)
-      #define DOGLCD_A0     5
-      #define DOGLCD_CS    21
-      #define BTN_EN1      40
-      #define BTN_EN2      42
+      #define DOGLCD_A0                        5
+      #define DOGLCD_CS                       21
+      #define BTN_EN1                         40
+      #define BTN_EN2                         42
     #else
-      #define LCD_PINS_RS  20
-      #define LCD_PINS_ENABLE 17
-      #define LCD_PINS_D4  16
-      #define LCD_PINS_D5  21
-      #define LCD_PINS_D6   5
-      #define LCD_PINS_D7   6
-      #define BTN_EN1      42
-      #define BTN_EN2      40
+      #define LCD_PINS_RS                     20
+      #define LCD_PINS_ENABLE                 17
+      #define LCD_PINS_D4                     16
+      #define LCD_PINS_D5                     21
+      #define LCD_PINS_D6                      5
+      #define LCD_PINS_D7                      6
+      #define BTN_EN1                         42
+      #define BTN_EN2                         40
     #endif
 
-    #define BTN_ENC        19
-    #define SD_DETECT_PIN  38
+    #define BTN_ENC                           19
+    #define SD_DETECT_PIN                     38
 
-  #else // !NEWPANEL
+  #else                                           // !NEWPANEL
 
-    #define SHIFT_CLK      38
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      40
-    #define SHIFT_EN       17
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
 
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4     6
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6    20
-    #define LCD_PINS_D7    19
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
-    #define SD_DETECT_PIN  -1
+    #define SD_DETECT_PIN                     -1
 
   #endif // !NEWPANEL
 

Marlin/src/pins/mega/pins_GT2560_V3.h

@@ -36,33 +36,33 @@
 //
 // Servos
 //
-#define SERVO0_PIN         11   //13 untested  3Dtouch
+#define SERVO0_PIN                            11  //13 untested  3Dtouch
 
 //
 // Limit Switches
 //
 #ifndef X_STOP_PIN
   #ifndef X_MIN_PIN
-    #define X_MIN_PIN      24
+    #define X_MIN_PIN                         24
   #endif
   #ifndef X_MAX_PIN
-    #define X_MAX_PIN      22
+    #define X_MAX_PIN                         22
   #endif
 #endif
 #ifndef Y_STOP_PIN
   #ifndef Y_MIN_PIN
-    #define Y_MIN_PIN      28
+    #define Y_MIN_PIN                         28
   #endif
   #ifndef Y_MAX_PIN
-    #define Y_MAX_PIN      26
+    #define Y_MAX_PIN                         26
   #endif
 #endif
 #ifndef Z_STOP_PIN
   #ifndef Z_MIN_PIN
-    #define Z_MIN_PIN      30
+    #define Z_MIN_PIN                         30
   #endif
   #ifndef Z_MAX_PIN
-    #define Z_MAX_PIN      32
+    #define Z_MAX_PIN                         32
   #endif
 #endif
 
@@ -70,116 +70,116 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  32
+  #define Z_MIN_PROBE_PIN                     32
 #endif
 
 //
 // Runout Sensor
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   66
+  #define FIL_RUNOUT_PIN                      66
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN  67
+  #define FIL_RUNOUT2_PIN                     67
 #endif
 
 //
 // Power Recovery
 //
-#define POWER_LOSS_PIN     69   // Pin to detect power loss
-#define POWER_LOSS_STATE   LOW
+#define POWER_LOSS_PIN                        69  // Pin to detect power loss
+#define POWER_LOSS_STATE                     LOW
 
 //
 // Steppers
 //
-#define X_STEP_PIN         37
-#define X_DIR_PIN          39
-#define X_ENABLE_PIN       35
+#define X_STEP_PIN                            37
+#define X_DIR_PIN                             39
+#define X_ENABLE_PIN                          35
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         25
-#define Z_DIR_PIN          23
-#define Z_ENABLE_PIN       27
+#define Z_STEP_PIN                            25
+#define Z_DIR_PIN                             23
+#define Z_ENABLE_PIN                          27
 
-#define E0_STEP_PIN        46
-#define E0_DIR_PIN         44
-#define E0_ENABLE_PIN      12
+#define E0_STEP_PIN                           46
+#define E0_DIR_PIN                            44
+#define E0_ENABLE_PIN                         12
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
-#define E2_STEP_PIN        43
-#define E2_DIR_PIN         45
-#define E2_ENABLE_PIN      41
+#define E2_STEP_PIN                           43
+#define E2_DIR_PIN                            45
+#define E2_ENABLE_PIN                         41
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         11   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_2_PIN          1   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                            11  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_2_PIN                             1  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       10
-#define HEATER_1_PIN        3
-#define HEATER_2_PIN        1
-#define HEATER_BED_PIN      4
-#define FAN_PIN             9
-#define FAN1_PIN            8
-#define FAN2_PIN            7
+#define HEATER_0_PIN                          10
+#define HEATER_1_PIN                           3
+#define HEATER_2_PIN                           1
+#define HEATER_BED_PIN                         4
+#define FAN_PIN                                9
+#define FAN1_PIN                               8
+#define FAN2_PIN                               7
 
 //
 // Misc. Functions
 //
-#define SD_DETECT_PIN      38
-#define SDSS               53
-#define LED_PIN             6
-#define PS_ON_PIN          12
-#define SUICIDE_PIN        54   // This pin must be enabled at boot to keep power flowing
+#define SD_DETECT_PIN                         38
+#define SDSS                                  53
+#define LED_PIN                                6
+#define PS_ON_PIN                             12
+#define SUICIDE_PIN                           54  // This pin must be enabled at boot to keep power flowing
 
 #ifndef CASE_LIGHT_PIN
-  #define CASE_LIGHT_PIN    6   // 21
+  #define CASE_LIGHT_PIN                       6  // 21
 #endif
 
 //
 // LCD Controller
 //
-#define BEEPER_PIN         18
+#define BEEPER_PIN                            18
 
 #ifndef LCD_PINS_RS
-  #define LCD_PINS_RS      20
+  #define LCD_PINS_RS                         20
 #endif
 #ifndef LCD_PINS_ENABLE
-  #define LCD_PINS_ENABLE  17
+  #define LCD_PINS_ENABLE                     17
 #endif
 #ifndef LCD_PINS_D4
-  #define LCD_PINS_D4      16
+  #define LCD_PINS_D4                         16
 #endif
 #ifndef LCD_PINS_D5
-  #define LCD_PINS_D5      21
+  #define LCD_PINS_D5                         21
 #endif
 #ifndef LCD_PINS_D6
-  #define LCD_PINS_D6       5
+  #define LCD_PINS_D6                          5
 #endif
 #ifndef LCD_PINS_D7
-  #define LCD_PINS_D7      36
+  #define LCD_PINS_D7                         36
 #endif
 
 #if ENABLED(NEWPANEL)
   #ifndef BTN_EN1
-    #define BTN_EN1        42
+    #define BTN_EN1                           42
   #endif
   #ifndef BTN_EN2
-    #define BTN_EN2        40
+    #define BTN_EN2                           40
   #endif
   #ifndef BTN_ENC
-    #define BTN_ENC        19
+    #define BTN_ENC                           19
   #endif
 #endif

Marlin/src/pins/mega/pins_GT2560_V3_A20.h

@@ -25,15 +25,15 @@
  * Geeetech A20M pin assignment
  */
 
-#define LCD_PINS_RS       5
-#define LCD_PINS_ENABLE  36
-#define LCD_PINS_D4      21
-#define LCD_PINS_D7       6
+#define LCD_PINS_RS                           5
+#define LCD_PINS_ENABLE                      36
+#define LCD_PINS_D4                          21
+#define LCD_PINS_D7                           6
 
 #if ENABLED(NEWPANEL)
-  #define BTN_EN1        16
-  #define BTN_EN2        17
-  #define BTN_ENC        19
+  #define BTN_EN1                            16
+  #define BTN_EN2                            17
+  #define BTN_ENC                            19
 #endif
 
 #include "pins_GT2560_V3.h"

Marlin/src/pins/mega/pins_GT2560_V3_MC2.h

@@ -27,9 +27,9 @@
 
 #define BOARD_INFO_NAME "GT2560 V3.0 (MC2)"
 
-#define X_MIN_PIN          22
-#define X_MAX_PIN          24
-#define Y_MIN_PIN          26
-#define Y_MAX_PIN          28
+#define X_MIN_PIN                            22
+#define X_MAX_PIN                            24
+#define Y_MIN_PIN                            26
+#define Y_MAX_PIN                            28
 
 #include "pins_GT2560_V3.h"

Marlin/src/pins/mega/pins_HJC2560C_REV2.h

@@ -42,79 +42,79 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         22
-#define Y_STOP_PIN         26
-#define Z_STOP_PIN         29
-//#define EXP_STOP_PIN       28
+#define X_STOP_PIN                            22
+#define Y_STOP_PIN                            26
+#define Z_STOP_PIN                            29
+//#define EXP_STOP_PIN                        28
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         32
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       31
+#define Y_STEP_PIN                            32
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          31
 
-#define Z_STEP_PIN         35
-#define Z_DIR_PIN          36
-#define Z_ENABLE_PIN       34
+#define Z_STEP_PIN                            35
+#define Z_DIR_PIN                             36
+#define Z_ENABLE_PIN                          34
 
-#define E0_STEP_PIN        42
-#define E0_DIR_PIN         43
-#define E0_ENABLE_PIN      37
+#define E0_STEP_PIN                           42
+#define E0_DIR_PIN                            43
+#define E0_ENABLE_PIN                         37
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
-#define MOTOR_CURRENT_PWM_XY_PIN   44
-#define MOTOR_CURRENT_PWM_Z_PIN    45
-#define MOTOR_CURRENT_PWM_E_PIN    46
+#define MOTOR_CURRENT_PWM_XY_PIN              44
+#define MOTOR_CURRENT_PWM_Z_PIN               45
+#define MOTOR_CURRENT_PWM_E_PIN               46
 // Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
 #ifndef MOTOR_CURRENT_PWM_RANGE
-  #define MOTOR_CURRENT_PWM_RANGE  2000
+  #define MOTOR_CURRENT_PWM_RANGE            2000
 #endif
 #define DEFAULT_PWM_MOTOR_CURRENT  { 1300, 1300, 1250 }
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7   //默认不使用PWM_FAN冷却喷嘴，如果需要，则取消注释
+  #define FAN_PIN                              7  //默认不使用PWM_FAN冷却喷嘴，如果需要，则取消注释
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define SD_DETECT_PIN      39
-//#define LED_PIN           8
-#define CASE_LIGHT_PIN      8           // 8 默认挤出机风扇作为Case LED，如果需要PWM FAN,则需要将FAN_PIN置为7，LED_PIN置为8
+#define SDSS                                  53
+#define SD_DETECT_PIN                         39
+//#define LED_PIN                              8
+#define CASE_LIGHT_PIN                         8  // 8 默认挤出机风扇作为Case LED，如果需要PWM FAN,则需要将FAN_PIN置为7，LED_PIN置为8
 
-//#define SAFETY_TRIGGERED_PIN     28   // PIN to detect the safety circuit has triggered
-//#define MAIN_VOLTAGE_MEASURE_PIN 14   // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
+//#define SAFETY_TRIGGERED_PIN                28  // PIN to detect the safety circuit has triggered
+//#define MAIN_VOLTAGE_MEASURE_PIN            14  // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
 #if ENABLED(SPINDLE_LASER_ENABLE)
-  #define SPINDLE_DIR_PIN           16
-  #define SPINDLE_LASER_ENABLE_PIN  17   // Pin should have a pullup!
-  #define SPINDLE_LASER_PWM_PIN      9   // Hardware PWM
+  #define SPINDLE_DIR_PIN                     16
+  #define SPINDLE_LASER_ENABLE_PIN            17  // Pin should have a pullup!
+  #define SPINDLE_LASER_PWM_PIN                9  // Hardware PWM
 #endif
 
 //
@@ -122,48 +122,48 @@
 //
 #if HAS_SPI_LCD
 
-  #define BEEPER_PIN       18
+  #define BEEPER_PIN                          18
 
   #if ENABLED(NEWPANEL)
 
-    #define LCD_PINS_RS     20   // LCD_CS
-    #define LCD_PINS_ENABLE 15   // LCD_SDA
-    #define LCD_PINS_D4     14   // LCD_SCK
+    #define LCD_PINS_RS                       20  // LCD_CS
+    #define LCD_PINS_ENABLE                   15  // LCD_SDA
+    #define LCD_PINS_D4                       14  // LCD_SCK
 
     #if ENABLED(HJC_LCD_SMART_CONTROLLER)
-      #define LCD_BACKLIGHT_PIN  5   // LCD_Backlight
+      #define LCD_BACKLIGHT_PIN                5  // LCD_Backlight
       //#ifndef LCD_CONTRAST_PIN
       //  #define LCD_CONTRAST_PIN  5   // LCD_Contrast
       //#endif
       #ifndef FIL_RUNOUT_PIN
-        #define FIL_RUNOUT_PIN 24   // Filament runout
+        #define FIL_RUNOUT_PIN                24  // Filament runout
       #endif
     #else
-      #define LCD_PINS_D5  21
-      #define LCD_PINS_D6   5
-      #define LCD_PINS_D7   6
+      #define LCD_PINS_D5                     21
+      #define LCD_PINS_D6                      5
+      #define LCD_PINS_D7                      6
     #endif
 
-    #define BTN_EN1        41
-    #define BTN_EN2        40
-    #define BTN_ENC        19
+    #define BTN_EN1                           41
+    #define BTN_EN2                           40
+    #define BTN_ENC                           19
 
-    #define SD_DETECT_PIN  39
+    #define SD_DETECT_PIN                     39
 
   #else
 
     // Buttons attached to a shift register
-    #define SHIFT_CLK      38
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      40
-    #define SHIFT_EN       17
-
-    #define LCD_PINS_RS    16
-    #define LCD_PINS_ENABLE 5
-    #define LCD_PINS_D4     6
-    #define LCD_PINS_D5    21
-    #define LCD_PINS_D6    20
-    #define LCD_PINS_D7    19
+    #define SHIFT_CLK                         38
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         40
+    #define SHIFT_EN                          17
+
+    #define LCD_PINS_RS                       16
+    #define LCD_PINS_ENABLE                    5
+    #define LCD_PINS_D4                        6
+    #define LCD_PINS_D5                       21
+    #define LCD_PINS_D6                       20
+    #define LCD_PINS_D7                       19
 
   #endif // !NEWPANEL
 

Marlin/src/pins/mega/pins_LEAPFROG.h

@@ -34,59 +34,59 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          47
-#define X_MAX_PIN           2
-#define Y_MIN_PIN          48
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          49
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                             47
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                             48
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             49
+#define Z_MAX_PIN                             -1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         28
-#define X_DIR_PIN          63
-#define X_ENABLE_PIN       29
+#define X_STEP_PIN                            28
+#define X_DIR_PIN                             63
+#define X_ENABLE_PIN                          29
 
-#define Y_STEP_PIN         14   // A6
-#define Y_DIR_PIN          15   // A0
-#define Y_ENABLE_PIN       39
+#define Y_STEP_PIN                            14  // A6
+#define Y_DIR_PIN                             15  // A0
+#define Y_ENABLE_PIN                          39
 
-#define Z_STEP_PIN         31   // A2
-#define Z_DIR_PIN          32   // A6
-#define Z_ENABLE_PIN       30   // A1
+#define Z_STEP_PIN                            31  // A2
+#define Z_DIR_PIN                             32  // A6
+#define Z_ENABLE_PIN                          30  // A1
 
-#define E0_STEP_PIN        34   // 34
-#define E0_DIR_PIN         35   // 35
-#define E0_ENABLE_PIN      33   // 33
+#define E0_STEP_PIN                           34  // 34
+#define E0_DIR_PIN                            35  // 35
+#define E0_ENABLE_PIN                         33  // 33
 
-#define E1_STEP_PIN        37   // 37
-#define E1_DIR_PIN         40   // 40
-#define E1_ENABLE_PIN      36   // 36
+#define E1_STEP_PIN                           37  // 37
+#define E1_DIR_PIN                            40  // 40
+#define E1_ENABLE_PIN                         36  // 36
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         13   // Analog Input (D27)
-#define TEMP_1_PIN         15   // Analog Input (1)
-#define TEMP_BED_PIN       14   // Analog Input (1,2 or I2C)
+#define TEMP_0_PIN                            13  // Analog Input (D27)
+#define TEMP_1_PIN                            15  // Analog Input (1)
+#define TEMP_BED_PIN                          14  // Analog Input (1,2 or I2C)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8   // 12
-#define HEATER_2_PIN       11   // 13
-#define HEATER_BED_PIN     10   // 14/15
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8  // 12
+#define HEATER_2_PIN                          11  // 13
+#define HEATER_BED_PIN                        10  // 14/15
 
-#define FAN_PIN             7
+#define FAN_PIN                                7
 
 //
 // Misc. Functions
 //
-#define SDSS               11
-#define LED_PIN            13
-#define SOL1_PIN           16
-#define SOL2_PIN           17
+#define SDSS                                  11
+#define LED_PIN                               13
+#define SOL1_PIN                              16
+#define SOL2_PIN                              17
 
 /*  Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31)  */

Marlin/src/pins/mega/pins_LEAPFROG_XEED2015.h

@@ -38,9 +38,9 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         47   // 'X Min'
-#define Y_STOP_PIN         48   // 'Y Min'
-#define Z_STOP_PIN         49   // 'Z Min'
+#define X_STOP_PIN                            47  // 'X Min'
+#define Y_STOP_PIN                            48  // 'Y Min'
+#define Z_STOP_PIN                            49  // 'Z Min'
 
 //
 // Steppers
@@ -51,65 +51,65 @@
 //
 
 // X-axis signal-level connector
-#define X_STEP_PIN         65
-#define X_DIR_PIN          64
-#define X_ENABLE_PIN       66   // Not actually used on Xeed, could be repurposed
+#define X_STEP_PIN                            65
+#define X_DIR_PIN                             64
+#define X_ENABLE_PIN                          66  // Not actually used on Xeed, could be repurposed
 
 // Y-axis signal-level connector
-#define Y_STEP_PIN         23
-#define Y_DIR_PIN          22
-#define Y_ENABLE_PIN       24   // Not actually used on Xeed, could be repurposed
+#define Y_STEP_PIN                            23
+#define Y_DIR_PIN                             22
+#define Y_ENABLE_PIN                          24  // Not actually used on Xeed, could be repurposed
 
 // ZMOT connector (Front Right Z Motor)
-#define Z_STEP_PIN         31
-#define Z_DIR_PIN          32
-#define Z_ENABLE_PIN       30
+#define Z_STEP_PIN                            31
+#define Z_DIR_PIN                             32
+#define Z_ENABLE_PIN                          30
 
 // XMOT connector (Rear Z Motor)
-#define Z2_STEP_PIN        28
-#define Z2_DIR_PIN         63
-#define Z2_ENABLE_PIN      29
+#define Z2_STEP_PIN                           28
+#define Z2_DIR_PIN                            63
+#define Z2_ENABLE_PIN                         29
 
 // YMOT connector (Front Left Z Motor)
-#define Z3_STEP_PIN        14
-#define Z3_DIR_PIN         15
-#define Z3_ENABLE_PIN      39
+#define Z3_STEP_PIN                           14
+#define Z3_DIR_PIN                            15
+#define Z3_ENABLE_PIN                         39
 
 // EMOT2 connector
-#define E0_STEP_PIN        37
-#define E0_DIR_PIN         40
-#define E0_ENABLE_PIN      36
+#define E0_STEP_PIN                           37
+#define E0_DIR_PIN                            40
+#define E0_ENABLE_PIN                         36
 
 // EMOT connector
-#define E1_STEP_PIN        34
-#define E1_DIR_PIN         35
-#define E1_ENABLE_PIN      33
+#define E1_STEP_PIN                           34
+#define E1_DIR_PIN                            35
+#define E1_ENABLE_PIN                         33
 
 //
 // Filament runout
 //
-#define FIL_RUNOUT_PIN     42   // ROT2 Connector
-#define FIL_RUNOUT2_PIN    44   // ROT1 Connector
+#define FIL_RUNOUT_PIN                        42  // ROT2 Connector
+#define FIL_RUNOUT2_PIN                       44  // ROT1 Connector
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN         15   // T3 Connector
-#define TEMP_1_PIN         13   // T1 Connector
-#define TEMP_BED_PIN       14   // BED Connector (Between T1 and T3)
+#define TEMP_0_PIN                            15  // T3 Connector
+#define TEMP_1_PIN                            13  // T1 Connector
+#define TEMP_BED_PIN                          14  // BED Connector (Between T1 and T3)
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        8   // Misc Connector, pins 3 and 4 (Out2)
-#define HEATER_1_PIN        9   // Misc Connector, pins 5 and 6 (Out3)
-#define HEATER_BED_PIN      6   // Misc Connector, pins 9(-) and 10(+) (OutA)
+#define HEATER_0_PIN                           8  // Misc Connector, pins 3 and 4 (Out2)
+#define HEATER_1_PIN                           9  // Misc Connector, pins 5 and 6 (Out3)
+#define HEATER_BED_PIN                         6  // Misc Connector, pins 9(-) and 10(+) (OutA)
 
-#define FAN_PIN            10   // Misc Connector, pins 7(-) and 8 (+) (Out4)
+#define FAN_PIN                               10  // Misc Connector, pins 7(-) and 8 (+) (Out4)
 
-#define LED_PIN            13
+#define LED_PIN                               13
 
-#define SOL1_PIN            7   // Misc Connector, pins 1(-) and 2(+) (Out1)
+#define SOL1_PIN                               7  // Misc Connector, pins 1(-) and 2(+) (Out1)
 
 // Door Closed Sensor
-//#define DOOR_PIN           45 // HM1 Connector
+//#define DOOR_PIN                            45  // HM1 Connector

Marlin/src/pins/mega/pins_MEGACONTROLLER.h

@@ -36,89 +36,89 @@
 //
 // Servos
 //
-#define SERVO0_PIN         30
-#define SERVO1_PIN         31
-#define SERVO2_PIN         32
-#define SERVO3_PIN         33
+#define SERVO0_PIN                            30
+#define SERVO1_PIN                            31
+#define SERVO2_PIN                            32
+#define SERVO3_PIN                            33
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          43
-#define X_MAX_PIN          42
-#define Y_MIN_PIN          38
-#define Y_MAX_PIN          41
-#define Z_MIN_PIN          40
-#define Z_MAX_PIN          37
+#define X_MIN_PIN                             43
+#define X_MAX_PIN                             42
+#define Y_MIN_PIN                             38
+#define Y_MAX_PIN                             41
+#define Z_MIN_PIN                             40
+#define Z_MAX_PIN                             37
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  37
+  #define Z_MIN_PROBE_PIN                     37
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         62   // A8
-#define X_DIR_PIN          63   // A9
-#define X_ENABLE_PIN       61   // A7
+#define X_STEP_PIN                            62  // A8
+#define X_DIR_PIN                             63  // A9
+#define X_ENABLE_PIN                          61  // A7
 
-#define Y_STEP_PIN         65   // A11
-#define Y_DIR_PIN          66   // A12
-#define Y_ENABLE_PIN       64   // A10
+#define Y_STEP_PIN                            65  // A11
+#define Y_DIR_PIN                             66  // A12
+#define Y_ENABLE_PIN                          64  // A10
 
-#define Z_STEP_PIN         68   // A14
-#define Z_DIR_PIN          69   // A15
-#define Z_ENABLE_PIN       67   // A13
+#define Z_STEP_PIN                            68  // A14
+#define Z_DIR_PIN                             69  // A15
+#define Z_ENABLE_PIN                          67  // A13
 
-#define E0_STEP_PIN        23
-#define E0_DIR_PIN         24
-#define E0_ENABLE_PIN      22
+#define E0_STEP_PIN                           23
+#define E0_DIR_PIN                            24
+#define E0_ENABLE_PIN                         22
 
-#define E1_STEP_PIN        26
-#define E1_DIR_PIN         27
-#define E1_ENABLE_PIN      25
+#define E1_STEP_PIN                           26
+#define E1_DIR_PIN                            27
+#define E1_ENABLE_PIN                         25
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        4   // Analog Input
+  #define TEMP_0_PIN                           4  // Analog Input
 #else
-  #define TEMP_0_PIN        0   // Analog Input
+  #define TEMP_0_PIN                           0  // Analog Input
 #endif
 
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN        5   // Analog Input
+  #define TEMP_1_PIN                           5  // Analog Input
 #else
-  #define TEMP_1_PIN        2   // Analog Input
+  #define TEMP_1_PIN                           2  // Analog Input
 #endif
 
-#define TEMP_2_PIN          3   // Analog Input
+#define TEMP_2_PIN                             3  // Analog Input
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      6   // Analog Input
+  #define TEMP_BED_PIN                         6  // Analog Input
 #else
-  #define TEMP_BED_PIN      1   // Analog Input
+  #define TEMP_BED_PIN                         1  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN       29
-#define HEATER_1_PIN       34
-#define HEATER_BED_PIN     28
+#define HEATER_0_PIN                          29
+#define HEATER_1_PIN                          34
+#define HEATER_BED_PIN                        28
 
 #ifndef FAN_PIN
-  #define FAN_PIN          39
+  #define FAN_PIN                             39
 #endif
-#define FAN1_PIN           35
-#define FAN2_PIN           36
+#define FAN1_PIN                              35
+#define FAN2_PIN                              36
 
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN FAN2_PIN
+  #define CONTROLLER_FAN_PIN            FAN2_PIN
 #endif
 
 #define FAN_SOFT_PWM
@@ -126,39 +126,39 @@
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define CASE_LIGHT_PIN                         2
 
 //
 // LCD / Controller
 //
 #if ENABLED(MINIPANEL)
 
-  #define BEEPER_PIN       46
+  #define BEEPER_PIN                          46
   // Pins for DOGM SPI LCD Support
-  #define DOGLCD_A0        47
-  #define DOGLCD_CS        45
-  #define LCD_BACKLIGHT_PIN 44   // backlight LED on PA3
+  #define DOGLCD_A0                           47
+  #define DOGLCD_CS                           45
+  #define LCD_BACKLIGHT_PIN                   44  // backlight LED on PA3
 
-  #define KILL_PIN         12
+  #define KILL_PIN                            12
   // GLCD features
   // Uncomment screen orientation
   //#define LCD_SCREEN_ROT_90
   //#define LCD_SCREEN_ROT_180
   //#define LCD_SCREEN_ROT_270
 
-  #define BTN_EN1          48
-  #define BTN_EN2          11
-  #define BTN_ENC          10
+  #define BTN_EN1                             48
+  #define BTN_EN2                             11
+  #define BTN_ENC                             10
 
-  #define SD_DETECT_PIN    49
+  #define SD_DETECT_PIN                       49
 
 #endif // MINIPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     6   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN     7   // Pullup!
-#define SPINDLE_DIR_PIN           8
+#define SPINDLE_LASER_PWM_PIN                  6  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                  7  // Pullup!
+#define SPINDLE_DIR_PIN                        8

Marlin/src/pins/mega/pins_MEGATRONICS.h

@@ -33,99 +33,99 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          41
-#define X_MAX_PIN          37
-#define Y_MIN_PIN          14
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                             41
+#define X_MAX_PIN                             37
+#define Y_MIN_PIN                             14
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          28
-#define X_ENABLE_PIN       24
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             28
+#define X_ENABLE_PIN                          24
 
-#define Y_STEP_PIN         60   // A6
-#define Y_DIR_PIN          61   // A7
-#define Y_ENABLE_PIN       22
+#define Y_STEP_PIN                            60  // A6
+#define Y_DIR_PIN                             61  // A7
+#define Y_ENABLE_PIN                          22
 
-#define Z_STEP_PIN         54   // A0
-#define Z_DIR_PIN          55   // A1
-#define Z_ENABLE_PIN       56   // A2
+#define Z_STEP_PIN                            54  // A0
+#define Z_DIR_PIN                             55  // A1
+#define Z_ENABLE_PIN                          56  // A2
 
-#define E0_STEP_PIN        31
-#define E0_DIR_PIN         32
-#define E0_ENABLE_PIN      38
+#define E0_STEP_PIN                           31
+#define E0_DIR_PIN                            32
+#define E0_ENABLE_PIN                         38
 
-#define E1_STEP_PIN        34
-#define E1_DIR_PIN         36
-#define E1_ENABLE_PIN      30
+#define E1_STEP_PIN                           34
+#define E1_DIR_PIN                            36
+#define E1_ENABLE_PIN                         30
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        8   // Analog Input
+  #define TEMP_0_PIN                           8  // Analog Input
 #else
-  #define TEMP_0_PIN       13   // Analog Input
+  #define TEMP_0_PIN                          13  // Analog Input
 #endif
-#define TEMP_1_PIN         15   // Analog Input
-#define TEMP_BED_PIN       14   // Analog Input
+#define TEMP_1_PIN                            15  // Analog Input
+#define TEMP_BED_PIN                          14  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7   // IO pin. Buffer needed
+  #define FAN_PIN                              7  // IO pin. Buffer needed
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                         2
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         33
+#define BEEPER_PIN                            33
 
 #if BOTH(ULTRA_LCD, NEWPANEL)
 
-  #define LCD_PINS_RS     16
-  #define LCD_PINS_ENABLE 17
-  #define LCD_PINS_D4     23
-  #define LCD_PINS_D5     25
-  #define LCD_PINS_D6     27
-  #define LCD_PINS_D7     29
+  #define LCD_PINS_RS                         16
+  #define LCD_PINS_ENABLE                     17
+  #define LCD_PINS_D4                         23
+  #define LCD_PINS_D5                         25
+  #define LCD_PINS_D6                         27
+  #define LCD_PINS_D7                         29
 
   // Buttons directly attached to AUX-2
-  #define BTN_EN1         59
-  #define BTN_EN2         64
-  #define BTN_ENC         43
+  #define BTN_EN1                             59
+  #define BTN_EN2                             64
+  #define BTN_ENC                             43
 
-  #define SD_DETECT_PIN   -1   // RAMPS doesn't use this
+  #define SD_DETECT_PIN                       -1  // RAMPS doesn't use this
 
 #endif // HAS_SPI_LCD && NEWPANEL
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     3   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN     4   // Pullup!
-#define SPINDLE_DIR_PIN          11
+#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                  4  // Pullup!
+#define SPINDLE_DIR_PIN                       11

Marlin/src/pins/mega/pins_MEGATRONICS_2.h

@@ -33,120 +33,120 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          37
-#define X_MAX_PIN          40
-#define Y_MIN_PIN          41
-#define Y_MAX_PIN          38
-#define Z_MIN_PIN          18
-#define Z_MAX_PIN          19
+#define X_MIN_PIN                             37
+#define X_MAX_PIN                             40
+#define Y_MIN_PIN                             41
+#define Y_MAX_PIN                             38
+#define Z_MIN_PIN                             18
+#define Z_MAX_PIN                             19
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         26
-#define X_DIR_PIN          27
-#define X_ENABLE_PIN       25
+#define X_STEP_PIN                            26
+#define X_DIR_PIN                             27
+#define X_ENABLE_PIN                          25
 
-#define Y_STEP_PIN          4   // A6
-#define Y_DIR_PIN          54   // A0
-#define Y_ENABLE_PIN        5
+#define Y_STEP_PIN                             4  // A6
+#define Y_DIR_PIN                             54  // A0
+#define Y_ENABLE_PIN                           5
 
-#define Z_STEP_PIN         56   // A2
-#define Z_DIR_PIN          60   // A6
-#define Z_ENABLE_PIN       55   // A1
+#define Z_STEP_PIN                            56  // A2
+#define Z_DIR_PIN                             60  // A6
+#define Z_ENABLE_PIN                          55  // A1
 
-#define E0_STEP_PIN        35
-#define E0_DIR_PIN         36
-#define E0_ENABLE_PIN      34
+#define E0_STEP_PIN                           35
+#define E0_DIR_PIN                            36
+#define E0_ENABLE_PIN                         34
 
-#define E1_STEP_PIN        29
-#define E1_DIR_PIN         39
-#define E1_ENABLE_PIN      28
+#define E1_STEP_PIN                           29
+#define E1_DIR_PIN                            39
+#define E1_ENABLE_PIN                         28
 
-#define E2_STEP_PIN        23   // ? schematic says 24
-#define E2_DIR_PIN         24   // ? schematic says 23
-#define E2_ENABLE_PIN      22
+#define E2_STEP_PIN                           23  // ? schematic says 24
+#define E2_DIR_PIN                            24  // ? schematic says 23
+#define E2_ENABLE_PIN                         22
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN        4   // Analog Input
+  #define TEMP_0_PIN                           4  // Analog Input
 #else
-  #define TEMP_0_PIN       13   // Analog Input
+  #define TEMP_0_PIN                          13  // Analog Input
 #endif
 
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN        8   // Analog Input
+  #define TEMP_1_PIN                           8  // Analog Input
 #else
-  #define TEMP_1_PIN       15   // Analog Input
+  #define TEMP_1_PIN                          15  // Analog Input
 #endif
 
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      8   // Analog Input
+  #define TEMP_BED_PIN                         8  // Analog Input
 #else
-  #define TEMP_BED_PIN     14   // Analog Input
+  #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        9
-#define HEATER_1_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           9
+#define HEATER_1_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           7
+  #define FAN_PIN                              7
 #endif
-#define FAN1_PIN            6
+#define FAN1_PIN                               6
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN      2
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                         2
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#define SPINDLE_LASER_PWM_PIN     3   // Hardware PWM
-#define SPINDLE_LASER_ENA_PIN    16   // Pullup!
-#define SPINDLE_DIR_PIN          11
+#define SPINDLE_LASER_PWM_PIN                  3  // Hardware PWM
+#define SPINDLE_LASER_ENA_PIN                 16  // Pullup!
+#define SPINDLE_DIR_PIN                       11
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         64
+#define BEEPER_PIN                            64
 
 #if HAS_SPI_LCD
 
-  #define LCD_PINS_RS      14
-  #define LCD_PINS_ENABLE  15
-  #define LCD_PINS_D4      30
-  #define LCD_PINS_D5      31
-  #define LCD_PINS_D6      32
-  #define LCD_PINS_D7      33
+  #define LCD_PINS_RS                         14
+  #define LCD_PINS_ENABLE                     15
+  #define LCD_PINS_D4                         30
+  #define LCD_PINS_D5                         31
+  #define LCD_PINS_D6                         32
+  #define LCD_PINS_D7                         33
 
   #if ENABLED(NEWPANEL)
     // Buttons are directly attached using keypad
-    #define BTN_EN1        61
-    #define BTN_EN2        59
-    #define BTN_ENC        43
+    #define BTN_EN1                           61
+    #define BTN_EN2                           59
+    #define BTN_ENC                           43
   #else
     // Buttons attached to shift register of reprapworld keypad v1.1
-    #define SHIFT_CLK      63
-    #define SHIFT_LD       42
-    #define SHIFT_OUT      17
-    #define SHIFT_EN       17
+    #define SHIFT_CLK                         63
+    #define SHIFT_LD                          42
+    #define SHIFT_OUT                         17
+    #define SHIFT_EN                          17
   #endif
 
 #endif // HAS_SPI_LCD

Marlin/src/pins/mega/pins_MEGATRONICS_3.h

@@ -40,132 +40,132 @@
 //
 // Servos
 //
-#define SERVO0_PIN         46   // AUX3-6
-#define SERVO1_PIN         47   // AUX3-5
-#define SERVO2_PIN         48   // AUX3-4
-#define SERVO3_PIN         49   // AUX3-3
+#define SERVO0_PIN                            46  // AUX3-6
+#define SERVO1_PIN                            47  // AUX3-5
+#define SERVO2_PIN                            48  // AUX3-4
+#define SERVO3_PIN                            49  // AUX3-3
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          37   // No INT
-#define X_MAX_PIN          40   // No INT
-#define Y_MIN_PIN          41   // No INT
-#define Y_MAX_PIN          38   // No INT
-#define Z_MIN_PIN          18   // No INT
-#define Z_MAX_PIN          19   // No INT
+#define X_MIN_PIN                             37  // No INT
+#define X_MAX_PIN                             40  // No INT
+#define Y_MIN_PIN                             41  // No INT
+#define Y_MAX_PIN                             38  // No INT
+#define Z_MIN_PIN                             18  // No INT
+#define Z_MAX_PIN                             19  // No INT
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  19
+  #define Z_MIN_PROBE_PIN                     19
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         58
-#define X_DIR_PIN          57
-#define X_ENABLE_PIN       59
+#define X_STEP_PIN                            58
+#define X_DIR_PIN                             57
+#define X_ENABLE_PIN                          59
 
-#define Y_STEP_PIN          5
-#define Y_DIR_PIN          17
-#define Y_ENABLE_PIN        4
+#define Y_STEP_PIN                             5
+#define Y_DIR_PIN                             17
+#define Y_ENABLE_PIN                           4
 
-#define Z_STEP_PIN         16
-#define Z_DIR_PIN          11
-#define Z_ENABLE_PIN        3
+#define Z_STEP_PIN                            16
+#define Z_DIR_PIN                             11
+#define Z_ENABLE_PIN                           3
 
-#define E0_STEP_PIN        28
-#define E0_DIR_PIN         27
-#define E0_ENABLE_PIN      29
+#define E0_STEP_PIN                           28
+#define E0_DIR_PIN                            27
+#define E0_ENABLE_PIN                         29
 
-#define E1_STEP_PIN        25
-#define E1_DIR_PIN         24
-#define E1_ENABLE_PIN      26
+#define E1_STEP_PIN                           25
+#define E1_DIR_PIN                            24
+#define E1_ENABLE_PIN                         26
 
-#define E2_STEP_PIN        22
-#define E2_DIR_PIN         60
-#define E2_ENABLE_PIN      23
+#define E2_STEP_PIN                           22
+#define E2_DIR_PIN                            60
+#define E2_ENABLE_PIN                         23
 
 //
 // Temperature Sensors
 //
 #if TEMP_SENSOR_0 == -1
-  #define TEMP_0_PIN       11   // Analog Input
+  #define TEMP_0_PIN                          11  // Analog Input
 #else
-  #define TEMP_0_PIN       15   // Analog Input
+  #define TEMP_0_PIN                          15  // Analog Input
 #endif
 #if TEMP_SENSOR_1 == -1
-  #define TEMP_1_PIN       10   // Analog Input
+  #define TEMP_1_PIN                          10  // Analog Input
 #else
-  #define TEMP_1_PIN       13   // Analog Input
+  #define TEMP_1_PIN                          13  // Analog Input
 #endif
 #if TEMP_SENSOR_2 == -1
-  #define TEMP_2_PIN        9   // Analog Input
+  #define TEMP_2_PIN                           9  // Analog Input
 #else
-  #define TEMP_2_PIN       12   // Analog Input
+  #define TEMP_2_PIN                          12  // Analog Input
 #endif
 #if TEMP_SENSOR_BED == -1
-  #define TEMP_BED_PIN      8   // Analog Input
+  #define TEMP_BED_PIN                         8  // Analog Input
 #else
-  #define TEMP_BED_PIN     14   // Analog Input
+  #define TEMP_BED_PIN                        14  // Analog Input
 #endif
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        9
-#define HEATER_2_PIN        8
-#define HEATER_BED_PIN     10
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           9
+#define HEATER_2_PIN                           8
+#define HEATER_BED_PIN                        10
 
 #ifndef FAN_PIN
-  #define FAN_PIN           6
+  #define FAN_PIN                              6
 #endif
-#define FAN1_PIN            7
+#define FAN1_PIN                               7
 
 //
 // Misc. Functions
 //
-#define SDSS               53
-#define LED_PIN            13
-#define PS_ON_PIN          12
-#define CASE_LIGHT_PIN     45   // Try the keypad connector
+#define SDSS                                  53
+#define LED_PIN                               13
+#define PS_ON_PIN                             12
+#define CASE_LIGHT_PIN                        45  // Try the keypad connector
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         61
+#define BEEPER_PIN                            61
 
-#define BTN_EN1            44
-#define BTN_EN2            45
-#define BTN_ENC            33
+#define BTN_EN1                               44
+#define BTN_EN2                               45
+#define BTN_ENC                               33
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS      56   // CS chip select / SS chip slave select
-  #define LCD_PINS_ENABLE  51   // SID (MOSI)
-  #define LCD_PINS_D4      52   // SCK (CLK) clock
-  #define SD_DETECT_PIN    35
+  #define LCD_PINS_RS                         56  // CS chip select / SS chip slave select
+  #define LCD_PINS_ENABLE                     51  // SID (MOSI)
+  #define LCD_PINS_D4                         52  // SCK (CLK) clock
+  #define SD_DETECT_PIN                       35
 
 #else
 
-  #define LCD_PINS_RS      32
-  #define LCD_PINS_ENABLE  31
-  #define LCD_PINS_D4      14
-  #define LCD_PINS_D5      30
-  #define LCD_PINS_D6      39
-  #define LCD_PINS_D7      15
+  #define LCD_PINS_RS                         32
+  #define LCD_PINS_ENABLE                     31
+  #define LCD_PINS_D4                         14
+  #define LCD_PINS_D5                         30
+  #define LCD_PINS_D6                         39
+  #define LCD_PINS_D7                         15
 
-  #define SHIFT_CLK        43
-  #define SHIFT_LD         35
-  #define SHIFT_OUT        34
-  #define SHIFT_EN         44
+  #define SHIFT_CLK                           43
+  #define SHIFT_LD                            35
+  #define SHIFT_OUT                           34
+  #define SHIFT_EN                            44
 
   #if MB(MEGATRONICS_31, MEGATRONICS_32)
-    #define SD_DETECT_PIN  56
+    #define SD_DETECT_PIN                     56
   #endif
 
 #endif
@@ -173,23 +173,23 @@
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if DISABLED(REPRAPWORLD_KEYPAD)        // try to use the keypad connector first
-  #define SPINDLE_LASER_PWM_PIN    44   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN    43   // Pullup!
-  #define SPINDLE_DIR_PIN          42
+#if DISABLED(REPRAPWORLD_KEYPAD)                  // try to use the keypad connector first
+  #define SPINDLE_LASER_PWM_PIN               44  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               43  // Pullup!
+  #define SPINDLE_DIR_PIN                     42
 #elif EXTRUDERS <= 2
   // Hijack the last extruder so that we can get the PWM signal off the Y breakout
   // Move Y to the E2 plug. This makes dual Y steppers harder
-  #undef Y_ENABLE_PIN  //  4
-  #undef Y_STEP_PIN    //  5
-  #undef Y_DIR_PIN     // 17
-  #undef E2_ENABLE_PIN // 23
-  #undef E2_STEP_PIN   // 22
-  #undef E2_DIR_PIN    // 60
-  #define Y_ENABLE_PIN             23
-  #define Y_STEP_PIN               22
-  #define Y_DIR_PIN                60
-  #define SPINDLE_LASER_PWM_PIN     4   // Hardware PWM
-  #define SPINDLE_LASER_ENA_PIN    17   // Pullup!
-  #define SPINDLE_DIR_PIN           5
+  #undef Y_ENABLE_PIN                             //  4
+  #undef Y_STEP_PIN                               //  5
+  #undef Y_DIR_PIN                                // 17
+  #undef E2_ENABLE_PIN                            // 23
+  #undef E2_STEP_PIN                              // 22
+  #undef E2_DIR_PIN                               // 60
+  #define Y_ENABLE_PIN                        23
+  #define Y_STEP_PIN                          22
+  #define Y_DIR_PIN                           60
+  #define SPINDLE_LASER_PWM_PIN                4  // Hardware PWM
+  #define SPINDLE_LASER_ENA_PIN               17  // Pullup!
+  #define SPINDLE_DIR_PIN                      5
 #endif

Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h

@@ -47,60 +47,60 @@
 //
 // Servos
 //
-#define SERVO0_PIN         36   // C1 (1280-EX1)
-#define SERVO1_PIN         37   // C0 (1280-EX2)
-#define SERVO2_PIN         40   // G1 (1280-EX3)
-#define SERVO3_PIN         41   // G0 (1280-EX4)
+#define SERVO0_PIN                            36  // C1 (1280-EX1)
+#define SERVO1_PIN                            37  // C0 (1280-EX2)
+#define SERVO2_PIN                            40  // G1 (1280-EX3)
+#define SERVO3_PIN                            41  // G0 (1280-EX4)
 
 //
 // Limit Switches
 //
-#define X_MIN_PIN          49   // L0
-#define X_MAX_PIN          48   // L1
-#define Y_MIN_PIN          47   // L2
-#define Y_MAX_PIN          46   // L3
-#define Z_MIN_PIN          43   // L6
-#define Z_MAX_PIN          42   // L7
+#define X_MIN_PIN                             49  // L0
+#define X_MAX_PIN                             48  // L1
+#define Y_MIN_PIN                             47  // L2
+#define Y_MAX_PIN                             46  // L3
+#define Z_MIN_PIN                             43  // L6
+#define Z_MAX_PIN                             42  // L7
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  42
+  #define Z_MIN_PROBE_PIN                     42
 #endif
 
 //
 // Filament Runout Pins
 //
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN   49
+  #define FIL_RUNOUT_PIN                      49
 #endif
 #ifndef FIL_RUNOUT2_PIN
-  #define FIL_RUNOUT2_PIN  47
+  #define FIL_RUNOUT2_PIN                     47
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         55   // F1
-#define X_DIR_PIN          54   // F0
-#define X_ENABLE_PIN       56   // F2
+#define X_STEP_PIN                            55  // F1
+#define X_DIR_PIN                             54  // F0
+#define X_ENABLE_PIN                          56  // F2
 
-#define Y_STEP_PIN         59   // F5
-#define Y_DIR_PIN          58   // F4
-#define Y_ENABLE_PIN       60   // F6
+#define Y_STEP_PIN                            59  // F5
+#define Y_DIR_PIN                             58  // F4
+#define Y_ENABLE_PIN                          60  // F6
 
-#define Z_STEP_PIN         63   // K1
-#define Z_DIR_PIN          62   // K0
-#define Z_ENABLE_PIN       64   // K2
+#define Z_STEP_PIN                            63  // K1
+#define Z_DIR_PIN                             62  // K0
+#define Z_ENABLE_PIN                          64  // K2
 
-#define E0_STEP_PIN        25   // A3
-#define E0_DIR_PIN         24   // A2
-#define E0_ENABLE_PIN      26   // A4
+#define E0_STEP_PIN                           25  // A3
+#define E0_DIR_PIN                            24  // A2
+#define E0_ENABLE_PIN                         26  // A4
 
-#define E1_STEP_PIN        29   // A7
-#define E1_DIR_PIN         28   // A6
-#define E1_ENABLE_PIN      39   // G2
+#define E1_STEP_PIN                           29  // A7
+#define E1_DIR_PIN                            28  // A6
+#define E1_ENABLE_PIN                         39  // G2
 
 //
 // I2C Digipots - MCP4018
@@ -108,22 +108,22 @@
 // Set from 0 - 127 with stop bit.
 // (Ex. 3F << 1 | 1)
 //
-#define DIGIPOTS_I2C_SCL    76   // J5
-#define DIGIPOTS_I2C_SDA_X  57   // F3
-#define DIGIPOTS_I2C_SDA_Y  61   // F7
-#define DIGIPOTS_I2C_SDA_Z  65   // K3
-#define DIGIPOTS_I2C_SDA_E0 27   // A5
-#define DIGIPOTS_I2C_SDA_E1 77   // J6
+#define DIGIPOTS_I2C_SCL                      76  // J5
+#define DIGIPOTS_I2C_SDA_X                    57  // F3
+#define DIGIPOTS_I2C_SDA_Y                    61  // F7
+#define DIGIPOTS_I2C_SDA_Z                    65  // K3
+#define DIGIPOTS_I2C_SDA_E0                   27  // A5
+#define DIGIPOTS_I2C_SDA_E1                   77  // J6
 
 #ifndef DIGIPOT_I2C_ADDRESS_A
-  #define DIGIPOT_I2C_ADDRESS_A 0x2F   // unshifted slave address (5E <- 2F << 1)
+  #define DIGIPOT_I2C_ADDRESS_A 0x2F              // unshifted slave address (5E <- 2F << 1)
 #endif
 
 //
 // Temperature Sensors
 //
 // K7 - 69 / ADC15 - 15
-#define TEMP_BED_PIN       15
+#define TEMP_BED_PIN                          15
 
 // SPI for Max6675 or Max31855 Thermocouple
 // Uses a separate SPI bus
@@ -133,15 +133,15 @@
 //  2 E4 CS2
 // 78 E2 SCK
 //
-#define THERMO_SCK_PIN     78   // E2
-#define THERMO_DO_PIN       3   // E5
-#define THERMO_CS1_PIN      5   // E3
-#define THERMO_CS2_PIN      2   // E4
+#define THERMO_SCK_PIN                        78  // E2
+#define THERMO_DO_PIN                          3  // E5
+#define THERMO_CS1_PIN                         5  // E3
+#define THERMO_CS2_PIN                         2  // E4
 
-#define MAX6675_SS_PIN     THERMO_CS1_PIN
-#define MAX6675_SS2_PIN    THERMO_CS2_PIN
-#define MAX6675_SCK_PIN    THERMO_SCK_PIN
-#define MAX6675_DO_PIN     THERMO_DO_PIN
+#define MAX6675_SS_PIN            THERMO_CS1_PIN
+#define MAX6675_SS2_PIN           THERMO_CS2_PIN
+#define MAX6675_SCK_PIN           THERMO_SCK_PIN
+#define MAX6675_DO_PIN             THERMO_DO_PIN
 
 //
 // Augmentation for auto-assigning plugs
@@ -152,12 +152,12 @@
 //
 
 // Labels from the schematic:
-#define EX1_HEAT_PIN        6   // H3
-#define EX1_FAN_PIN         7   // H4
-#define EX2_HEAT_PIN       11   // B5
-#define EX2_FAN_PIN        12   // B6
-#define HBP_PIN            45   // L4
-#define EXTRA_FET_PIN      44   // L5
+#define EX1_HEAT_PIN                           6  // H3
+#define EX1_FAN_PIN                            7  // H4
+#define EX2_HEAT_PIN                          11  // B5
+#define EX2_FAN_PIN                           12  // B6
+#define HBP_PIN                               45  // L4
+#define EXTRA_FET_PIN                         44  // L5
 
 #if HOTENDS > 1
   #if TEMP_SENSOR_BED
@@ -174,35 +174,35 @@
 //
 // Heaters / Fans (24V)
 //
-#define HEATER_0_PIN       EX1_HEAT_PIN
-
-#if ENABLED(IS_EFB)                            // Hotend, Fan, Bed
-  #define HEATER_BED_PIN   HBP_PIN
-#elif ENABLED(IS_EEF)                          // Hotend, Hotend, Fan
-  #define HEATER_1_PIN     EX2_HEAT_PIN
-#elif ENABLED(IS_EEB)                          // Hotend, Hotend, Bed
-  #define HEATER_1_PIN     EX2_HEAT_PIN
-  #define HEATER_BED_PIN   HBP_PIN
-#elif ENABLED(IS_EFF)                          // Hotend, Fan, Fan
-  #define FAN1_PIN         HBP_PIN
+#define HEATER_0_PIN                EX1_HEAT_PIN
+
+#if ENABLED(IS_EFB)                               // Hotend, Fan, Bed
+  #define HEATER_BED_PIN                 HBP_PIN
+#elif ENABLED(IS_EEF)                             // Hotend, Hotend, Fan
+  #define HEATER_1_PIN              EX2_HEAT_PIN
+#elif ENABLED(IS_EEB)                             // Hotend, Hotend, Bed
+  #define HEATER_1_PIN              EX2_HEAT_PIN
+  #define HEATER_BED_PIN                 HBP_PIN
+#elif ENABLED(IS_EFF)                             // Hotend, Fan, Fan
+  #define FAN1_PIN                       HBP_PIN
 #endif
 
 #ifndef FAN_PIN
   #if EITHER(IS_EFB, IS_EFF)                      // Hotend, Fan, Bed or Hotend, Fan, Fan
-    #define FAN_PIN        EX2_HEAT_PIN
+    #define FAN_PIN                 EX2_HEAT_PIN
   #elif EITHER(IS_EEF, IS_SF)                     // Hotend, Hotend, Fan or Spindle, Fan
-    #define FAN_PIN        HBP_PIN
+    #define FAN_PIN                      HBP_PIN
   #else
-    #define FAN_PIN        EXTRA_FET_PIN
+    #define FAN_PIN                EXTRA_FET_PIN
   #endif
 #endif
 
 //
 // Misc. Functions
 //
-#define LED_PIN            13   // B7
-#define CUTOFF_RESET_PIN   16   // H1
-#define CUTOFF_TEST_PIN    17   // H0
+#define LED_PIN                               13  // B7
+#define CUTOFF_RESET_PIN                      16  // H1
+#define CUTOFF_TEST_PIN                       17  // H0
 
 //
 // LCD / Controller
@@ -211,57 +211,57 @@
 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
 
-    #define LCD_PINS_RS    33   // C4: LCD-STROBE
-    #define LCD_PINS_ENABLE 72  // J2: LEFT
-    #define LCD_PINS_D4    35   // C2: LCD-CLK
-    #define LCD_PINS_D5    32   // C5: RLED
-    #define LCD_PINS_D6    34   // C3: LCD-DATA
-    #define LCD_PINS_D7    31   // C6: GLED
+    #define LCD_PINS_RS                       33  // C4: LCD-STROBE
+    #define LCD_PINS_ENABLE                   72  // J2: LEFT
+    #define LCD_PINS_D4                       35  // C2: LCD-CLK
+    #define LCD_PINS_D5                       32  // C5: RLED
+    #define LCD_PINS_D6                       34  // C3: LCD-DATA
+    #define LCD_PINS_D7                       31  // C6: GLED
 
-    #define BTN_EN2        75   // J4, UP
-    #define BTN_EN1        73   // J3, DOWN
+    #define BTN_EN2                           75  // J4, UP
+    #define BTN_EN1                           73  // J3, DOWN
     //STOP button connected as KILL_PIN
-    #define KILL_PIN       14   // J1, RIGHT
+    #define KILL_PIN                          14  // J1, RIGHT
     //KILL - not connected
 
-    #define BEEPER_PIN      8   // H5, SD_WP
+    #define BEEPER_PIN                         8  // H5, SD_WP
 
     //on board leds
-    #define STAT_LED_RED_LED  SERVO0_PIN   // C1 (1280-EX1, DEBUG2)
-    #define STAT_LED_BLUE_PIN SERVO1_PIN   // C0 (1280-EX2, DEBUG3)
+    #define STAT_LED_RED_LED          SERVO0_PIN  // C1 (1280-EX1, DEBUG2)
+    #define STAT_LED_BLUE_PIN         SERVO1_PIN  // C0 (1280-EX2, DEBUG3)
 
   #else
     // Replicator uses a 3-wire SR controller with HD44780
-    #define SR_DATA_PIN    34   // C3
-    #define SR_CLK_PIN     35   // C2
-    #define SR_STROBE_PIN  33   // C4
+    #define SR_DATA_PIN                       34  // C3
+    #define SR_CLK_PIN                        35  // C2
+    #define SR_STROBE_PIN                     33  // C4
 
-    #define BTN_UP         75   // J4
-    #define BTN_DWN        73   // J3
-    #define BTN_LFT        72   // J2
-    #define BTN_RT         14   // J1
+    #define BTN_UP                            75  // J4
+    #define BTN_DWN                           73  // J3
+    #define BTN_LFT                           72  // J2
+    #define BTN_RT                            14  // J1
 
     // Disable encoder
     #undef BTN_EN1
     #undef BTN_EN2
 
-    #define BEEPER_PIN      4   // G5
+    #define BEEPER_PIN                         4  // G5
 
-    #define STAT_LED_RED_PIN  32   // C5
-    #define STAT_LED_BLUE_PIN 31   // C6 (Actually green)
+    #define STAT_LED_RED_PIN                  32  // C5
+    #define STAT_LED_BLUE_PIN                 31  // C6 (Actually green)
 
   #endif
 
-  #define BTN_CENTER       15   // J0
-  #define BTN_ENC          BTN_CENTER
+  #define BTN_CENTER                          15  // J0
+  #define BTN_ENC                     BTN_CENTER
 
 #endif // HAS_SPI_LCD
 
 //
 // SD Card
 //
-#define SDSS               53   // B0
-#define SD_DETECT_PIN       9   // H6
+#define SDSS                                  53  // B0
+#define SD_DETECT_PIN                          9  // H6
 
 //
 // TMC 220x
@@ -280,19 +280,19 @@
    * Software serial
    */
 
-  #define X_SERIAL_TX_PIN  16
-  #define X_SERIAL_RX_PIN  17
+  #define X_SERIAL_TX_PIN                     16
+  #define X_SERIAL_RX_PIN                     17
 
-  #define Y_SERIAL_TX_PIN  18
-  #define Y_SERIAL_RX_PIN  19
+  #define Y_SERIAL_TX_PIN                     18
+  #define Y_SERIAL_RX_PIN                     19
 
-  #define Z_SERIAL_TX_PIN  41
-  #define Z_SERIAL_RX_PIN  66
+  #define Z_SERIAL_TX_PIN                     41
+  #define Z_SERIAL_RX_PIN                     66
 
-  #define E0_SERIAL_TX_PIN 40
-  #define E0_SERIAL_RX_PIN 67
+  #define E0_SERIAL_TX_PIN                    40
+  #define E0_SERIAL_RX_PIN                    67
 
-  #define E1_SERIAL_TX_PIN 37
-  #define E1_SERIAL_RX_PIN 68
+  #define E1_SERIAL_TX_PIN                    37
+  #define E1_SERIAL_RX_PIN                    68
 
 #endif

Marlin/src/pins/mega/pins_MINITRONICS.h

@@ -42,102 +42,102 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN           5
-#define X_MAX_PIN           2
-#define Y_MIN_PIN           2
-#define Y_MAX_PIN          15
-#define Z_MIN_PIN           6
-#define Z_MAX_PIN          -1
+#define X_MIN_PIN                              5
+#define X_MAX_PIN                              2
+#define Y_MIN_PIN                              2
+#define Y_MAX_PIN                             15
+#define Z_MIN_PIN                              6
+#define Z_MAX_PIN                             -1
 
 //
 // Steppers
 //
-#define X_STEP_PIN         48
-#define X_DIR_PIN          47
-#define X_ENABLE_PIN       49
+#define X_STEP_PIN                            48
+#define X_DIR_PIN                             47
+#define X_ENABLE_PIN                          49
 
-#define Y_STEP_PIN         39   // A6
-#define Y_DIR_PIN          40   // A0
-#define Y_ENABLE_PIN       38
+#define Y_STEP_PIN                            39  // A6
+#define Y_DIR_PIN                             40  // A0
+#define Y_ENABLE_PIN                          38
 
-#define Z_STEP_PIN         42   // A2
-#define Z_DIR_PIN          43   // A6
-#define Z_ENABLE_PIN       41   // A1
+#define Z_STEP_PIN                            42  // A2
+#define Z_DIR_PIN                             43  // A6
+#define Z_ENABLE_PIN                          41  // A1
 
-#define E0_STEP_PIN        45
-#define E0_DIR_PIN         44
-#define E0_ENABLE_PIN      27
+#define E0_STEP_PIN                           45
+#define E0_DIR_PIN                            44
+#define E0_ENABLE_PIN                         27
 
-#define E1_STEP_PIN        36
-#define E1_DIR_PIN         35
-#define E1_ENABLE_PIN      37
+#define E1_STEP_PIN                           36
+#define E1_DIR_PIN                            35
+#define E1_ENABLE_PIN                         37
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          7   // Analog Input
-#define TEMP_1_PIN          6   // Analog Input
-#define TEMP_BED_PIN        6   // Analog Input
+#define TEMP_0_PIN                             7  // Analog Input
+#define TEMP_1_PIN                             6  // Analog Input
+#define TEMP_BED_PIN                           6  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        7   // EXTRUDER 1
-#define HEATER_1_PIN        8   // EXTRUDER 2
-#define HEATER_BED_PIN      3   // BED
+#define HEATER_0_PIN                           7  // EXTRUDER 1
+#define HEATER_1_PIN                           8  // EXTRUDER 2
+#define HEATER_BED_PIN                         3  // BED
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
 
 //
 // Misc. Functions
 //
-#define SDSS               16
-#define LED_PIN            46
+#define SDSS                                  16
+#define LED_PIN                               46
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         -1
+#define BEEPER_PIN                            -1
 
 #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-  #define LCD_PINS_RS      15   // CS chip select /SS chip slave select
-  #define LCD_PINS_ENABLE  11   // SID (MOSI)
-  #define LCD_PINS_D4      10   // SCK (CLK) clock
+  #define LCD_PINS_RS                         15  // CS chip select /SS chip slave select
+  #define LCD_PINS_ENABLE                     11  // SID (MOSI)
+  #define LCD_PINS_D4                         10  // SCK (CLK) clock
 
-  #define BTN_EN1          18
-  #define BTN_EN2          17
-  #define BTN_ENC          25
+  #define BTN_EN1                             18
+  #define BTN_EN2                             17
+  #define BTN_ENC                             25
 
-  #define SD_DETECT_PIN    30
+  #define SD_DETECT_PIN                       30
 
 #else
 
-  #define LCD_PINS_RS      -1
-  #define LCD_PINS_ENABLE  -1
+  #define LCD_PINS_RS                         -1
+  #define LCD_PINS_ENABLE                     -1
 
   // Buttons are directly attached using keypad
-  #define BTN_EN1          -1
-  #define BTN_EN2          -1
-  #define BTN_ENC          -1
+  #define BTN_EN1                             -1
+  #define BTN_EN2                             -1
+  #define BTN_ENC                             -1
 
-  #define SD_DETECT_PIN    -1   // Minitronics doesn't use this
+  #define SD_DETECT_PIN                       -1  // Minitronics doesn't use this
 #endif
 
 //
 // M3/M4/M5 - Spindle/Laser Control
 //
-#if HAS_CUTTER  // assumes we're only doing CNC work (no 3D printing)
+#if HAS_CUTTER                                    // assumes we're only doing CNC work (no 3D printing)
   #undef HEATER_BED_PIN
-  #undef TEMP_BED_PIN             // need to free up some pins but also need to
-  #undef TEMP_0_PIN               // re-assign them (to unused pins) because Marlin
-  #undef TEMP_1_PIN               // requires the presence of certain pins or else it
-  #define HEATER_BED_PIN      4   // won't compile
-  #define TEMP_BED_PIN       50
-  #define TEMP_0_PIN         51
-  #define SPINDLE_LASER_ENA_PIN         52   // using A6 because it already has a pullup
-  #define SPINDLE_LASER_PWM_PIN          3   // WARNING - LED & resistor pull up to +12/+24V stepper voltage
-  #define SPINDLE_DIR_PIN               53
+  #undef TEMP_BED_PIN                             // need to free up some pins but also need to
+  #undef TEMP_0_PIN                               // re-assign them (to unused pins) because Marlin
+  #undef TEMP_1_PIN                               // requires the presence of certain pins or else it
+  #define HEATER_BED_PIN                       4  // won't compile
+  #define TEMP_BED_PIN                        50
+  #define TEMP_0_PIN                          51
+  #define SPINDLE_LASER_ENA_PIN               52  // using A6 because it already has a pullup
+  #define SPINDLE_LASER_PWM_PIN                3  // WARNING - LED & resistor pull up to +12/+24V stepper voltage
+  #define SPINDLE_DIR_PIN                     53
 #endif

Marlin/src/pins/mega/pins_OVERLORD.h

@@ -37,83 +37,83 @@
 //
 // Limit Switches
 //
-#define X_STOP_PIN         24
-#define Y_STOP_PIN         28
-#define Z_MIN_PIN          46
-#define Z_MAX_PIN          32
+#define X_STOP_PIN                            24
+#define Y_STOP_PIN                            28
+#define Z_MIN_PIN                             46
+#define Z_MAX_PIN                             32
 
 //
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN  46   // JP4, Tfeed1
+  #define Z_MIN_PROBE_PIN                     46  // JP4, Tfeed1
 #endif
 
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #define FIL_RUNOUT_PIN   44   // JP3, Tfeed2
+  #define FIL_RUNOUT_PIN                      44  // JP3, Tfeed2
 #endif
 
 //
 // Steppers
 //
-#define X_STEP_PIN         25
-#define X_DIR_PIN          23
-#define X_ENABLE_PIN       27
+#define X_STEP_PIN                            25
+#define X_DIR_PIN                             23
+#define X_ENABLE_PIN                          27
 
-#define Y_STEP_PIN         31
-#define Y_DIR_PIN          33
-#define Y_ENABLE_PIN       29
+#define Y_STEP_PIN                            31
+#define Y_DIR_PIN                             33
+#define Y_ENABLE_PIN                          29
 
-#define Z_STEP_PIN         37
-#define Z_DIR_PIN          39
-#define Z_ENABLE_PIN       35
+#define Z_STEP_PIN                            37
+#define Z_DIR_PIN                             39
+#define Z_ENABLE_PIN                          35
 
-#define E0_STEP_PIN        43
-#define E0_DIR_PIN         45
-#define E0_ENABLE_PIN      41
+#define E0_STEP_PIN                           43
+#define E0_DIR_PIN                            45
+#define E0_ENABLE_PIN                         41
 
-#define E1_STEP_PIN        49
-#define E1_DIR_PIN         47
-#define E1_ENABLE_PIN      48
+#define E1_STEP_PIN                           49
+#define E1_DIR_PIN                            47
+#define E1_ENABLE_PIN                         48
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          8   // Analog Input
-#define TEMP_1_PIN          9   // Analog Input - Redundant temp sensor
-#define TEMP_2_PIN         12   // Analog Input
-#define TEMP_3_PIN         14   // Analog Input
-#define TEMP_BED_PIN       10   // Analog Input
+#define TEMP_0_PIN                             8  // Analog Input
+#define TEMP_1_PIN                             9  // Analog Input - Redundant temp sensor
+#define TEMP_2_PIN                            12  // Analog Input
+#define TEMP_3_PIN                            14  // Analog Input
+#define TEMP_BED_PIN                          10  // Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN        2
-#define HEATER_1_PIN        3
-#define HEATER_BED_PIN      4
+#define HEATER_0_PIN                           2
+#define HEATER_1_PIN                           3
+#define HEATER_BED_PIN                         4
 
-#define FAN_PIN             7   // material cooling fan
+#define FAN_PIN                                7  // material cooling fan
 
 //
 // SD Card
 //
-#define SDSS               53
-#define SD_DETECT_PIN      38
+#define SDSS                                  53
+#define SD_DETECT_PIN                         38
 
 //
 // Misc. Functions
 //
-#define LED_PIN            13   // On PCB status led
-#define PS_ON_PIN          12   // For stepper/heater/fan power. Active HIGH.
-#define POWER_LOSS_PIN     34   // Power check - whether hotends/steppers/fans have power
+#define LED_PIN                               13  // On PCB status led
+#define PS_ON_PIN                             12  // For stepper/heater/fan power. Active HIGH.
+#define POWER_LOSS_PIN                        34  // Power check - whether hotends/steppers/fans have power
 
 #if ENABLED(BATTERY_STATUS_AVAILABLE)
   #undef BATTERY_STATUS_PIN
-  #define BATTERY_STATUS_PIN 26   // Status of power loss battery, whether it is charged (low) or charging (high)
+  #define BATTERY_STATUS_PIN                  26  // Status of power loss battery, whether it is charged (low) or charging (high)
 #endif
 #if ENABLED(INPUT_VOLTAGE_AVAILABLE)
   #undef VOLTAGE_DETECTION_PIN
-  #define VOLTAGE_DETECTION_PIN 11  // Analog Input - ADC Voltage level of main input
+  #define VOLTAGE_DETECTION_PIN               11  // Analog Input - ADC Voltage level of main input
 #endif
 
 //
@@ -121,24 +121,24 @@
 //
 #if HAS_GRAPHICAL_LCD
   // OVERLORD OLED pins
-  #define LCD_PINS_RS      20
-  #define LCD_PINS_D5      21
-  #define LCD_PINS_ENABLE  15
-  #define LCD_PINS_D4      14
-  #define LCD_PINS_D6       5
-  #define LCD_PINS_D7       6
+  #define LCD_PINS_RS                         20
+  #define LCD_PINS_D5                         21
+  #define LCD_PINS_ENABLE                     15
+  #define LCD_PINS_D4                         14
+  #define LCD_PINS_D6                          5
+  #define LCD_PINS_D7                          6
   #ifndef LCD_RESET_PIN
-    #define LCD_RESET_PIN   5   // LCD_PINS_D6
+    #define LCD_RESET_PIN                      5  // LCD_PINS_D6
   #endif
 #endif
 
 #if ENABLED(NEWPANEL)
-  #define BTN_ENC          16   // Enter Pin
-  #define BTN_UP           19   // Button UP Pin
-  #define BTN_DWN          17   // Button DOWN Pin
+  #define BTN_ENC                             16  // Enter Pin
+  #define BTN_UP                              19  // Button UP Pin
+  #define BTN_DWN                             17  // Button DOWN Pin
 #endif
 
 // Additional connectors/pins on the Overlord V1.X board
-#define PCB_VERSION_PIN    22
-#define APPROACH_PIN       11   // JP7, Tpd
-#define GATE_PIN           36   // Threshold, JP6, Tg
+#define PCB_VERSION_PIN                       22
+#define APPROACH_PIN                          11  // JP7, Tpd
+#define GATE_PIN                              36  // Threshold, JP6, Tg

Marlin/src/pins/mega/pins_PICA.h

@@ -49,95 +49,95 @@
 //
 // Limit Switches
 //
-#define X_MIN_PIN          14
-#define X_MAX_PIN          15
-#define Y_MIN_PIN          16
-#define Y_MAX_PIN          17
-#define Z_MIN_PIN          23
-#define Z_MAX_PIN          22
+#define X_MIN_PIN                             14
+#define X_MAX_PIN                             15
+#define Y_MIN_PIN                             16
+#define Y_MAX_PIN                             17
+#define Z_MIN_PIN                             23
+#define Z_MAX_PIN                             22
 
 //
 // Steppers
 //
-#define X_STEP_PIN         55
-#define X_DIR_PIN          54
-#define X_ENABLE_PIN       60
+#define X_STEP_PIN                            55
+#define X_DIR_PIN                             54
+#define X_ENABLE_PIN                          60
 
-#define Y_STEP_PIN         57
-#define Y_DIR_PIN          56
-#define Y_ENABLE_PIN       61
+#define Y_STEP_PIN                            57
+#define Y_DIR_PIN                             56
+#define Y_ENABLE_PIN                          61
 
-#define Z_STEP_PIN         59
-#define Z_DIR_PIN          58
-#define Z_ENABLE_PIN       62
+#define Z_STEP_PIN                            59
+#define Z_DIR_PIN                             58
+#define Z_ENABLE_PIN                          62
 
-#define E0_STEP_PIN        67
-#define E0_DIR_PIN         24
-#define E0_ENABLE_PIN      26
+#define E0_STEP_PIN                           67
+#define E0_DIR_PIN                            24
+#define E0_ENABLE_PIN                         26
 
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN          9   // Analog Input
-#define TEMP_1_PIN         10
-#define TEMP_BED_PIN       10
-#define TEMP_2_PIN         11
-#define TEMP_3_PIN         12
+#define TEMP_0_PIN                             9  // Analog Input
+#define TEMP_1_PIN                            10
+#define TEMP_BED_PIN                          10
+#define TEMP_2_PIN                            11
+#define TEMP_3_PIN                            12
 
 //
 // Heaters / Fans
 //
 #ifndef HEATER_0_PIN
-  #define HEATER_0_PIN     10   // E0
+  #define HEATER_0_PIN                        10  // E0
 #endif
 #ifndef HEATER_1_PIN
-  #define HEATER_1_PIN      2   // E1
+  #define HEATER_1_PIN                         2  // E1
 #endif
-#define HEATER_BED_PIN      8   // HEAT-BED
+#define HEATER_BED_PIN                         8  // HEAT-BED
 
 #ifndef FAN_PIN
-  #define FAN_PIN           9
+  #define FAN_PIN                              9
 #endif
 #ifndef FAN_2_PIN
-  #define FAN_2_PIN         7
+  #define FAN_2_PIN                            7
 #endif
 
-#define SDPOWER_PIN        -1
-#define LED_PIN            -1
-#define PS_ON_PIN          -1
-#define KILL_PIN           -1
+#define SDPOWER_PIN                           -1
+#define LED_PIN                               -1
+#define PS_ON_PIN                             -1
+#define KILL_PIN                              -1
 
-#define SSR_PIN             6
+#define SSR_PIN                                6
 
 // SPI for Max6675 or Max31855 Thermocouple
 #if DISABLED(SDSUPPORT)
-  #define MAX6675_SS_PIN   66   // Don't use 53 if using Display/SD card
+  #define MAX6675_SS_PIN                      66  // Don't use 53 if using Display/SD card
 #else
-  #define MAX6675_SS_PIN   66   // Don't use 49 (SD_DETECT_PIN)
+  #define MAX6675_SS_PIN                      66  // Don't use 49 (SD_DETECT_PIN)
 #endif
 
 //
 // SD Support
 //
-#define SD_DETECT_PIN      49
-#define SDSS               53
+#define SD_DETECT_PIN                         49
+#define SDSS                                  53
 
 //
 // LCD / Controller
 //
-#define BEEPER_PIN         29
+#define BEEPER_PIN                            29
 
 #if HAS_SPI_LCD
-  #define LCD_PINS_RS      33
-  #define LCD_PINS_ENABLE  30
-  #define LCD_PINS_D4      35
-  #define LCD_PINS_D5      32
-  #define LCD_PINS_D6      37
-  #define LCD_PINS_D7      36
-
-  #define BTN_EN1          47
-  #define BTN_EN2          48
-  #define BTN_ENC          31
-
-  #define LCD_SDSS         53
+  #define LCD_PINS_RS                         33
+  #define LCD_PINS_ENABLE                     30
+  #define LCD_PINS_D4                         35
+  #define LCD_PINS_D5                         32
+  #define LCD_PINS_D6                         37
+  #define LCD_PINS_D7                         36
+
+  #define BTN_EN1                             47
+  #define BTN_EN2                             48
+  #define BTN_ENC                             31
+
+  #define LCD_SDSS                            53
 #endif