diff --git a/Marlin/pinsDebug.h b/Marlin/pinsDebug.h
index 9056f3a3a92..348002c4024 100644
--- a/Marlin/pinsDebug.h
+++ b/Marlin/pinsDebug.h
@@ -43,8 +43,8 @@ bool endstop_monitor_flag = false;
 
 #define _ADD_PIN_2(PIN_NAME, ENTRY_NAME) static const char ENTRY_NAME[] PROGMEM = { PIN_NAME };
 #define _ADD_PIN(PIN_NAME, COUNTER) _ADD_PIN_2(PIN_NAME, entry_NAME_##COUNTER)
-#define REPORT_NAME_DIGITAL(NAME, COUNTER) _ADD_PIN(#NAME, COUNTER)
-#define REPORT_NAME_ANALOG(NAME, COUNTER) _ADD_PIN(#NAME, COUNTER)
+#define REPORT_NAME_DIGITAL(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
+#define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
 
 #include "pinsDebug_list.h"
 #line 51
@@ -66,8 +66,8 @@ bool endstop_monitor_flag = false;
 
 #define _ADD_PIN_2(ENTRY_NAME, NAME, IS_DIGITAL) { ENTRY_NAME, NAME, IS_DIGITAL },
 #define _ADD_PIN(NAME, COUNTER, IS_DIGITAL) _ADD_PIN_2(entry_NAME_##COUNTER, NAME, IS_DIGITAL)
-#define REPORT_NAME_DIGITAL(NAME, COUNTER) _ADD_PIN(NAME, COUNTER, true)
-#define REPORT_NAME_ANALOG(NAME, COUNTER) _ADD_PIN(analogInputToDigitalPin(NAME), COUNTER, false)
+#define REPORT_NAME_DIGITAL(COUNTER, NAME) _ADD_PIN(NAME, COUNTER, true)
+#define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(analogInputToDigitalPin(NAME), COUNTER, false)
 
 typedef struct {
   const char * const name;
diff --git a/Marlin/pinsDebug_list.h b/Marlin/pinsDebug_list.h
index 8a917a531cc..19b3c5d300d 100644
--- a/Marlin/pinsDebug_list.h
+++ b/Marlin/pinsDebug_list.h
@@ -25,907 +25,1054 @@
 // Following this pattern is a must.
 // If the new pin name is over 28 characters long then pinsDebug.h will need to be modified.
 
-// Pin list updated from 18 FEB 2017 RCBugfix branch   - max length of pin name is 24
+// Pin lists 1.1.x and 2.0.x synchronized 2018-02-17
+
+#define PIN_EXISTS_ANALOG(PN) (PIN_EXISTS(PN) && PN##_PIN < NUM_ANALOG_INPUTS)
+#define _EXISTS(PN) (defined(PN) && PN >= 0)
+#define _EXISTS_ANALOG(PN) (_EXISTS(PN) && PN < NUM_ANALOG_INPUTS)
 
 #line 0 // set __LINE__ to a known value for both passes
 
-#if PIN_EXISTS(ADC_KEYPAD) && ADC_KEYPAD_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(ADC_KEYPAD_PIN, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A0)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
 #endif
-#if defined(__FD) && __FD >= 0
-  REPORT_NAME_DIGITAL(__FD, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A1)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A1)
 #endif
-#if defined(__FS) && __FS >= 0
-  REPORT_NAME_DIGITAL(__FS, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A2)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A2)
 #endif
-#if defined(__GD) && __GD >= 0
-  REPORT_NAME_DIGITAL(__GD, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A3)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A3)
 #endif
-#if defined(__GS) && __GS >= 0
-  REPORT_NAME_DIGITAL(__GS, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A4)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A4)
 #endif
-#if PIN_EXISTS(ADC_KEYPAD)
-  REPORT_NAME_ANALOG(ADC_KEYPAD_PIN, __LINE__ )
+#if PIN_EXISTS_ANALOG(FILWIDTH)
+  REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(MAIN_VOLTAGE_MEASURE)
+  REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
+#endif
+#if !defined(ARDUINO_ARCH_SAM)  //TC1 & TC2 are macros in the SAM tool chain
+  #if _EXISTS_ANALOG(TC1)
+    REPORT_NAME_ANALOG(__LINE__, TC1)
+  #endif
+  #if _EXISTS_ANALOG(TC2)
+    REPORT_NAME_ANALOG(__LINE__, TC2)
+  #endif
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_0)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_1)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_2)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_3)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_4)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
+#endif
+#if _EXISTS(THERMO_CS2)
+  REPORT_NAME_DIGITAL(__LINE__, THERMO_CS2)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_BED)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_CHAMBER)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_X)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_X_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(ADC_KEYPAD)
+  REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
+#endif
+#if _EXISTS(__FD)
+  REPORT_NAME_DIGITAL(__LINE__, __FD)
+#endif
+#if _EXISTS(__FS)
+  REPORT_NAME_DIGITAL(__LINE__, __FS)
+#endif
+#if _EXISTS(__GD)
+  REPORT_NAME_DIGITAL(__LINE__, __GD)
+#endif
+#if _EXISTS(__GS)
+  REPORT_NAME_DIGITAL(__LINE__, __GS)
 #endif
 #if PIN_EXISTS(AVR_MISO)
-  REPORT_NAME_DIGITAL(AVR_MISO_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, AVR_MISO_PIN)
 #endif
 #if PIN_EXISTS(AVR_MOSI)
-  REPORT_NAME_DIGITAL(AVR_MOSI_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, AVR_MOSI_PIN)
 #endif
 #if PIN_EXISTS(AVR_SCK)
-  REPORT_NAME_DIGITAL(AVR_SCK_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, AVR_SCK_PIN)
+#endif
+#if PIN_EXISTS(ALARM)
+  REPORT_NAME_DIGITAL(__LINE__, ALARM_PIN)
 #endif
 #if PIN_EXISTS(AVR_SS)
-  REPORT_NAME_DIGITAL(AVR_SS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, AVR_SS_PIN)
 #endif
 #if PIN_EXISTS(BEEPER)
-  REPORT_NAME_DIGITAL(BEEPER_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, BEEPER_PIN)
 #endif
-#if defined(BTN_CENTER) && BTN_CENTER >= 0
-  REPORT_NAME_DIGITAL(BTN_CENTER, __LINE__ )
+#if _EXISTS(BTN_BACK)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_BACK)
 #endif
-#if defined(BTN_DOWN) && BTN_DOWN >= 0
-  REPORT_NAME_DIGITAL(BTN_DOWN, __LINE__ )
+#if _EXISTS(BTN_CENTER)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_CENTER)
 #endif
-#if defined(BTN_DWN) && BTN_DWN >= 0
-  REPORT_NAME_DIGITAL(BTN_DWN, __LINE__ )
+#if _EXISTS(BTN_DOWN)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_DOWN)
 #endif
-#if defined(BTN_EN1) && BTN_EN1 >= 0
-  REPORT_NAME_DIGITAL(BTN_EN1, __LINE__ )
+#if _EXISTS(BTN_DWN)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_DWN)
 #endif
-#if defined(BTN_EN2) && BTN_EN2 >= 0
-  REPORT_NAME_DIGITAL(BTN_EN2, __LINE__ )
+#if _EXISTS(BTN_EN1)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_EN1)
 #endif
-#if defined(BTN_ENC) && BTN_ENC >= 0
-  REPORT_NAME_DIGITAL(BTN_ENC, __LINE__ )
+#if _EXISTS(BTN_EN2)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_EN2)
 #endif
-#if defined(BTN_HOME) && BTN_HOME >= 0
-  REPORT_NAME_DIGITAL(BTN_HOME, __LINE__ )
+#if _EXISTS(BTN_ENC)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_ENC)
 #endif
-#if defined(BTN_LEFT) && BTN_LEFT >= 0
-  REPORT_NAME_DIGITAL(BTN_LEFT, __LINE__ )
+#if _EXISTS(BTN_HOME)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_HOME)
 #endif
-#if defined(BTN_LFT) && BTN_LFT >= 0
-  REPORT_NAME_DIGITAL(BTN_LFT, __LINE__ )
+#if _EXISTS(BTN_LEFT)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_LEFT)
 #endif
-#if defined(BTN_RIGHT) && BTN_RIGHT >= 0
-  REPORT_NAME_DIGITAL(BTN_RIGHT, __LINE__ )
+#if _EXISTS(BTN_LFT)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_LFT)
 #endif
-#if defined(BTN_RT) && BTN_RT >= 0
-  REPORT_NAME_DIGITAL(BTN_RT, __LINE__ )
+#if _EXISTS(BTN_RIGHT)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_RIGHT)
 #endif
-#if defined(BTN_UP) && BTN_UP >= 0
-  REPORT_NAME_DIGITAL(BTN_UP, __LINE__ )
+#if _EXISTS(BTN_RT)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_RT)
+#endif
+#if _EXISTS(BTN_UP)
+  REPORT_NAME_DIGITAL(__LINE__, BTN_UP)
 #endif
 #if PIN_EXISTS(CASE_LIGHT)
-  REPORT_NAME_DIGITAL(CASE_LIGHT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, CASE_LIGHT_PIN)
 #endif
 #if PIN_EXISTS(CONTROLLER_FAN)
-  REPORT_NAME_DIGITAL(CONTROLLER_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, CONTROLLER_FAN_PIN)
 #endif
 #if PIN_EXISTS(CUTOFF_RESET)
-  REPORT_NAME_DIGITAL(CUTOFF_RESET_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, CUTOFF_RESET_PIN)
 #endif
 #if PIN_EXISTS(CUTOFF_TEST)
-  REPORT_NAME_DIGITAL(CUTOFF_TEST_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, CUTOFF_TEST_PIN)
+#endif
+#if _EXISTS(D57)
+  REPORT_NAME_DIGITAL(__LINE__, D57)
+#endif
+#if _EXISTS(D58)
+  REPORT_NAME_DIGITAL(__LINE__, D58)
 #endif
 #if PIN_EXISTS(DAC_DISABLE)
-  REPORT_NAME_DIGITAL(DAC_DISABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, DAC_DISABLE_PIN)
 #endif
-#if defined(DAC_STEPPER_VREF) && DAC_STEPPER_VREF >= 0
-  REPORT_NAME_DIGITAL(DAC_STEPPER_VREF, __LINE__ )
+#if _EXISTS(DAC0_SYNC)
+  REPORT_NAME_DIGITAL(__LINE__, DAC0_SYNC)
+#endif
+#if _EXISTS(DAC1_SYNC)
+  REPORT_NAME_DIGITAL(__LINE__, DAC1_SYNC)
 #endif
 #if PIN_EXISTS(DEBUG)
-  REPORT_NAME_DIGITAL(DEBUG_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, DEBUG_PIN)
 #endif
-#if defined(DIGIPOTS_I2C_SCL) && DIGIPOTS_I2C_SCL >= 0
-  REPORT_NAME_DIGITAL(DIGIPOTS_I2C_SCL, __LINE__ )
+#if _EXISTS(DIGIPOTS_I2C_SCL)
+  REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SCL)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_E0) && DIGIPOTS_I2C_SDA_E0 >= 0
-  REPORT_NAME_DIGITAL(DIGIPOTS_I2C_SDA_E0, __LINE__ )
+#if _EXISTS(DIGIPOTS_I2C_SDA_E0)
+  REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_E0)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_E1) && DIGIPOTS_I2C_SDA_E1 >= 0
-  REPORT_NAME_DIGITAL(DIGIPOTS_I2C_SDA_E1, __LINE__ )
+#if _EXISTS(DIGIPOTS_I2C_SDA_E1)
+  REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_E1)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_X) && DIGIPOTS_I2C_SDA_X >= 0
-  REPORT_NAME_DIGITAL(DIGIPOTS_I2C_SDA_X, __LINE__ )
+#if _EXISTS(DIGIPOTS_I2C_SDA_X)
+  REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_X)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_Y) && DIGIPOTS_I2C_SDA_Y >= 0
-  REPORT_NAME_DIGITAL(DIGIPOTS_I2C_SDA_Y, __LINE__ )
+#if _EXISTS(DIGIPOTS_I2C_SDA_Y)
+  REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_Y)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_Z) && DIGIPOTS_I2C_SDA_Z >= 0
-  REPORT_NAME_DIGITAL(DIGIPOTS_I2C_SDA_Z, __LINE__ )
+#if _EXISTS(DIGIPOTS_I2C_SDA_Z)
+  REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_Z)
 #endif
 #if PIN_EXISTS(DIGIPOTSS)
-  REPORT_NAME_DIGITAL(DIGIPOTSS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, DIGIPOTSS_PIN)
 #endif
-#if defined(DOGLCD_A0) && DOGLCD_A0 >= 0
-  REPORT_NAME_DIGITAL(DOGLCD_A0, __LINE__ )
+#if _EXISTS(DOGLCD_A0)
+  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_A0)
 #endif
-#if defined(DOGLCD_CS) && DOGLCD_CS >= 0
-  REPORT_NAME_DIGITAL(DOGLCD_CS, __LINE__ )
+#if _EXISTS(DOGLCD_CS)
+  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_CS)
 #endif
-#if defined(DOGLCD_MOSI) && DOGLCD_MOSI >= 0
-  REPORT_NAME_DIGITAL(DOGLCD_MOSI, __LINE__ )
+#if _EXISTS(DOGLCD_MOSI)
+  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_MOSI)
 #endif
-#if defined(DOGLCD_SCK) && DOGLCD_SCK >= 0
-  REPORT_NAME_DIGITAL(DOGLCD_SCK, __LINE__ )
+#if _EXISTS(DOGLCD_SCK)
+  REPORT_NAME_DIGITAL(__LINE__, DOGLCD_SCK)
 #endif
 #if PIN_EXISTS(E_MUX0)
-  REPORT_NAME_DIGITAL(E_MUX0_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E_MUX0_PIN)
 #endif
 #if PIN_EXISTS(E_MUX1)
-  REPORT_NAME_DIGITAL(E_MUX1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E_MUX1_PIN)
 #endif
 #if PIN_EXISTS(E_MUX2)
-  REPORT_NAME_DIGITAL(E_MUX2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E_MUX2_PIN)
 #endif
 #if PIN_EXISTS(E_STOP)
-  REPORT_NAME_DIGITAL(E_STOP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E_STOP_PIN)
 #endif
 #if PIN_EXISTS(E0_ATT)
-  REPORT_NAME_DIGITAL(E0_ATT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_ATT_PIN)
 #endif
 #if PIN_EXISTS(E0_AUTO_FAN)
-  REPORT_NAME_DIGITAL(E0_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(E0_CS)
-  REPORT_NAME_DIGITAL(E0_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_CS_PIN)
 #endif
 #if PIN_EXISTS(E0_DIR)
-  REPORT_NAME_DIGITAL(E0_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_DIR_PIN)
 #endif
 #if PIN_EXISTS(E0_ENABLE)
-  REPORT_NAME_DIGITAL(E0_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(E0_MS1)
-  REPORT_NAME_DIGITAL(E0_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_MS1_PIN)
 #endif
 #if PIN_EXISTS(E0_MS2)
-  REPORT_NAME_DIGITAL(E0_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_MS2_PIN)
 #endif
 #if PIN_EXISTS(E0_STEP)
-  REPORT_NAME_DIGITAL(E0_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_STEP_PIN)
 #endif
 #if PIN_EXISTS(E1_AUTO_FAN)
-  REPORT_NAME_DIGITAL(E1_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(E1_CS)
-  REPORT_NAME_DIGITAL(E1_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_CS_PIN)
 #endif
 #if PIN_EXISTS(E1_DIR)
-  REPORT_NAME_DIGITAL(E1_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_DIR_PIN)
 #endif
 #if PIN_EXISTS(E1_ENABLE)
-  REPORT_NAME_DIGITAL(E1_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(E1_MS1)
-  REPORT_NAME_DIGITAL(E1_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_MS1_PIN)
 #endif
 #if PIN_EXISTS(E1_MS2)
-  REPORT_NAME_DIGITAL(E1_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_MS2_PIN)
 #endif
 #if PIN_EXISTS(E1_STEP)
-  REPORT_NAME_DIGITAL(E1_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_STEP_PIN)
 #endif
 #if PIN_EXISTS(E2_AUTO_FAN)
-  REPORT_NAME_DIGITAL(E2_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(E2_CS)
-  REPORT_NAME_DIGITAL(E2_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_CS_PIN)
 #endif
 #if PIN_EXISTS(E2_DIR)
-  REPORT_NAME_DIGITAL(E2_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_DIR_PIN)
 #endif
 #if PIN_EXISTS(E2_ENABLE)
-  REPORT_NAME_DIGITAL(E2_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(E2_MS1)
-  REPORT_NAME_DIGITAL(E2_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_MS1_PIN)
 #endif
 #if PIN_EXISTS(E2_MS2)
-  REPORT_NAME_DIGITAL(E2_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_MS2_PIN)
 #endif
 #if PIN_EXISTS(E2_STEP)
-  REPORT_NAME_DIGITAL(E2_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_STEP_PIN)
 #endif
 #if PIN_EXISTS(E3_AUTO_FAN)
-  REPORT_NAME_DIGITAL(E3_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(E3_CS)
-  REPORT_NAME_DIGITAL(E3_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_CS_PIN)
 #endif
 #if PIN_EXISTS(E3_DIR)
-  REPORT_NAME_DIGITAL(E3_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_DIR_PIN)
 #endif
 #if PIN_EXISTS(E3_ENABLE)
-  REPORT_NAME_DIGITAL(E3_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(E3_MS1)
-  REPORT_NAME_DIGITAL(E3_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_MS1_PIN)
 #endif
 #if PIN_EXISTS(E3_MS2)
-  REPORT_NAME_DIGITAL(E3_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_MS2_PIN)
 #endif
 #if PIN_EXISTS(E3_MS3)
-  REPORT_NAME_DIGITAL(E3_MS3_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_MS3_PIN)
 #endif
 #if PIN_EXISTS(E3_STEP)
-  REPORT_NAME_DIGITAL(E3_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_STEP_PIN)
 #endif
 #if PIN_EXISTS(E4_AUTO_FAN)
-  REPORT_NAME_DIGITAL(E4_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(E4_CS)
-  REPORT_NAME_DIGITAL(E4_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_CS_PIN)
 #endif
 #if PIN_EXISTS(E4_DIR)
-  REPORT_NAME_DIGITAL(E4_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_DIR_PIN)
 #endif
 #if PIN_EXISTS(E4_ENABLE)
-  REPORT_NAME_DIGITAL(E4_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(E4_MS1)
-  REPORT_NAME_DIGITAL(E4_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_MS1_PIN)
 #endif
 #if PIN_EXISTS(E4_MS2)
-  REPORT_NAME_DIGITAL(E4_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_MS2_PIN)
 #endif
 #if PIN_EXISTS(E4_MS3)
-  REPORT_NAME_DIGITAL(E4_MS3_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_MS3_PIN)
 #endif
 #if PIN_EXISTS(E4_STEP)
-  REPORT_NAME_DIGITAL(E4_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_STEP_PIN)
 #endif
-#if defined(EXT_AUX_A0) && EXT_AUX_A0 >= 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(EXT_AUX_A0, __LINE__ )
+#if _EXISTS(ENET_CRS)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_CRS)
 #endif
-#if defined(EXT_AUX_A0) && EXT_AUX_A0 >= 0 && EXT_AUX_A0 >= NUM_ANALOG_INPUTS
-  REPORT_NAME_DIGITAL(EXT_AUX_A0, __LINE__ )
+#if _EXISTS(ENET_MDIO)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_MDIO)
 #endif
-#if defined(EXT_AUX_A0_IO) && EXT_AUX_A0_IO >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_A0_IO, __LINE__ )
+#if _EXISTS(ENET_MOC)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_MOC)
 #endif
-#if defined(EXT_AUX_A1) && EXT_AUX_A1 >= 0 && EXT_AUX_A1 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(EXT_AUX_A1, __LINE__ )
+#if _EXISTS(ENET_RX_ER)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_RX_ER)
 #endif
-#if defined(EXT_AUX_A1) && EXT_AUX_A1 >= 0 && EXT_AUX_A1 >= NUM_ANALOG_INPUTS
-  REPORT_NAME_DIGITAL(EXT_AUX_A1, __LINE__ )
+#if _EXISTS(ENET_RXD0)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_RXD0)
 #endif
-#if defined(EXT_AUX_A1_IO) && EXT_AUX_A1_IO >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_A1_IO, __LINE__ )
+#if _EXISTS(ENET_RXD1)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_RXD1)
 #endif
-#if defined(EXT_AUX_A2) && EXT_AUX_A2 >= 0 && EXT_AUX_A2 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(EXT_AUX_A2, __LINE__ )
+#if _EXISTS(ENET_TX_EN)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_TX_EN)
 #endif
-#if defined(EXT_AUX_A2) && EXT_AUX_A2 >= 0 && EXT_AUX_A2 >= NUM_ANALOG_INPUTS
-  REPORT_NAME_DIGITAL(EXT_AUX_A2, __LINE__ )
+#if _EXISTS(ENET_TXD0)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_TXD0)
 #endif
-#if defined(EXT_AUX_A2_IO) && EXT_AUX_A2_IO >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_A2_IO, __LINE__ )
+#if _EXISTS(ENET_TXD1)
+  REPORT_NAME_DIGITAL(__LINE__, ENET_TXD1)
 #endif
-#if defined(EXT_AUX_A3) && EXT_AUX_A3 >= 0 && EXT_AUX_A3 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(EXT_AUX_A3, __LINE__ )
+#if PIN_EXISTS(EXP_VOLTAGE_LEVEL)
+  REPORT_NAME_DIGITAL(__LINE__, EXP_VOLTAGE_LEVEL_PIN)
 #endif
-#if defined(EXT_AUX_A3) && EXT_AUX_A3 >= 0 && EXT_AUX_A3 >= NUM_ANALOG_INPUTS
-  REPORT_NAME_DIGITAL(EXT_AUX_A3, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A0)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
 #endif
-#if defined(EXT_AUX_A3_IO) && EXT_AUX_A3_IO >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_A3_IO, __LINE__ )
+#if _EXISTS(EXT_AUX_A0) && EXT_AUX_A0 >= NUM_ANALOG_INPUTS
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A0)
 #endif
-#if defined(EXT_AUX_A4) && EXT_AUX_A4 >= 0 && EXT_AUX_A4 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(EXT_AUX_A4, __LINE__ )
+#if _EXISTS(EXT_AUX_A0_IO)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A0_IO)
 #endif
-#if defined(EXT_AUX_A4) && EXT_AUX_A4 >= 0 && EXT_AUX_A4 >= NUM_ANALOG_INPUTS
-  REPORT_NAME_DIGITAL(EXT_AUX_A4, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A1)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A1)
 #endif
-#if defined(EXT_AUX_A4_IO) && EXT_AUX_A4_IO >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_A4_IO, __LINE__ )
+#if _EXISTS(EXT_AUX_A1) && EXT_AUX_A1 >= NUM_ANALOG_INPUTS
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A1)
 #endif
-#if defined(EXT_AUX_PWM_D24) && EXT_AUX_PWM_D24 >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_PWM_D24, __LINE__ )
+#if _EXISTS(EXT_AUX_A1_IO)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A1_IO)
 #endif
-#if defined(EXT_AUX_RX1_D2) && EXT_AUX_RX1_D2 >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_RX1_D2, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A2)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A2)
 #endif
-#if defined(EXT_AUX_SCL_D0) && EXT_AUX_SCL_D0 >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_SCL_D0, __LINE__ )
+#if _EXISTS(EXT_AUX_A2) && EXT_AUX_A2 >= NUM_ANALOG_INPUTS
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A2)
 #endif
-#if defined(EXT_AUX_SDA_D1) && EXT_AUX_SDA_D1 >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_SDA_D1, __LINE__ )
+#if _EXISTS(EXT_AUX_A2_IO)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A2_IO)
 #endif
-#if defined(EXT_AUX_TX1_D3) && EXT_AUX_TX1_D3 >= 0
-  REPORT_NAME_DIGITAL(EXT_AUX_TX1_D3, __LINE__ )
+#if _EXISTS_ANALOG(EXT_AUX_A3)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A3)
 #endif
-#if defined(EXTRUDER_0_AUTO_FAN) && EXTRUDER_0_AUTO_FAN >= 0
-  REPORT_NAME_DIGITAL(EXTRUDER_0_AUTO_FAN, __LINE__ )
+#if _EXISTS(EXT_AUX_A3) && EXT_AUX_A3 >= NUM_ANALOG_INPUTS
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A3)
 #endif
-#if defined(EXTRUDER_1_AUTO_FAN) && EXTRUDER_1_AUTO_FAN >= 0
-  REPORT_NAME_DIGITAL(EXTRUDER_1_AUTO_FAN, __LINE__ )
+#if _EXISTS(EXT_AUX_A3_IO)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A3_IO)
+#endif
+#if _EXISTS_ANALOG(EXT_AUX_A4)
+  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A4)
+#endif
+#if _EXISTS(EXT_AUX_A4) && EXT_AUX_A4 >= NUM_ANALOG_INPUTS
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A4)
+#endif
+#if _EXISTS(EXT_AUX_A4_IO)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A4_IO)
+#endif
+#if _EXISTS(EXT_AUX_PWM_D24)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_PWM_D24)
+#endif
+#if _EXISTS(EXT_AUX_RX1_D2)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_RX1_D2)
+#endif
+#if _EXISTS(EXT_AUX_SCL_D0)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_SCL_D0)
+#endif
+#if _EXISTS(EXT_AUX_SDA_D1)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_SDA_D1)
+#endif
+#if _EXISTS(EXT_AUX_TX1_D3)
+  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_TX1_D3)
+#endif
+#if _EXISTS(EXTRUDER_0_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, EXTRUDER_0_AUTO_FAN)
+#endif
+#if _EXISTS(EXTRUDER_1_AUTO_FAN)
+  REPORT_NAME_DIGITAL(__LINE__, EXTRUDER_1_AUTO_FAN)
 #endif
 #if PIN_EXISTS(FAN)
-  REPORT_NAME_DIGITAL(FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, FAN_PIN)
 #endif
 #if PIN_EXISTS(FAN1)
-  REPORT_NAME_DIGITAL(FAN1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, FAN1_PIN)
 #endif
 #if PIN_EXISTS(FAN2)
-  REPORT_NAME_DIGITAL(FAN2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, FAN2_PIN)
 #endif
 #if PIN_EXISTS(FAN3)
-  REPORT_NAME_DIGITAL(FAN3_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, FAN3_PIN)
 #endif
 #if PIN_EXISTS(FIL_RUNOUT)
-  REPORT_NAME_DIGITAL(FIL_RUNOUT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT_PIN)
 #endif
-#if PIN_EXISTS(FILWIDTH) && FILWIDTH_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(FILWIDTH_PIN, __LINE__ )
+#if PIN_EXISTS_ANALOG(FILWIDTH)
+  REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
 #endif
 #if PIN_EXISTS(HEATER_0)
-  REPORT_NAME_DIGITAL(HEATER_0_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_0_PIN)
 #endif
 #if PIN_EXISTS(HEATER_1)
-  REPORT_NAME_DIGITAL(HEATER_1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_1_PIN)
 #endif
 #if PIN_EXISTS(HEATER_2)
-  REPORT_NAME_DIGITAL(HEATER_2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_2_PIN)
 #endif
 #if PIN_EXISTS(HEATER_3)
-  REPORT_NAME_DIGITAL(HEATER_3_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_3_PIN)
 #endif
 #if PIN_EXISTS(HEATER_4)
-  REPORT_NAME_DIGITAL(HEATER_4_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_4_PIN)
 #endif
 #if PIN_EXISTS(HEATER_5)
-  REPORT_NAME_DIGITAL(HEATER_5_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_5_PIN)
 #endif
 #if PIN_EXISTS(HEATER_6)
-  REPORT_NAME_DIGITAL(HEATER_6_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_6_PIN)
 #endif
 #if PIN_EXISTS(HEATER_7)
-  REPORT_NAME_DIGITAL(HEATER_7_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_7_PIN)
 #endif
 #if PIN_EXISTS(HEATER_BED)
-  REPORT_NAME_DIGITAL(HEATER_BED_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HEATER_BED_PIN)
 #endif
 #if PIN_EXISTS(HOME)
-  REPORT_NAME_DIGITAL(HOME_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, HOME_PIN)
 #endif
 #if PIN_EXISTS(I2C_SCL)
-  REPORT_NAME_DIGITAL(I2C_SCL_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, I2C_SCL_PIN)
 #endif
 #if PIN_EXISTS(I2C_SDA)
-  REPORT_NAME_DIGITAL(I2C_SDA_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, I2C_SDA_PIN)
 #endif
 #if PIN_EXISTS(KILL)
-  REPORT_NAME_DIGITAL(KILL_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, KILL_PIN)
 #endif
 #if PIN_EXISTS(LCD_BACKLIGHT)
-  REPORT_NAME_DIGITAL(LCD_BACKLIGHT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, LCD_BACKLIGHT_PIN)
 #endif
-#if defined(LCD_CONTRAST) && LCD_CONTRAST >= 0
-  REPORT_NAME_DIGITAL(LCD_CONTRAST, __LINE__ )
+#if _EXISTS(LCD_PINS_D4)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D4)
 #endif
-#if defined(LCD_PINS_D4) && LCD_PINS_D4 >= 0
-  REPORT_NAME_DIGITAL(LCD_PINS_D4, __LINE__ )
+#if _EXISTS(LCD_PINS_D5)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D5)
 #endif
-#if defined(LCD_PINS_D5) && LCD_PINS_D5 >= 0
-  REPORT_NAME_DIGITAL(LCD_PINS_D5, __LINE__ )
+#if _EXISTS(LCD_PINS_D6)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D6)
 #endif
-#if defined(LCD_PINS_D6) && LCD_PINS_D6 >= 0
-  REPORT_NAME_DIGITAL(LCD_PINS_D6, __LINE__ )
+#if _EXISTS(LCD_PINS_D7)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D7)
 #endif
-#if defined(LCD_PINS_D7) && LCD_PINS_D7 >= 0
-  REPORT_NAME_DIGITAL(LCD_PINS_D7, __LINE__ )
+#if _EXISTS(LCD_PINS_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_ENABLE)
 #endif
-#if defined(LCD_PINS_ENABLE) && LCD_PINS_ENABLE >= 0
-  REPORT_NAME_DIGITAL(LCD_PINS_ENABLE, __LINE__ )
+#if _EXISTS(LCD_PINS_RS)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_RS)
 #endif
-#if defined(LCD_PINS_RS) && LCD_PINS_RS >= 0
-  REPORT_NAME_DIGITAL(LCD_PINS_RS, __LINE__ )
-#endif
-#if defined(LCD_SDSS) && LCD_SDSS >= 0
-  REPORT_NAME_DIGITAL(LCD_SDSS, __LINE__ )
+#if _EXISTS(LCD_SDSS)
+  REPORT_NAME_DIGITAL(__LINE__, LCD_SDSS)
 #endif
 #if PIN_EXISTS(LED_GREEN)
-  REPORT_NAME_DIGITAL(LED_GREEN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, LED_GREEN_PIN)
 #endif
 #if PIN_EXISTS(LED)
-  REPORT_NAME_DIGITAL(LED_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, LED_PIN)
 #endif
-#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && MAIN_VOLTAGE_MEASURE_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(MAIN_VOLTAGE_MEASURE_PIN, __LINE__ )
+#if PIN_EXISTS(LED_RED)
+  REPORT_NAME_DIGITAL(__LINE__, LED_RED_PIN)
 #endif
-#if defined(MAX6675_SS) && MAX6675_SS >= 0
-  REPORT_NAME_DIGITAL(MAX6675_SS, __LINE__ )
+#if PIN_EXISTS(MAX)
+  REPORT_NAME_DIGITAL(__LINE__, MAX_PIN)
 #endif
-// #if defined(MISO) && MISO >= 0
-//   REPORT_NAME_DIGITAL(MISO, __LINE__ )
+#if PIN_EXISTS(MAX6675_DO)
+  REPORT_NAME_DIGITAL(__LINE__, MAX6675_DO_PIN)
+#endif
+#if PIN_EXISTS(MAX6675_SCK)
+  REPORT_NAME_DIGITAL(__LINE__, MAX6675_SCK_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(MAIN_VOLTAGE_MEASURE)
+  REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
+#endif
+#if _EXISTS(MAX6675_SS)
+  REPORT_NAME_DIGITAL(__LINE__, MAX6675_SS)
+#endif
+// #if _EXISTS(MISO)
+//   REPORT_NAME_DIGITAL(__LINE__, MISO)
 // #endif
 #if PIN_EXISTS(MISO)
-  REPORT_NAME_DIGITAL(MISO_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MISO_PIN)
 #endif
 #if PIN_EXISTS(MOSFET_A)
-  REPORT_NAME_DIGITAL(MOSFET_A_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MOSFET_A_PIN)
 #endif
 #if PIN_EXISTS(MOSFET_B)
-  REPORT_NAME_DIGITAL(MOSFET_B_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MOSFET_B_PIN)
 #endif
 #if PIN_EXISTS(MOSFET_C)
-  REPORT_NAME_DIGITAL(MOSFET_C_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MOSFET_C_PIN)
 #endif
 #if PIN_EXISTS(MOSFET_D)
-  REPORT_NAME_DIGITAL(MOSFET_D_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MOSFET_D_PIN)
 #endif
-// #if defined(MOSI) && MOSI >= 0
-//   REPORT_NAME_DIGITAL(MOSI, __LINE__ )
+// #if _EXISTS(MOSI)
+//   REPORT_NAME_DIGITAL(__LINE__, MOSI)
 // #endif
 #if PIN_EXISTS(MOSI)
-  REPORT_NAME_DIGITAL(MOSI_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MOSI_PIN)
 #endif
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-  REPORT_NAME_DIGITAL(MOTOR_CURRENT_PWM_E_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_E_PIN)
 #endif
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
-  REPORT_NAME_DIGITAL(MOTOR_CURRENT_PWM_XY_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_XY_PIN)
 #endif
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-  REPORT_NAME_DIGITAL(MOTOR_CURRENT_PWM_Z_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_CURRENT_PWM_Z_PIN)
+#endif
+#if PIN_EXISTS(MOTOR_FAULT)
+  REPORT_NAME_DIGITAL(__LINE__, MOTOR_FAULT_PIN)
+#endif
+#if PIN_EXISTS(NUM_DIGITAL)
+  REPORT_NAME_DIGITAL(__LINE__, NUM_DIGITAL_PINS)
 #endif
 #if PIN_EXISTS(ORIG_E0_AUTO_FAN)
-  REPORT_NAME_DIGITAL(ORIG_E0_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, ORIG_E0_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(ORIG_E1_AUTO_FAN)
-  REPORT_NAME_DIGITAL(ORIG_E1_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, ORIG_E1_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(ORIG_E2_AUTO_FAN)
-  REPORT_NAME_DIGITAL(ORIG_E2_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, ORIG_E2_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(ORIG_E3_AUTO_FAN)
-  REPORT_NAME_DIGITAL(ORIG_E3_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, ORIG_E3_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(ORIG_E4_AUTO_FAN)
-  REPORT_NAME_DIGITAL(ORIG_E4_AUTO_FAN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, ORIG_E4_AUTO_FAN_PIN)
 #endif
 #if PIN_EXISTS(PHOTOGRAPH)
-  REPORT_NAME_DIGITAL(PHOTOGRAPH_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, PHOTOGRAPH_PIN)
 #endif
 #if PIN_EXISTS(PS_ON)
-  REPORT_NAME_DIGITAL(PS_ON_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, PS_ON_PIN)
 #endif
 #if PIN_EXISTS(PWM_1)
-  REPORT_NAME_DIGITAL(PWM_1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, PWM_1_PIN)
 #endif
 #if PIN_EXISTS(PWM_2)
-  REPORT_NAME_DIGITAL(PWM_2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, PWM_2_PIN)
+#endif
+#if _EXISTS(REF_CLK)
+  REPORT_NAME_DIGITAL(__LINE__, REF_CLK)
 #endif
 #if PIN_EXISTS(RAMPS_D10)
-  REPORT_NAME_DIGITAL(RAMPS_D10_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, RAMPS_D10_PIN)
 #endif
 #if PIN_EXISTS(RAMPS_D8)
-  REPORT_NAME_DIGITAL(RAMPS_D8_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, RAMPS_D8_PIN)
 #endif
 #if PIN_EXISTS(RAMPS_D9)
-  REPORT_NAME_DIGITAL(RAMPS_D9_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, RAMPS_D9_PIN)
 #endif
 #if PIN_EXISTS(RGB_LED_R)
-  REPORT_NAME_DIGITAL(RGB_LED_R_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_R_PIN)
 #endif
 #if PIN_EXISTS(RGB_LED_G)
-  REPORT_NAME_DIGITAL(RGB_LED_G_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_G_PIN)
 #endif
 #if PIN_EXISTS(RGB_LED_B)
-  REPORT_NAME_DIGITAL(RGB_LED_B_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_B_PIN)
 #endif
 #if PIN_EXISTS(RGB_LED_W)
-  REPORT_NAME_DIGITAL(RGB_LED_W_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, RGB_LED_W_PIN)
 #endif
 #if PIN_EXISTS(RX_ENABLE)
-  REPORT_NAME_DIGITAL(RX_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, RX_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(SAFETY_TRIGGERED)
-  REPORT_NAME_DIGITAL(SAFETY_TRIGGERED_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SAFETY_TRIGGERED_PIN)
 #endif
-// #if defined(SCK) &&  SCK >= 0
-//   REPORT_NAME_DIGITAL(SCK, __LINE__ )
+// #if _EXISTS(SCK)
+//   REPORT_NAME_DIGITAL(__LINE__, SCK)
 // #endif
 #if PIN_EXISTS(SCK)
-  REPORT_NAME_DIGITAL(SCK_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SCK_PIN)
 #endif
-#if defined(SCL) && SCL >= 0
-  REPORT_NAME_DIGITAL(SCL, __LINE__ )
+#if _EXISTS(SCL)
+  REPORT_NAME_DIGITAL(__LINE__, SCL)
 #endif
 #if PIN_EXISTS(SD_DETECT)
-  REPORT_NAME_DIGITAL(SD_DETECT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SD_DETECT_PIN)
 #endif
-#if defined(SDA) && SDA >= 0
-  REPORT_NAME_DIGITAL(SDA, __LINE__ )
+#if _EXISTS(SDA)
+  REPORT_NAME_DIGITAL(__LINE__, SDA)
 #endif
-#if defined(SDPOWER) && SDPOWER >= 0
-  REPORT_NAME_DIGITAL(SDPOWER, __LINE__ )
+#if _EXISTS(SDPOWER)
+  REPORT_NAME_DIGITAL(__LINE__, SDPOWER)
 #endif
-#if defined(SDSS) && SDSS >= 0
-  REPORT_NAME_DIGITAL(SDSS, __LINE__ )
+#if _EXISTS(SDSS)
+  REPORT_NAME_DIGITAL(__LINE__, SDSS)
+#endif
+#if _EXISTS(SERVO0)
+  REPORT_NAME_DIGITAL(__LINE__, SERVO0)
 #endif
 #if PIN_EXISTS(SERVO0)
-  REPORT_NAME_DIGITAL(SERVO0_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SERVO0_PIN)
 #endif
 #if PIN_EXISTS(SERVO1)
-  REPORT_NAME_DIGITAL(SERVO1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SERVO1_PIN)
 #endif
 #if PIN_EXISTS(SERVO2)
-  REPORT_NAME_DIGITAL(SERVO2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SERVO2_PIN)
 #endif
 #if PIN_EXISTS(SERVO3)
-  REPORT_NAME_DIGITAL(SERVO3_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SERVO3_PIN)
 #endif
-#if defined(SHIFT_CLK) && SHIFT_CLK >= 0
-  REPORT_NAME_DIGITAL(SHIFT_CLK, __LINE__ )
+#if _EXISTS(SHIFT_CLK)
+  REPORT_NAME_DIGITAL(__LINE__, SHIFT_CLK)
 #endif
-#if defined(SHIFT_EN) && SHIFT_EN >= 0
-  REPORT_NAME_DIGITAL(SHIFT_EN, __LINE__ )
+#if _EXISTS(SHIFT_EN)
+  REPORT_NAME_DIGITAL(__LINE__, SHIFT_EN)
 #endif
-#if defined(SHIFT_LD) && SHIFT_LD >= 0
-  REPORT_NAME_DIGITAL(SHIFT_LD, __LINE__ )
+#if _EXISTS(SHIFT_LD)
+  REPORT_NAME_DIGITAL(__LINE__, SHIFT_LD)
 #endif
-#if defined(SHIFT_OUT) && SHIFT_OUT >= 0
-  REPORT_NAME_DIGITAL(SHIFT_OUT, __LINE__ )
+#if _EXISTS(SHIFT_OUT)
+  REPORT_NAME_DIGITAL(__LINE__, SHIFT_OUT)
 #endif
 #if PIN_EXISTS(SLED)
-  REPORT_NAME_DIGITAL(SLED_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SLED_PIN)
 #endif
 #if PIN_EXISTS(SLEEP_WAKE)
-  REPORT_NAME_DIGITAL(SLEEP_WAKE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SLEEP_WAKE_PIN)
 #endif
 #if PIN_EXISTS(SOL0)
-  REPORT_NAME_DIGITAL(SOL0_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SOL0_PIN)
 #endif
 #if PIN_EXISTS(SOL1)
-  REPORT_NAME_DIGITAL(SOL1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SOL1_PIN)
 #endif
 #if PIN_EXISTS(SOL2)
-  REPORT_NAME_DIGITAL(SOL2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SOL2_PIN)
 #endif
 #if PIN_EXISTS(SOL3)
-  REPORT_NAME_DIGITAL(SOL3_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SOL3_PIN)
 #endif
 #if PIN_EXISTS(SOL4)
-  REPORT_NAME_DIGITAL(SOL4_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SOL4_PIN)
 #endif
-#if defined(SPARE_IO) && SPARE_IO >= 0
-  REPORT_NAME_DIGITAL(SPARE_IO, __LINE__ )
+#if _EXISTS(SPARE_IO)
+  REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
+#endif
+#if _EXISTS(SPI_CHAN_DAC)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_CHAN_DAC)
+#endif
+#if _EXISTS(SPI_CHAN_EEPROM1)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_CHAN_EEPROM1)
+#endif
+#if _EXISTS(SPI_EEPROM)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM)
+#endif
+#if _EXISTS(SPI_EEPROM1_CS)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM1_CS)
+#endif
+#if _EXISTS(SPI_EEPROM2_CS)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM2_CS)
+#endif
+#if _EXISTS(SPI_FLASH_CS)
+  REPORT_NAME_DIGITAL(__LINE__, SPI_FLASH_CS)
 #endif
 #if PIN_EXISTS(SPINDLE_DIR)
-  REPORT_NAME_DIGITAL(SPINDLE_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SPINDLE_DIR_PIN)
 #endif
 #if PIN_EXISTS(SPINDLE_ENABLE)
-  REPORT_NAME_DIGITAL(SPINDLE_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SPINDLE_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(SPINDLE_LASER_ENABLE)
-  REPORT_NAME_DIGITAL(SPINDLE_LASER_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(SPINDLE_LASER_PWM)
-  REPORT_NAME_DIGITAL(SPINDLE_LASER_PWM_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SPINDLE_LASER_PWM_PIN)
 #endif
 #if PIN_EXISTS(SR_CLK)
-  REPORT_NAME_DIGITAL(SR_CLK_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SR_CLK_PIN)
 #endif
 #if PIN_EXISTS(SR_DATA)
-  REPORT_NAME_DIGITAL(SR_DATA_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SR_DATA_PIN)
 #endif
 #if PIN_EXISTS(SR_STROBE)
-  REPORT_NAME_DIGITAL(SR_STROBE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SR_STROBE_PIN)
 #endif
 #if PIN_EXISTS(SS)
-  REPORT_NAME_DIGITAL(SS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SS_PIN)
 #endif
 #if PIN_EXISTS(STAT_LED_BLUE)
-  REPORT_NAME_DIGITAL(STAT_LED_BLUE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, STAT_LED_BLUE_PIN)
 #endif
-#if defined(STAT_LED_RED_LED) && STAT_LED_RED_LED >= 0
-  REPORT_NAME_DIGITAL(STAT_LED_RED_LED, __LINE__ )
+#if _EXISTS(STAT_LED_RED_LED)
+  REPORT_NAME_DIGITAL(__LINE__, STAT_LED_RED_LED)
 #endif
 #if PIN_EXISTS(STAT_LED_RED)
-  REPORT_NAME_DIGITAL(STAT_LED_RED_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, STAT_LED_RED_PIN)
 #endif
 #if PIN_EXISTS(STEPPER_RESET)
-  REPORT_NAME_DIGITAL(STEPPER_RESET_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, STEPPER_RESET_PIN)
 #endif
 #if PIN_EXISTS(SUICIDE)
-  REPORT_NAME_DIGITAL(SUICIDE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, SUICIDE_PIN)
 #endif
-#if defined(TC1) && TC1 >= 0 && TC1 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TC1, __LINE__ )
+#if _EXISTS(THERMO_CS1)
+  REPORT_NAME_DIGITAL(__LINE__, THERMO_CS1)
 #endif
-#if defined(TC2) && TC2 >= 0 && TC2 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TC2, __LINE__ )
+#if _EXISTS(THERMO_CS2)
+  REPORT_NAME_DIGITAL(__LINE__, THERMO_CS2)
 #endif
-#if PIN_EXISTS(TEMP_0) && TEMP_0_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TEMP_0_PIN, __LINE__ )
+#if _EXISTS_ANALOG(TC1)
+  REPORT_NAME_ANALOG(__LINE__, TC1)
 #endif
-#if PIN_EXISTS(TEMP_1) && TEMP_1_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TEMP_1_PIN, __LINE__ )
+#if _EXISTS_ANALOG(TC2)
+  REPORT_NAME_ANALOG(__LINE__, TC2)
 #endif
-#if PIN_EXISTS(TEMP_2) && TEMP_2_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TEMP_2_PIN, __LINE__ )
+#if PIN_EXISTS_ANALOG(TEMP_0)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
 #endif
-#if PIN_EXISTS(TEMP_3) && TEMP_3_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TEMP_3_PIN, __LINE__ )
+#if PIN_EXISTS_ANALOG(TEMP_1)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
 #endif
-#if PIN_EXISTS(TEMP_4) && TEMP_4_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TEMP_4_PIN, __LINE__ )
+#if PIN_EXISTS_ANALOG(TEMP_2)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
 #endif
-#if PIN_EXISTS(TEMP_BED) && TEMP_BED_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TEMP_BED_PIN, __LINE__ )
+#if PIN_EXISTS_ANALOG(TEMP_3)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
 #endif
-#if PIN_EXISTS(TEMP_CHAMBER) && TEMP_CHAMBER_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TEMP_CHAMBER_PIN, __LINE__ )
+#if PIN_EXISTS_ANALOG(TEMP_4)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
 #endif
-#if PIN_EXISTS(TEMP_X) && TEMP_X_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(TEMP_X_PIN, __LINE__ )
+#if PIN_EXISTS_ANALOG(TEMP_BED)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_CHAMBER)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
+#endif
+#if PIN_EXISTS_ANALOG(TEMP_X)
+  REPORT_NAME_ANALOG(__LINE__, TEMP_X_PIN)
 #endif
 #if PIN_EXISTS(THERMO_DO)
-  REPORT_NAME_DIGITAL(THERMO_DO_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, THERMO_DO_PIN)
 #endif
 #if PIN_EXISTS(THERMO_SCK)
-  REPORT_NAME_DIGITAL(THERMO_SCK_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, THERMO_SCK_PIN)
 #endif
 #if PIN_EXISTS(TLC_BLANK)
-  REPORT_NAME_DIGITAL(TLC_BLANK_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TLC_BLANK_PIN)
 #endif
 #if PIN_EXISTS(TLC_CLOCK)
-  REPORT_NAME_DIGITAL(TLC_CLOCK_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TLC_CLOCK_PIN)
 #endif
 #if PIN_EXISTS(TLC_DATA)
-  REPORT_NAME_DIGITAL(TLC_DATA_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TLC_DATA_PIN)
 #endif
 #if PIN_EXISTS(TLC_XLAT)
-  REPORT_NAME_DIGITAL(TLC_XLAT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TLC_XLAT_PIN)
 #endif
 #if PIN_EXISTS(TOOL_0)
-  REPORT_NAME_DIGITAL(TOOL_0_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_0_PIN)
 #endif
 #if PIN_EXISTS(TOOL_0_PWM)
-  REPORT_NAME_DIGITAL(TOOL_0_PWM_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_0_PWM_PIN)
 #endif
 #if PIN_EXISTS(TOOL_1)
-  REPORT_NAME_DIGITAL(TOOL_1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_1_PIN)
 #endif
 #if PIN_EXISTS(TOOL_1_PWM)
-  REPORT_NAME_DIGITAL(TOOL_1_PWM_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_1_PWM_PIN)
 #endif
 #if PIN_EXISTS(TOOL_2)
-  REPORT_NAME_DIGITAL(TOOL_2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_2_PIN)
 #endif
 #if PIN_EXISTS(TOOL_2_PWM)
-  REPORT_NAME_DIGITAL(TOOL_2_PWM_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_2_PWM_PIN)
 #endif
 #if PIN_EXISTS(TOOL_3)
-  REPORT_NAME_DIGITAL(TOOL_3_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_3_PIN)
 #endif
 #if PIN_EXISTS(TOOL_3_PWM)
-  REPORT_NAME_DIGITAL(TOOL_3_PWM_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_3_PWM_PIN)
 #endif
 #if PIN_EXISTS(TOOL_PWM)
-  REPORT_NAME_DIGITAL(TOOL_PWM_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TOOL_PWM_PIN)
 #endif
 #if PIN_EXISTS(TX_ENABLE)
-  REPORT_NAME_DIGITAL(TX_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, TX_ENABLE_PIN)
 #endif
-#if defined(UI1) && UI1 >= 0
-  REPORT_NAME_DIGITAL(UI1, __LINE__ )
+#if _EXISTS(UI1)
+  REPORT_NAME_DIGITAL(__LINE__, UI1)
 #endif
-#if defined(UI2) && UI2 >= 0
-  REPORT_NAME_DIGITAL(UI2, __LINE__ )
+#if _EXISTS(UI2)
+  REPORT_NAME_DIGITAL(__LINE__, UI2)
 #endif
-#if defined(UNUSED_PWM) && UNUSED_PWM >= 0
-  REPORT_NAME_DIGITAL(UNUSED_PWM, __LINE__ )
+#if _EXISTS(UNUSED_PWM)
+  REPORT_NAME_DIGITAL(__LINE__, UNUSED_PWM)
 #endif
 #if PIN_EXISTS(X_ATT)
-  REPORT_NAME_DIGITAL(X_ATT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_ATT_PIN)
 #endif
 #if PIN_EXISTS(X_CS)
-  REPORT_NAME_DIGITAL(X_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_CS_PIN)
 #endif
 #if PIN_EXISTS(X_DIR)
-  REPORT_NAME_DIGITAL(X_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_DIR_PIN)
 #endif
 #if PIN_EXISTS(X_ENABLE)
-  REPORT_NAME_DIGITAL(X_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(X_MAX)
-  REPORT_NAME_DIGITAL(X_MAX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_MAX_PIN)
 #endif
 #if PIN_EXISTS(X_MIN)
-  REPORT_NAME_DIGITAL(X_MIN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_MIN_PIN)
 #endif
 #if PIN_EXISTS(X_MS1)
-  REPORT_NAME_DIGITAL(X_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_MS1_PIN)
 #endif
 #if PIN_EXISTS(X_MS2)
-  REPORT_NAME_DIGITAL(X_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_MS2_PIN)
 #endif
 #if PIN_EXISTS(X_STEP)
-  REPORT_NAME_DIGITAL(X_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_STEP_PIN)
 #endif
 #if PIN_EXISTS(X_STOP)
-  REPORT_NAME_DIGITAL(X_STOP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_STOP_PIN)
 #endif
 #if PIN_EXISTS(X2_DIR)
-  REPORT_NAME_DIGITAL(X2_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X2_DIR_PIN)
 #endif
 #if PIN_EXISTS(X2_ENABLE)
-  REPORT_NAME_DIGITAL(X2_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X2_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(X2_STEP)
-  REPORT_NAME_DIGITAL(X2_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X2_STEP_PIN)
 #endif
 #if PIN_EXISTS(Y_ATT)
-  REPORT_NAME_DIGITAL(Y_ATT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_ATT_PIN)
 #endif
 #if PIN_EXISTS(Y_CS)
-  REPORT_NAME_DIGITAL(Y_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_CS_PIN)
 #endif
 #if PIN_EXISTS(Y_DIR)
-  REPORT_NAME_DIGITAL(Y_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_DIR_PIN)
 #endif
 #if PIN_EXISTS(Y_ENABLE)
-  REPORT_NAME_DIGITAL(Y_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(Y_MAX)
-  REPORT_NAME_DIGITAL(Y_MAX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_MAX_PIN)
 #endif
 #if PIN_EXISTS(Y_MIN)
-  REPORT_NAME_DIGITAL(Y_MIN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_MIN_PIN)
 #endif
 #if PIN_EXISTS(Y_MS1)
-  REPORT_NAME_DIGITAL(Y_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_MS1_PIN)
 #endif
 #if PIN_EXISTS(Y_MS2)
-  REPORT_NAME_DIGITAL(Y_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_MS2_PIN)
 #endif
 #if PIN_EXISTS(Y_STEP)
-  REPORT_NAME_DIGITAL(Y_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_STEP_PIN)
 #endif
 #if PIN_EXISTS(Y_STOP)
-  REPORT_NAME_DIGITAL(Y_STOP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_STOP_PIN)
 #endif
 #if PIN_EXISTS(Y2_DIR)
-  REPORT_NAME_DIGITAL(Y2_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y2_DIR_PIN)
 #endif
 #if PIN_EXISTS(Y2_ENABLE)
-  REPORT_NAME_DIGITAL(Y2_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y2_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(Y2_STEP)
-  REPORT_NAME_DIGITAL(Y2_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y2_STEP_PIN)
 #endif
 #if PIN_EXISTS(Z_ATT)
-  REPORT_NAME_DIGITAL(Z_ATT_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_ATT_PIN)
 #endif
 #if PIN_EXISTS(Z_CS)
-  REPORT_NAME_DIGITAL(Z_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_CS_PIN)
 #endif
 #if PIN_EXISTS(Z_DIR)
-  REPORT_NAME_DIGITAL(Z_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_DIR_PIN)
 #endif
 #if PIN_EXISTS(Z_ENABLE)
-  REPORT_NAME_DIGITAL(Z_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(Z_MAX)
-  REPORT_NAME_DIGITAL(Z_MAX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_MAX_PIN)
 #endif
 #if PIN_EXISTS(Z_MIN)
-  REPORT_NAME_DIGITAL(Z_MIN_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PIN)
 #endif
 #if PIN_EXISTS(Z_MIN_PROBE)
-  REPORT_NAME_DIGITAL(Z_MIN_PROBE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
 #endif
 #if PIN_EXISTS(Z_MS1)
-  REPORT_NAME_DIGITAL(Z_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_MS1_PIN)
 #endif
 #if PIN_EXISTS(Z_MS2)
-  REPORT_NAME_DIGITAL(Z_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_MS2_PIN)
 #endif
 #if PIN_EXISTS(Z_PROBE)
-  REPORT_NAME_DIGITAL(Z_PROBE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_PROBE_PIN)
 #endif
 #if PIN_EXISTS(Z_STEP)
-  REPORT_NAME_DIGITAL(Z_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_STEP_PIN)
 #endif
 #if PIN_EXISTS(Z_STOP)
-  REPORT_NAME_DIGITAL(Z_STOP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_STOP_PIN)
 #endif
 #if PIN_EXISTS(Z2_CS)
-  REPORT_NAME_DIGITAL(Z2_CS_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_CS_PIN)
 #endif
 #if PIN_EXISTS(Z2_DIR)
-  REPORT_NAME_DIGITAL(Z2_DIR_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_DIR_PIN)
 #endif
 #if PIN_EXISTS(Z2_ENABLE)
-  REPORT_NAME_DIGITAL(Z2_ENABLE_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_ENABLE_PIN)
 #endif
 #if PIN_EXISTS(Z2_MS1)
-  REPORT_NAME_DIGITAL(Z2_MS1_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_MS1_PIN)
 #endif
 #if PIN_EXISTS(Z2_MS2)
-  REPORT_NAME_DIGITAL(Z2_MS2_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_MS2_PIN)
 #endif
 #if PIN_EXISTS(Z2_MS3)
-  REPORT_NAME_DIGITAL(Z2_MS3_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_MS3_PIN)
 #endif
 #if PIN_EXISTS(Z2_STEP)
-  REPORT_NAME_DIGITAL(Z2_STEP_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_STEP_PIN)
 #endif
 #if PIN_EXISTS(ZRIB_V20_D6)
-  REPORT_NAME_DIGITAL(ZRIB_V20_D6_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D6_PIN)
 #endif
 #if PIN_EXISTS(ZRIB_V20_D9)
-  REPORT_NAME_DIGITAL(ZRIB_V20_D9_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D9_PIN)
 #endif
 #if PIN_EXISTS(X_SERIAL_TX)
-  REPORT_NAME_DIGITAL(X_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(X_SERIAL_RX)
-  REPORT_NAME_DIGITAL(X_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(X2_SERIAL_TX)
-  REPORT_NAME_DIGITAL(X2_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X2_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(X2_SERIAL_RX)
-  REPORT_NAME_DIGITAL(X2_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, X2_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(Y_SERIAL_TX)
-  REPORT_NAME_DIGITAL(Y_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(Y_SERIAL_RX)
-  REPORT_NAME_DIGITAL(Y_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(Y2_SERIAL_TX)
-  REPORT_NAME_DIGITAL(Y2_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y2_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(Y2_SERIAL_RX)
-  REPORT_NAME_DIGITAL(Y2_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Y2_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(Z_SERIAL_TX)
-  REPORT_NAME_DIGITAL(Z_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(Z_SERIAL_RX)
-  REPORT_NAME_DIGITAL(Z_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(Z2_SERIAL_TX)
-  REPORT_NAME_DIGITAL(Z2_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(Z2_SERIAL_RX)
-  REPORT_NAME_DIGITAL(Z2_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, Z2_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(E0_SERIAL_TX)
-  REPORT_NAME_DIGITAL(E0_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E0_SERIAL_RX)
-  REPORT_NAME_DIGITAL(E0_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E0_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(E1_SERIAL_TX)
-  REPORT_NAME_DIGITAL(E1_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E1_SERIAL_RX)
-  REPORT_NAME_DIGITAL(E1_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E1_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(E2_SERIAL_TX)
-  REPORT_NAME_DIGITAL(E2_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E2_SERIAL_RX)
-  REPORT_NAME_DIGITAL(E2_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E2_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(E3_SERIAL_TX)
-  REPORT_NAME_DIGITAL(E3_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E3_SERIAL_RX)
-  REPORT_NAME_DIGITAL(E3_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E3_SERIAL_RX_PIN)
 #endif
 #if PIN_EXISTS(E4_SERIAL_TX)
-  REPORT_NAME_DIGITAL(E4_SERIAL_TX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_SERIAL_TX_PIN)
 #endif
 #if PIN_EXISTS(E4_SERIAL_RX)
-  REPORT_NAME_DIGITAL(E4_SERIAL_RX_PIN, __LINE__ )
+  REPORT_NAME_DIGITAL(__LINE__, E4_SERIAL_RX_PIN)
 #endif