cleanup

MarlinFirmware · Nov 2, 2021 · 7dfb450 · 7dfb450
1 parent 10137a0
commit 7dfb450
Show file tree

Hide file tree

Showing 24 changed files with 42 additions and 65 deletions.
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
@@ -1109,7 +1109,7 @@ class GcodeSuite {
       static void M913();
       static void M913_report(const bool forReplay=true);
     #endif
-    #if ENABLED(USE_SENSORLESS)
+    #if USE_SENSORLESS
       static void M914();
       static void M914_report(const bool forReplay=true);
     #endif

diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
@@ -492,10 +492,8 @@
 //
 // Warn users of potential endstop/DIAG pin conflicts to prevent homing issues when not using sensorless homing
 //
-#if ENABLED(USES_DIAG_JUMPERS) && DISABLED(USE_SENSORLESS)
-  #undef USES_DIAG_JUMPERS
+#if !USE_SENSORLESS && ENABLED(USES_DIAG_JUMPERS)
   #warning "Motherboard DIAG jumpers must be removed when SENSORLESS_HOMING is disabled."
-#elif ENABLED(USES_DIAG_PINS) && DISABLED(USE_SENSORLESS)
-  #undef USES_DIAG_PINS
+#elif !USE_SENSORLESS && ENABLED(USES_DIAG_PINS)
   #warning "Driver DIAG pins must be removed when SENSORLESS_HOMING is disabled."
 #endif
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -26,9 +26,9 @@
  */
 
 #define BOARD_INFO_NAME "BTT SKR V1.3"
-#define LPC1768_IS_SKRV1_3 1
 
-#define USES_DIAG_JUMPERS 1
+#define LPC1768_IS_SKRV1_3
+#define USES_DIAG_JUMPERS
 
 //
 // Trinamic Stallguard pins

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -27,8 +27,6 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_PINS 1
-
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "BTT SKR V1.4"
 #endif
@@ -37,6 +35,8 @@
   #define BOARD_CUSTOM_BUILD_FLAGS -DLPC_PINCFG_UART3_P4_28
 #endif
 
+define USES_DIAG_PINS
+
 //
 // EEPROM
 //

diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -27,11 +27,11 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
-
 #define BOARD_INFO_NAME   "MKS SGen-L"
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
 
+#define USES_DIAG_JUMPERS
+
 //
 // Servos
 //

diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -27,12 +27,12 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
-
 #ifndef BOARD_INFO_NAME
   #define BOARD_INFO_NAME "BTT SKR E3 Turbo"
 #endif
 
+#define USES_DIAG_JUMPERS
+
 // Onboard I2C EEPROM
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)

diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -27,11 +27,11 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
-
 #define BOARD_INFO_NAME   "MKS SGEN_L V2"
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks"
 
+#define USES_DIAG_JUMPERS
+
 //
 // EEPROM, MKS SGEN_L V2.0 hardware has 4K EEPROM on the board
 //

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -23,11 +23,11 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
-
 // Release PB3/PB4 (E0 STP/DIR) from JTAG pins
 #define DISABLE_JTAG
 
+#define USES_DIAG_JUMPERS
+
 // Ignore temp readings during development.
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
 

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -27,12 +27,11 @@
 
 #include "env_validate.h"
 
-#define BOARD_NO_NATIVE_USB
-
-#define USES_DIAG_JUMPERS 1
-
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks"
 
+#define BOARD_NO_NATIVE_USB
+#define USES_DIAG_JUMPERS
+
 //#define DISABLE_DEBUG
 #define DISABLE_JTAG
 

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
@@ -21,8 +21,6 @@
  */
 #pragma once
 
-#define USES_DIAG_PINS 1
-
 /**
  * MKS Robin nano (STM32F103VET6) board pin assignments
  */
@@ -38,6 +36,7 @@
 #define BOARD_INFO_NAME "MKS Robin nano V2.0"
 
 #define BOARD_NO_NATIVE_USB
+define USES_DIAG_PINS
 
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
 #define TEMP_TIMER                             5

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -23,14 +23,14 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_PINS 1
-
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "BIGTREE BTT002 V1.0 only supports one hotend / E-stepper. Comment out this line to continue."
 #endif
 
 #define BOARD_INFO_NAME "BTT BTT002 V1.0"
 
+define USES_DIAG_PINS
+
 // Use one of these or SDCard-based Emulation will be used
 #if NO_EEPROM_SELECTED
   //#define SRAM_EEPROM_EMULATION                 // Use BackSRAM-based EEPROM emulation

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -21,8 +21,6 @@
  */
 #pragma once
 
-#define USES_DIAG_JUMPERS 1
-
 #if NOT_TARGET(STM32F4)
   #error "Oops! Select an STM32F4 board in 'Tools > Board.'"
 #endif
@@ -31,6 +29,8 @@
   #define BOARD_INFO_NAME "BTT E3 RRF"
 #endif
 
+#define USES_DIAG_JUMPERS
+
 // Add-on board for IDEX conversion
 //#define BTT_E3_RRF_IDEX_BOARD
 

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -23,8 +23,6 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
-
 #if E_STEPPERS > MAX_E_STEPPERS
   #error "Marlin extruder/hotends limit! Increase MAX_E_STEPPERS to continue."
 #elif HOTENDS > 8 || E_STEPPERS > 8
@@ -33,15 +31,14 @@
 
 #define BOARD_INFO_NAME "BTT GTR V1.0"
 
+#define USES_DIAG_JUMPERS
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
+#define M5_EXTENDER                               // The M5 extender is attached
+
 // Onboard I2C EEPROM
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x2000  // 8KB (24C64 ... 64Kb = 8KB)
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
-
-#define M5_EXTENDER                               // The M5 extender is attached
-
 //
 // Servos
 //

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -23,17 +23,15 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
+#define USES_DIAG_JUMPERS
 
 // Onboard I2C EEPROM
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x8000  // 32KB (24C32A)
 #define I2C_SCL_PIN                         PB8
 #define I2C_SDA_PIN                         PB9
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
-
 // Avoid conflict with TIMER_TONE
 #define STEP_TIMER                            10
 

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -23,7 +23,7 @@
 
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
+#define USES_DIAG_JUMPERS
 
 // If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
 // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
@@ -49,8 +49,7 @@
   #define FLASH_EEPROM_LEVELING
 #endif
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Servos

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -47,8 +47,7 @@
   #define FLASH_EEPROM_LEVELING
 #endif
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 // Avoid conflict with TIMER_TONE
 #define STEP_TIMER                            10

diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -40,8 +40,7 @@
   #define MARLIN_EEPROM_SIZE             0x10000
 #endif
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Servos

diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -34,8 +34,7 @@
 #define STEP_TIMER                             4
 #define TEMP_TIMER                             2
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Servos

diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -39,8 +39,7 @@
 #define I2C_SDA_PIN                         PB9
 #define MARLIN_EEPROM_SIZE               0x10000  // FM24CL64 F-RAM 64K (8Kx8)
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Servos

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -24,8 +24,6 @@
 #define ALLOW_STM32DUINO
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
-
 #if HOTENDS > 3 || E_STEPPERS > 5
   #error "MKS Monster supports up to 3 hotends and 5 E-steppers."
 #elif HAS_FSMC_TFT
@@ -34,8 +32,8 @@
 
 #define BOARD_INFO_NAME "MKS Monster8 V1.x"
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
+#define USES_DIAG_JUMPERS
 
 //#define DISABLE_DEBUG
 

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
@@ -24,8 +24,6 @@
 #define ALLOW_STM32DUINO
 #include "env_validate.h"
 
-#define USES_DIAG_JUMPERS 1
-
 #if HOTENDS > 2 || E_STEPPERS > 2
   #error "MKS Robin Nano V3 supports up to 2 hotends / E-steppers."
 #elif HAS_FSMC_TFT
@@ -34,22 +32,20 @@
 
 #define BOARD_INFO_NAME "MKS Robin Nano V3"
 
+#define USES_DIAG_JUMPERS
+
 #ifndef X_CS_PIN
   #define X_CS_PIN                          PD5
 #endif
-
 #ifndef Y_CS_PIN
   #define Y_CS_PIN                          PD7
 #endif
-
 #ifndef Z_CS_PIN
   #define Z_CS_PIN                          PD4
 #endif
-
 #ifndef E0_CS_PIN
   #define E0_CS_PIN                         PD9
 #endif
-
 #ifndef E1_CS_PIN
   #define E1_CS_PIN                         PD8
 #endif

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -26,8 +26,7 @@
 // MKS Robin Nano V3, MKS Eagle pinmap
 //
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 // Avoid conflict with TIMER_TONE
 #define STEP_TIMER                            10

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -39,8 +39,7 @@
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role

diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h
@@ -32,8 +32,7 @@
 #define I2C_EEPROM
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB (24C32 ... 32Kb = 4KB)
 
-// USB Flash Drive support
-#define HAS_OTG_USB_HOST_SUPPORT
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
 
 //
 // Limit Switches