diff --git a/Marlin/src/HAL/HAL_AVR/pinsDebug_AVR_8_bit.h b/Marlin/src/HAL/HAL_AVR/pinsDebug_AVR_8_bit.h
index 02f23f05d..fa244fe49 100644
--- a/Marlin/src/HAL/HAL_AVR/pinsDebug_AVR_8_bit.h
+++ b/Marlin/src/HAL/HAL_AVR/pinsDebug_AVR_8_bit.h
@@ -59,7 +59,7 @@
 #define DIGITAL_PIN_TO_ANALOG_PIN(p) int(p - analogInputToDigitalPin(0))
 #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(7)))
 #define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
-#define MULTI_NAME_PAD 14 // space needed to be pretty if not first name assigned to a pin
+#define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
 
 void PRINT_ARRAY_NAME(uint8_t x) {
   char *name_mem_pointer = (char*)pgm_read_ptr(&pin_array[x].name);
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index bfa815038..43eff4b21 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -29,75 +29,81 @@
 
 #line 31 // set __LINE__ to a known value for both passes
 
-#if defined(EXT_AUX_A0) && EXT_AUX_A0 > 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
+//
+// Analog Pin Assignments
+//
+
+#if defined(EXT_AUX_A0) && EXT_AUX_A0 >= 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
 #endif
-#if defined(EXT_AUX_A1) && EXT_AUX_A1 > 0 && EXT_AUX_A1 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A1) && EXT_AUX_A1 >= 0 && EXT_AUX_A1 < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A1)
 #endif
-#if defined(EXT_AUX_A2) && EXT_AUX_A2 > 0 && EXT_AUX_A2 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A2) && EXT_AUX_A2 >= 0 && EXT_AUX_A2 < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A2)
 #endif
-#if defined(EXT_AUX_A3) && EXT_AUX_A3 > 0 && EXT_AUX_A3 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A3) && EXT_AUX_A3 >= 0 && EXT_AUX_A3 < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A3)
 #endif
-#if defined(EXT_AUX_A4) && EXT_AUX_A4 > 0 && EXT_AUX_A4 < NUM_ANALOG_INPUTS
+#if defined(EXT_AUX_A4) && EXT_AUX_A4 >= 0 && EXT_AUX_A4 < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A4)
 #endif
-#if PIN_EXISTS(FILWIDTH) && FILWIDTH_PIN >= 0 && FILWIDTH_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(FILWIDTH) && FILWIDTH_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
 #endif
-#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && MAIN_VOLTAGE_MEASURE_PIN >= 0 && MAIN_VOLTAGE_MEASURE_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && MAIN_VOLTAGE_MEASURE_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
 #endif
 #if !defined(ARDUINO_ARCH_SAM)  //TC1 & TC2 are macros in the SAM tool chain
-  #if defined(TC1) && TC1 > 0 && TC1 < NUM_ANALOG_INPUTS
+  #if defined(TC1) && TC1 >= 0 && TC1 < NUM_ANALOG_INPUTS
     REPORT_NAME_ANALOG(__LINE__, TC1)
   #endif
-  #if defined(TC2) && TC2 > 0 && TC2 < NUM_ANALOG_INPUTS
+  #if defined(TC2) && TC2 >= 0 && TC2 < NUM_ANALOG_INPUTS
     REPORT_NAME_ANALOG(__LINE__, TC2)
   #endif
 #endif
-#if PIN_EXISTS(TEMP_0) && TEMP_0_PIN >= 0 && TEMP_0_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_0) && TEMP_0_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
 #endif
-#if PIN_EXISTS(TEMP_1) && TEMP_1_PIN >= 0 && TEMP_1_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_1) && TEMP_1_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
 #endif
-#if PIN_EXISTS(TEMP_2) && TEMP_2_PIN >= 0 && TEMP_2_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_2) && TEMP_2_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
 #endif
-#if PIN_EXISTS(TEMP_3) && TEMP_3_PIN >= 0 && TEMP_3_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_3) && TEMP_3_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
 #endif
-#if PIN_EXISTS(TEMP_4) && TEMP_4_PIN >= 0 && TEMP_4_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_4) && TEMP_4_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
 #endif
-#if defined(THERMO_CS2) && THERMO_CS2 > 0
-  REPORT_NAME_DIGITAL(__LINE__, THERMO_CS2)
-#endif
-#if PIN_EXISTS(TEMP_BED) && TEMP_BED_PIN >= 0 && TEMP_BED_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_BED) && TEMP_BED_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
 #endif
-#if PIN_EXISTS(TEMP_CHAMBER) && TEMP_CHAMBER_PIN >= 0 && TEMP_CHAMBER_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_CHAMBER) && TEMP_CHAMBER_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
 #endif
-#if PIN_EXISTS(TEMP_X) && TEMP_X_PIN >= 0 && TEMP_X_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(TEMP_X) && TEMP_X_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, TEMP_X_PIN)
 #endif
-#if PIN_EXISTS(ADC_KEYPAD) && ADC_KEYPAD_PIN >= 0 && ADC_KEYPAD_PIN < NUM_ANALOG_INPUTS
+#if PIN_EXISTS(ADC_KEYPAD) && ADC_KEYPAD_PIN < NUM_ANALOG_INPUTS
   REPORT_NAME_ANALOG(__LINE__, ADC_KEYPAD_PIN)
 #endif
-#if defined(__FD) && __FD > 0
+
+//
+// Digital Pin Assignments
+//
+
+#if defined(__FD) && __FD >= 0
   REPORT_NAME_DIGITAL(__LINE__, __FD)
 #endif
-#if defined(__FS) && __FS > 0
+#if defined(__FS) && __FS >= 0
   REPORT_NAME_DIGITAL(__LINE__, __FS)
 #endif
-#if defined(__GD) && __GD > 0
+#if defined(__GD) && __GD >= 0
   REPORT_NAME_DIGITAL(__LINE__, __GD)
 #endif
-#if defined(__GS) && __GS > 0
+#if defined(__GS) && __GS >= 0
   REPORT_NAME_DIGITAL(__LINE__, __GS)
 #endif
 #if PIN_EXISTS(AVR_MISO)
@@ -118,43 +124,43 @@
 #if PIN_EXISTS(BEEPER)
   REPORT_NAME_DIGITAL(__LINE__, BEEPER_PIN)
 #endif
-#if defined(BTN_BACK) && BTN_BACK > 0
+#if defined(BTN_BACK) && BTN_BACK >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_BACK)
 #endif
-#if defined(BTN_CENTER) && BTN_CENTER > 0
+#if defined(BTN_CENTER) && BTN_CENTER >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_CENTER)
 #endif
-#if defined(BTN_DOWN) && BTN_DOWN > 0
+#if defined(BTN_DOWN) && BTN_DOWN >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_DOWN)
 #endif
-#if defined(BTN_DWN) && BTN_DWN > 0
+#if defined(BTN_DWN) && BTN_DWN >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_DWN)
 #endif
-#if defined(BTN_EN1) && BTN_EN1 > 0
+#if defined(BTN_EN1) && BTN_EN1 >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_EN1)
 #endif
-#if defined(BTN_EN2) && BTN_EN2 > 0
+#if defined(BTN_EN2) && BTN_EN2 >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_EN2)
 #endif
-#if defined(BTN_ENC) && BTN_ENC > 0
+#if defined(BTN_ENC) && BTN_ENC >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_ENC)
 #endif
-#if defined(BTN_HOME) && BTN_HOME > 0
+#if defined(BTN_HOME) && BTN_HOME >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_HOME)
 #endif
-#if defined(BTN_LEFT) && BTN_LEFT > 0
+#if defined(BTN_LEFT) && BTN_LEFT >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_LEFT)
 #endif
-#if defined(BTN_LFT) && BTN_LFT > 0
+#if defined(BTN_LFT) && BTN_LFT >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_LFT)
 #endif
-#if defined(BTN_RIGHT) && BTN_RIGHT > 0
+#if defined(BTN_RIGHT) && BTN_RIGHT >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_RIGHT)
 #endif
-#if defined(BTN_RT) && BTN_RT > 0
+#if defined(BTN_RT) && BTN_RT >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_RT)
 #endif
-#if defined(BTN_UP) && BTN_UP > 0
+#if defined(BTN_UP) && BTN_UP >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_UP)
 #endif
 #if PIN_EXISTS(CASE_LIGHT)
@@ -169,55 +175,55 @@
 #if PIN_EXISTS(CUTOFF_TEST)
   REPORT_NAME_DIGITAL(__LINE__, CUTOFF_TEST_PIN)
 #endif
-#if defined(D57) && D57 > 0
+#if defined(D57) && D57 >= 0
   REPORT_NAME_DIGITAL(__LINE__, D57)
 #endif
-#if defined(D58) && D58 > 0
+#if defined(D58) && D58 >= 0
   REPORT_NAME_DIGITAL(__LINE__, D58)
 #endif
 #if PIN_EXISTS(DAC_DISABLE)
   REPORT_NAME_DIGITAL(__LINE__, DAC_DISABLE_PIN)
 #endif
-#if defined(DAC0_SYNC) && DAC0_SYNC > 0
+#if defined(DAC0_SYNC) && DAC0_SYNC >= 0
   REPORT_NAME_DIGITAL(__LINE__, DAC0_SYNC)
 #endif
-#if defined(DAC1_SYNC) && DAC1_SYNC > 0
+#if defined(DAC1_SYNC) && DAC1_SYNC >= 0
   REPORT_NAME_DIGITAL(__LINE__, DAC1_SYNC)
 #endif
 #if PIN_EXISTS(DEBUG)
   REPORT_NAME_DIGITAL(__LINE__, DEBUG_PIN)
 #endif
-#if defined(DIGIPOTS_I2C_SCL) && DIGIPOTS_I2C_SCL > 0
+#if defined(DIGIPOTS_I2C_SCL) && DIGIPOTS_I2C_SCL >= 0
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SCL)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_E0) && DIGIPOTS_I2C_SDA_E0 > 0
+#if defined(DIGIPOTS_I2C_SDA_E0) && DIGIPOTS_I2C_SDA_E0 >= 0
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_E0)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_E1) && DIGIPOTS_I2C_SDA_E1 > 0
+#if defined(DIGIPOTS_I2C_SDA_E1) && DIGIPOTS_I2C_SDA_E1 >= 0
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_E1)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_X) && DIGIPOTS_I2C_SDA_X > 0
+#if defined(DIGIPOTS_I2C_SDA_X) && DIGIPOTS_I2C_SDA_X >= 0
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_X)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_Y) && DIGIPOTS_I2C_SDA_Y > 0
+#if defined(DIGIPOTS_I2C_SDA_Y) && DIGIPOTS_I2C_SDA_Y >= 0
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_Y)
 #endif
-#if defined(DIGIPOTS_I2C_SDA_Z) && DIGIPOTS_I2C_SDA_Z > 0
+#if defined(DIGIPOTS_I2C_SDA_Z) && DIGIPOTS_I2C_SDA_Z >= 0
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTS_I2C_SDA_Z)
 #endif
 #if PIN_EXISTS(DIGIPOTSS)
   REPORT_NAME_DIGITAL(__LINE__, DIGIPOTSS_PIN)
 #endif
-#if defined(DOGLCD_A0) && DOGLCD_A0 > 0
+#if defined(DOGLCD_A0) && DOGLCD_A0 >= 0
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_A0)
 #endif
-#if defined(DOGLCD_CS) && DOGLCD_CS > 0
+#if defined(DOGLCD_CS) && DOGLCD_CS >= 0
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_CS)
 #endif
-#if defined(DOGLCD_MOSI) && DOGLCD_MOSI > 0
+#if defined(DOGLCD_MOSI) && DOGLCD_MOSI >= 0
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_MOSI)
 #endif
-#if defined(DOGLCD_SCK) && DOGLCD_SCK > 0
+#if defined(DOGLCD_SCK) && DOGLCD_SCK >= 0
   REPORT_NAME_DIGITAL(__LINE__, DOGLCD_SCK)
 #endif
 #if PIN_EXISTS(E_MUX0)
@@ -346,100 +352,71 @@
 #if PIN_EXISTS(E4_STEP)
   REPORT_NAME_DIGITAL(__LINE__, E4_STEP_PIN)
 #endif
-#if defined(ENET_CRS) && ENET_CRS > 0
+#if defined(ENET_CRS) && ENET_CRS >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_CRS)
 #endif
-#if defined(ENET_MDIO) && ENET_MDIO > 0
+#if defined(ENET_MDIO) && ENET_MDIO >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_MDIO)
 #endif
-#if defined(ENET_MOC) && ENET_MOC > 0
+#if defined(ENET_MOC) && ENET_MOC >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_MOC)
 #endif
-#if defined(ENET_RX_ER) && ENET_RX_ER > 0
+#if defined(ENET_RX_ER) && ENET_RX_ER >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_RX_ER)
 #endif
-#if defined(ENET_RXD0) && ENET_RXD0 > 0
+#if defined(ENET_RXD0) && ENET_RXD0 >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_RXD0)
 #endif
-#if defined(ENET_RXD1) && ENET_RXD1 > 0
+#if defined(ENET_RXD1) && ENET_RXD1 >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_RXD1)
 #endif
-#if defined(ENET_TX_EN) && ENET_TX_EN > 0
+#if defined(ENET_TX_EN) && ENET_TX_EN >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_TX_EN)
 #endif
-#if defined(ENET_TXD0) && ENET_TXD0 > 0
+#if defined(ENET_TXD0) && ENET_TXD0 >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_TXD0)
 #endif
-#if defined(ENET_TXD1) && ENET_TXD1 > 0
+#if defined(ENET_TXD1) && ENET_TXD1 >= 0
   REPORT_NAME_DIGITAL(__LINE__, ENET_TXD1)
 #endif
 #if PIN_EXISTS(EXP_VOLTAGE_LEVEL)
   REPORT_NAME_DIGITAL(__LINE__, EXP_VOLTAGE_LEVEL_PIN)
 #endif
-#if defined(EXT_AUX_A0) && EXT_AUX_A0 > 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A0)
-#endif
-#if defined(EXT_AUX_A0) && EXT_AUX_A0 >= NUM_ANALOG_INPUTS && EXT_AUX_A0 > 0
-  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A0)
-#endif
-#if defined(EXT_AUX_A0_IO) && EXT_AUX_A0_IO > 0
+
+#if defined(EXT_AUX_A0_IO) && EXT_AUX_A0_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A0_IO)
 #endif
-#if defined(EXT_AUX_A1) && EXT_AUX_A1 > 0 && EXT_AUX_A1 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A1)
-#endif
-#if defined(EXT_AUX_A1) && EXT_AUX_A1 >= NUM_ANALOG_INPUTS && EXT_AUX_A1 > 0
-  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A1)
-#endif
-#if defined(EXT_AUX_A1_IO) && EXT_AUX_A1_IO > 0
+#if defined(EXT_AUX_A1_IO) && EXT_AUX_A1_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A1_IO)
 #endif
-#if defined(EXT_AUX_A2) && EXT_AUX_A2 > 0 && EXT_AUX_A2 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A2)
-#endif
-#if defined(EXT_AUX_A2) && EXT_AUX_A2 >= NUM_ANALOG_INPUTS && EXT_AUX_A2 > 0
-  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A2)
-#endif
-#if defined(EXT_AUX_A2_IO) && EXT_AUX_A2_IO > 0
+#if defined(EXT_AUX_A2_IO) && EXT_AUX_A2_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A2_IO)
 #endif
-#if defined(EXT_AUX_A3) && EXT_AUX_A3 > 0 && EXT_AUX_A3 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A3)
-#endif
-#if defined(EXT_AUX_A3) && EXT_AUX_A3 >= NUM_ANALOG_INPUTS && EXT_AUX_A3 > 0
-  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A3)
-#endif
-#if defined(EXT_AUX_A3_IO) && EXT_AUX_A3_IO > 0
+#if defined(EXT_AUX_A3_IO) && EXT_AUX_A3_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A3_IO)
 #endif
-#if defined(EXT_AUX_A4) && EXT_AUX_A4 > 0 && EXT_AUX_A4 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, EXT_AUX_A4)
-#endif
-#if defined(EXT_AUX_A4) && EXT_AUX_A4 >= NUM_ANALOG_INPUTS && EXT_AUX_A4 > 0
-  REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A4)
-#endif
-#if defined(EXT_AUX_A4_IO) && EXT_AUX_A4_IO > 0
+#if defined(EXT_AUX_A4_IO) && EXT_AUX_A4_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_A4_IO)
 #endif
-#if defined(EXT_AUX_PWM_D24) && EXT_AUX_PWM_D24 > 0
+#if defined(EXT_AUX_PWM_D24) && EXT_AUX_PWM_D24 >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_PWM_D24)
 #endif
-#if defined(EXT_AUX_RX1_D2) && EXT_AUX_RX1_D2 > 0
+#if defined(EXT_AUX_RX1_D2) && EXT_AUX_RX1_D2 >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_RX1_D2)
 #endif
-#if defined(EXT_AUX_SCL_D0) && EXT_AUX_SCL_D0 > 0
+#if defined(EXT_AUX_SCL_D0) && EXT_AUX_SCL_D0 >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_SCL_D0)
 #endif
-#if defined(EXT_AUX_SDA_D1) && EXT_AUX_SDA_D1 > 0
+#if defined(EXT_AUX_SDA_D1) && EXT_AUX_SDA_D1 >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_SDA_D1)
 #endif
-#if defined(EXT_AUX_TX1_D3) && EXT_AUX_TX1_D3 > 0
+#if defined(EXT_AUX_TX1_D3) && EXT_AUX_TX1_D3 >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXT_AUX_TX1_D3)
 #endif
-#if defined(EXTRUDER_0_AUTO_FAN) && EXTRUDER_0_AUTO_FAN > 0
+#if defined(EXTRUDER_0_AUTO_FAN) && EXTRUDER_0_AUTO_FAN >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXTRUDER_0_AUTO_FAN)
 #endif
-#if defined(EXTRUDER_1_AUTO_FAN) && EXTRUDER_1_AUTO_FAN > 0
+#if defined(EXTRUDER_1_AUTO_FAN) && EXTRUDER_1_AUTO_FAN >= 0
   REPORT_NAME_DIGITAL(__LINE__, EXTRUDER_1_AUTO_FAN)
 #endif
 #if PIN_EXISTS(FAN)
@@ -457,9 +434,6 @@
 #if PIN_EXISTS(FIL_RUNOUT)
   REPORT_NAME_DIGITAL(__LINE__, FIL_RUNOUT_PIN)
 #endif
-#if PIN_EXISTS(FILWIDTH) && FILWIDTH_PIN >= 0 && FILWIDTH_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, FILWIDTH_PIN)
-#endif
 #if PIN_EXISTS(HEATER_0)
   REPORT_NAME_DIGITAL(__LINE__, HEATER_0_PIN)
 #endif
@@ -502,25 +476,25 @@
 #if PIN_EXISTS(LCD_BACKLIGHT)
   REPORT_NAME_DIGITAL(__LINE__, LCD_BACKLIGHT_PIN)
 #endif
-#if defined(LCD_PINS_D4) && LCD_PINS_D4 > 0
+#if defined(LCD_PINS_D4) && LCD_PINS_D4 >= 0
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D4)
 #endif
-#if defined(LCD_PINS_D5) && LCD_PINS_D5 > 0
+#if defined(LCD_PINS_D5) && LCD_PINS_D5 >= 0
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D5)
 #endif
-#if defined(LCD_PINS_D6) && LCD_PINS_D6 > 0
+#if defined(LCD_PINS_D6) && LCD_PINS_D6 >= 0
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D6)
 #endif
-#if defined(LCD_PINS_D7) && LCD_PINS_D7 > 0
+#if defined(LCD_PINS_D7) && LCD_PINS_D7 >= 0
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_D7)
 #endif
-#if defined(LCD_PINS_ENABLE) && LCD_PINS_ENABLE > 0
+#if defined(LCD_PINS_ENABLE) && LCD_PINS_ENABLE >= 0
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_ENABLE)
 #endif
-#if defined(LCD_PINS_RS) && LCD_PINS_RS > 0
+#if defined(LCD_PINS_RS) && LCD_PINS_RS >= 0
   REPORT_NAME_DIGITAL(__LINE__, LCD_PINS_RS)
 #endif
-#if defined(LCD_SDSS) && LCD_SDSS > 0
+#if defined(LCD_SDSS) && LCD_SDSS >= 0
   REPORT_NAME_DIGITAL(__LINE__, LCD_SDSS)
 #endif
 #if PIN_EXISTS(LED_GREEN)
@@ -541,13 +515,10 @@
 #if PIN_EXISTS(MAX6675_SCK)
   REPORT_NAME_DIGITAL(__LINE__, MAX6675_SCK_PIN)
 #endif
-#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && MAIN_VOLTAGE_MEASURE_PIN >= 0 && MAIN_VOLTAGE_MEASURE_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, MAIN_VOLTAGE_MEASURE_PIN)
-#endif
-#if defined(MAX6675_SS) && MAX6675_SS > 0
+#if defined(MAX6675_SS) && MAX6675_SS >= 0
   REPORT_NAME_DIGITAL(__LINE__, MAX6675_SS)
 #endif
-// #if defined(MISO) && MISO > 0
+// #if defined(MISO) && MISO >= 0
 //   REPORT_NAME_DIGITAL(__LINE__, MISO)
 // #endif
 #if PIN_EXISTS(MISO)
@@ -565,7 +536,7 @@
 #if PIN_EXISTS(MOSFET_D)
   REPORT_NAME_DIGITAL(__LINE__, MOSFET_D_PIN)
 #endif
-// #if defined(MOSI) && MOSI > 0
+// #if defined(MOSI) && MOSI >= 0
 //   REPORT_NAME_DIGITAL(__LINE__, MOSI)
 // #endif
 #if PIN_EXISTS(MOSI)
@@ -583,9 +554,6 @@
 #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(__LINE__, ORIG_E0_AUTO_FAN_PIN)
 #endif
@@ -613,7 +581,7 @@
 #if PIN_EXISTS(PWM_2)
   REPORT_NAME_DIGITAL(__LINE__, PWM_2_PIN)
 #endif
-#if defined(REF_CLK) && REF_CLK > 0
+#if defined(REF_CLK) && REF_CLK >= 0
   REPORT_NAME_DIGITAL(__LINE__, REF_CLK)
 #endif
 #if PIN_EXISTS(RAMPS_D10)
@@ -643,28 +611,28 @@
 #if PIN_EXISTS(SAFETY_TRIGGERED)
   REPORT_NAME_DIGITAL(__LINE__, SAFETY_TRIGGERED_PIN)
 #endif
-// #if defined(SCK) && SCK > 0
+// #if defined(SCK) && SCK >= 0
 //   REPORT_NAME_DIGITAL(__LINE__, SCK)
 // #endif
 #if PIN_EXISTS(SCK)
   REPORT_NAME_DIGITAL(__LINE__, SCK_PIN)
 #endif
-#if defined(SCL) && SCL > 0
+#if defined(SCL) && SCL >= 0
   REPORT_NAME_DIGITAL(__LINE__, SCL)
 #endif
 #if PIN_EXISTS(SD_DETECT)
   REPORT_NAME_DIGITAL(__LINE__, SD_DETECT_PIN)
 #endif
-#if defined(SDA) && SDA > 0
+#if defined(SDA) && SDA >= 0
   REPORT_NAME_DIGITAL(__LINE__, SDA)
 #endif
-#if defined(SDPOWER) && SDPOWER > 0
+#if defined(SDPOWER) && SDPOWER >= 0
   REPORT_NAME_DIGITAL(__LINE__, SDPOWER)
 #endif
-#if defined(SDSS) && SDSS > 0
+#if defined(SDSS) && SDSS >= 0
   REPORT_NAME_DIGITAL(__LINE__, SDSS)
 #endif
-#if defined(SERVO0) && SERVO0 > 0
+#if defined(SERVO0) && SERVO0 >= 0
   REPORT_NAME_DIGITAL(__LINE__, SERVO0)
 #endif
 #if PIN_EXISTS(SERVO0)
@@ -679,16 +647,16 @@
 #if PIN_EXISTS(SERVO3)
   REPORT_NAME_DIGITAL(__LINE__, SERVO3_PIN)
 #endif
-#if defined(SHIFT_CLK) && SHIFT_CLK > 0
+#if defined(SHIFT_CLK) && SHIFT_CLK >= 0
   REPORT_NAME_DIGITAL(__LINE__, SHIFT_CLK)
 #endif
-#if defined(SHIFT_EN) && SHIFT_EN > 0
+#if defined(SHIFT_EN) && SHIFT_EN >= 0
   REPORT_NAME_DIGITAL(__LINE__, SHIFT_EN)
 #endif
-#if defined(SHIFT_LD) && SHIFT_LD > 0
+#if defined(SHIFT_LD) && SHIFT_LD >= 0
   REPORT_NAME_DIGITAL(__LINE__, SHIFT_LD)
 #endif
-#if defined(SHIFT_OUT) && SHIFT_OUT > 0
+#if defined(SHIFT_OUT) && SHIFT_OUT >= 0
   REPORT_NAME_DIGITAL(__LINE__, SHIFT_OUT)
 #endif
 #if PIN_EXISTS(SLED)
@@ -712,25 +680,25 @@
 #if PIN_EXISTS(SOL4)
   REPORT_NAME_DIGITAL(__LINE__, SOL4_PIN)
 #endif
-#if defined(SPARE_IO) && SPARE_IO > 0
+#if defined(SPARE_IO) && SPARE_IO >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPARE_IO)
 #endif
-#if defined(SPI_CHAN_DAC) && SPI_CHAN_DAC > 0
+#if defined(SPI_CHAN_DAC) && SPI_CHAN_DAC >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPI_CHAN_DAC)
 #endif
-#if defined(SPI_CHAN_EEPROM1) && SPI_CHAN_EEPROM1 > 0
+#if defined(SPI_CHAN_EEPROM1) && SPI_CHAN_EEPROM1 >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPI_CHAN_EEPROM1)
 #endif
-#if defined(SPI_EEPROM) && SPI_EEPROM > 0
+#if defined(SPI_EEPROM) && SPI_EEPROM >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM)
 #endif
-#if defined(SPI_EEPROM1_CS) && SPI_EEPROM1_CS > 0
+#if defined(SPI_EEPROM1_CS) && SPI_EEPROM1_CS >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM1_CS)
 #endif
-#if defined(SPI_EEPROM2_CS) && SPI_EEPROM2_CS > 0
+#if defined(SPI_EEPROM2_CS) && SPI_EEPROM2_CS >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPI_EEPROM2_CS)
 #endif
-#if defined(SPI_FLASH_CS) && SPI_FLASH_CS > 0
+#if defined(SPI_FLASH_CS) && SPI_FLASH_CS >= 0
   REPORT_NAME_DIGITAL(__LINE__, SPI_FLASH_CS)
 #endif
 #if PIN_EXISTS(SPINDLE_DIR)
@@ -760,7 +728,7 @@
 #if PIN_EXISTS(STAT_LED_BLUE)
   REPORT_NAME_DIGITAL(__LINE__, STAT_LED_BLUE_PIN)
 #endif
-#if defined(STAT_LED_RED_LED) && STAT_LED_RED_LED > 0
+#if defined(STAT_LED_RED_LED) && STAT_LED_RED_LED >= 0
   REPORT_NAME_DIGITAL(__LINE__, STAT_LED_RED_LED)
 #endif
 #if PIN_EXISTS(STAT_LED_RED)
@@ -772,42 +740,12 @@
 #if PIN_EXISTS(SUICIDE)
   REPORT_NAME_DIGITAL(__LINE__, SUICIDE_PIN)
 #endif
-#if defined(THERMO_CS1) && THERMO_CS1 > 0
+#if defined(THERMO_CS1) && THERMO_CS1 >= 0
   REPORT_NAME_DIGITAL(__LINE__, THERMO_CS1)
 #endif
-#if defined(THERMO_CS2) && THERMO_CS2 > 0
+#if defined(THERMO_CS2) && THERMO_CS2 >= 0
   REPORT_NAME_DIGITAL(__LINE__, THERMO_CS2)
 #endif
-#if defined(TC1) && TC1 > 0 && TC1 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TC1)
-#endif
-#if defined(TC2) && TC2 > 0 && TC2 < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TC2)
-#endif
-#if PIN_EXISTS(TEMP_0) && TEMP_0_PIN >= 0 && TEMP_0_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TEMP_0_PIN)
-#endif
-#if PIN_EXISTS(TEMP_1) && TEMP_1_PIN >= 0 && TEMP_1_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TEMP_1_PIN)
-#endif
-#if PIN_EXISTS(TEMP_2) && TEMP_2_PIN >= 0 && TEMP_2_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TEMP_2_PIN)
-#endif
-#if PIN_EXISTS(TEMP_3) && TEMP_3_PIN >= 0 && TEMP_3_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TEMP_3_PIN)
-#endif
-#if PIN_EXISTS(TEMP_4) && TEMP_4_PIN >= 0 && TEMP_4_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TEMP_4_PIN)
-#endif
-#if PIN_EXISTS(TEMP_BED) && TEMP_BED_PIN >= 0 && TEMP_BED_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TEMP_BED_PIN)
-#endif
-#if PIN_EXISTS(TEMP_CHAMBER) && TEMP_CHAMBER_PIN >= 0 && TEMP_CHAMBER_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TEMP_CHAMBER_PIN)
-#endif
-#if PIN_EXISTS(TEMP_X) && TEMP_X_PIN >= 0 && TEMP_X_PIN < NUM_ANALOG_INPUTS
-  REPORT_NAME_ANALOG(__LINE__, TEMP_X_PIN)
-#endif
 #if PIN_EXISTS(THERMO_DO)
   REPORT_NAME_DIGITAL(__LINE__, THERMO_DO_PIN)
 #endif
@@ -856,13 +794,13 @@
 #if PIN_EXISTS(TX_ENABLE)
   REPORT_NAME_DIGITAL(__LINE__, TX_ENABLE_PIN)
 #endif
-#if defined(UI1) && UI1 > 0
+#if defined(UI1) && UI1 >= 0
   REPORT_NAME_DIGITAL(__LINE__, UI1)
 #endif
-#if defined(UI2) && UI2 > 0
+#if defined(UI2) && UI2 >= 0
   REPORT_NAME_DIGITAL(__LINE__, UI2)
 #endif
-#if defined(UNUSED_PWM) && UNUSED_PWM > 0
+#if defined(UNUSED_PWM) && UNUSED_PWM >= 0
   REPORT_NAME_DIGITAL(__LINE__, UNUSED_PWM)
 #endif
 #if PIN_EXISTS(X_ATT)