Quellcode durchsuchen

🔧 Endstop / DIAG homing conflict warning (#23050)

Keith Bennett vor 2 Jahren
Ursprung
Commit
767a15d468
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden

+ 1
- 1
Marlin/src/gcode/gcode.h Datei anzeigen

@@ -1130,7 +1130,7 @@ private:
1130 1130
       static void M913();
1131 1131
       static void M913_report(const bool forReplay=true);
1132 1132
     #endif
1133
-    #if ENABLED(USE_SENSORLESS)
1133
+    #if USE_SENSORLESS
1134 1134
       static void M914();
1135 1135
       static void M914_report(const bool forReplay=true);
1136 1136
     #endif

+ 9
- 0
Marlin/src/inc/Warnings.cpp Datei anzeigen

@@ -488,3 +488,12 @@
488 488
 #if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)
489 489
   #error "Z_SAFE_HOMING is recommended when homing with a probe. Enable Z_SAFE_HOMING or comment out this line to continue."
490 490
 #endif
491
+
492
+//
493
+// Warn users of potential endstop/DIAG pin conflicts to prevent homing issues when not using sensorless homing
494
+//
495
+#if !USE_SENSORLESS && ENABLED(USES_DIAG_JUMPERS)
496
+  #warning "Motherboard DIAG jumpers must be removed when SENSORLESS_HOMING is disabled."
497
+#elif !USE_SENSORLESS && ENABLED(USES_DIAG_PINS)
498
+  #warning "Driver DIAG pins must be physically removed unless SENSORLESS_HOMING is enabled. (See https://bit.ly/2ZPRlt0)"
499
+#endif

+ 3
- 1
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h Datei anzeigen

@@ -26,7 +26,9 @@
26 26
  */
27 27
 
28 28
 #define BOARD_INFO_NAME "BTT SKR V1.3"
29
-#define LPC1768_IS_SKRV1_3 1
29
+
30
+#define LPC1768_IS_SKRV1_3
31
+#define USES_DIAG_JUMPERS
30 32
 
31 33
 //
32 34
 // Trinamic Stallguard pins

+ 2
- 0
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h Datei anzeigen

@@ -35,6 +35,8 @@
35 35
   #define BOARD_CUSTOM_BUILD_FLAGS -DLPC_PINCFG_UART3_P4_28
36 36
 #endif
37 37
 
38
+#define USES_DIAG_PINS
39
+
38 40
 //
39 41
 // EEPROM
40 42
 //

+ 2
- 0
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h Datei anzeigen

@@ -30,6 +30,8 @@
30 30
 #define BOARD_INFO_NAME   "MKS SGen-L"
31 31
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks/MKS-SGEN_L"
32 32
 
33
+#define USES_DIAG_JUMPERS
34
+
33 35
 //
34 36
 // Servos
35 37
 //

+ 2
- 0
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h Datei anzeigen

@@ -31,6 +31,8 @@
31 31
   #define BOARD_INFO_NAME "BTT SKR E3 Turbo"
32 32
 #endif
33 33
 
34
+#define USES_DIAG_JUMPERS
35
+
34 36
 // Onboard I2C EEPROM
35 37
 #define I2C_EEPROM
36 38
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB (AT24C32)

+ 2
- 0
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h Datei anzeigen

@@ -30,6 +30,8 @@
30 30
 #define BOARD_INFO_NAME   "MKS SGEN_L V2"
31 31
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks"
32 32
 
33
+#define USES_DIAG_JUMPERS
34
+
33 35
 //
34 36
 // EEPROM, MKS SGEN_L V2.0 hardware has 4K EEPROM on the board
35 37
 //

+ 2
- 0
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h Datei anzeigen

@@ -26,6 +26,8 @@
26 26
 // Release PB3/PB4 (E0 STP/DIR) from JTAG pins
27 27
 #define DISABLE_JTAG
28 28
 
29
+#define USES_DIAG_JUMPERS
30
+
29 31
 // Ignore temp readings during development.
30 32
 //#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
31 33
 

+ 3
- 2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h Datei anzeigen

@@ -27,10 +27,11 @@
27 27
 
28 28
 #include "env_validate.h"
29 29
 
30
-#define BOARD_NO_NATIVE_USB
31
-
32 30
 #define BOARD_WEBSITE_URL "github.com/makerbase-mks"
33 31
 
32
+#define BOARD_NO_NATIVE_USB
33
+#define USES_DIAG_JUMPERS
34
+
34 35
 //#define DISABLE_DEBUG
35 36
 #define DISABLE_JTAG
36 37
 

+ 1
- 0
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h Datei anzeigen

@@ -36,6 +36,7 @@
36 36
 #define BOARD_INFO_NAME "MKS Robin nano V2.0"
37 37
 
38 38
 #define BOARD_NO_NATIVE_USB
39
+#define USES_DIAG_PINS
39 40
 
40 41
 // Avoid conflict with TIMER_SERVO when using the STM32 HAL
41 42
 #define TEMP_TIMER                             5

+ 5
- 3
Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h Datei anzeigen

@@ -29,6 +29,11 @@
29 29
 
30 30
 #define BOARD_INFO_NAME "BTT BTT002 V1.0"
31 31
 
32
+#define USES_DIAG_PINS
33
+
34
+// Ignore temp readings during development.
35
+//#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
36
+
32 37
 // Use one of these or SDCard-based Emulation will be used
33 38
 #if NO_EEPROM_SELECTED
34 39
   //#define SRAM_EEPROM_EMULATION                 // Use BackSRAM-based EEPROM emulation
@@ -41,9 +46,6 @@
41 46
   #define FLASH_EEPROM_LEVELING
42 47
 #endif
43 48
 
44
-// Ignore temp readings during development.
45
-//#define BOGUS_TEMPERATURE_GRACE_PERIOD    2000
46
-
47 49
 //
48 50
 // Limit Switches
49 51
 //

+ 2
- 0
Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h Datei anzeigen

@@ -29,6 +29,8 @@
29 29
   #define BOARD_INFO_NAME "BTT E3 RRF"
30 30
 #endif
31 31
 
32
+#define USES_DIAG_JUMPERS
33
+
32 34
 // Add-on board for IDEX conversion
33 35
 //#define BTT_E3_RRF_IDEX_BOARD
34 36
 

+ 4
- 5
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h Datei anzeigen

@@ -31,15 +31,14 @@
31 31
 
32 32
 #define BOARD_INFO_NAME "BTT GTR V1.0"
33 33
 
34
+#define USES_DIAG_JUMPERS
35
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
36
+#define M5_EXTENDER                               // The M5 extender is attached
37
+
34 38
 // Onboard I2C EEPROM
35 39
 #define I2C_EEPROM
36 40
 #define MARLIN_EEPROM_SIZE                0x2000  // 8KB (24C64 ... 64Kb = 8KB)
37 41
 
38
-// USB Flash Drive support
39
-#define HAS_OTG_USB_HOST_SUPPORT
40
-
41
-#define M5_EXTENDER                               // The M5 extender is attached
42
-
43 42
 //
44 43
 // Servos
45 44
 //

+ 3
- 3
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h Datei anzeigen

@@ -23,15 +23,15 @@
23 23
 
24 24
 #include "env_validate.h"
25 25
 
26
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
27
+#define USES_DIAG_JUMPERS
28
+
26 29
 // Onboard I2C EEPROM
27 30
 #define I2C_EEPROM
28 31
 #define MARLIN_EEPROM_SIZE                0x8000  // 32KB (24C32A)
29 32
 #define I2C_SCL_PIN                         PB8
30 33
 #define I2C_SDA_PIN                         PB9
31 34
 
32
-// USB Flash Drive support
33
-#define HAS_OTG_USB_HOST_SUPPORT
34
-
35 35
 // Avoid conflict with TIMER_TONE
36 36
 #define STEP_TIMER                            10
37 37
 

+ 3
- 2
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h Datei anzeigen

@@ -23,6 +23,8 @@
23 23
 
24 24
 #include "env_validate.h"
25 25
 
26
+#define USES_DIAG_JUMPERS
27
+
26 28
 // If you have the BigTreeTech driver expansion module, enable BTT_MOTOR_EXPANSION
27 29
 // https://github.com/bigtreetech/BTT-Expansion-module/tree/master/BTT%20EXP-MOT
28 30
 //#define BTT_MOTOR_EXPANSION
@@ -47,8 +49,7 @@
47 49
   #define FLASH_EEPROM_LEVELING
48 50
 #endif
49 51
 
50
-// USB Flash Drive support
51
-#define HAS_OTG_USB_HOST_SUPPORT
52
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
52 53
 
53 54
 //
54 55
 // Servos

+ 1
- 2
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h Datei anzeigen

@@ -47,8 +47,7 @@
47 47
   #define FLASH_EEPROM_LEVELING
48 48
 #endif
49 49
 
50
-// USB Flash Drive support
51
-#define HAS_OTG_USB_HOST_SUPPORT
50
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
52 51
 
53 52
 // Avoid conflict with TIMER_TONE
54 53
 #define STEP_TIMER                            10

+ 1
- 2
Marlin/src/pins/stm32f4/pins_LERDGE_K.h Datei anzeigen

@@ -40,8 +40,7 @@
40 40
   #define MARLIN_EEPROM_SIZE             0x10000
41 41
 #endif
42 42
 
43
-// USB Flash Drive support
44
-#define HAS_OTG_USB_HOST_SUPPORT
43
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
45 44
 
46 45
 //
47 46
 // Servos

+ 1
- 2
Marlin/src/pins/stm32f4/pins_LERDGE_S.h Datei anzeigen

@@ -34,8 +34,7 @@
34 34
 #define STEP_TIMER                             4
35 35
 #define TEMP_TIMER                             2
36 36
 
37
-// USB Flash Drive support
38
-#define HAS_OTG_USB_HOST_SUPPORT
37
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
39 38
 
40 39
 //
41 40
 // Servos

+ 1
- 2
Marlin/src/pins/stm32f4/pins_LERDGE_X.h Datei anzeigen

@@ -39,8 +39,7 @@
39 39
 #define I2C_SDA_PIN                         PB9
40 40
 #define MARLIN_EEPROM_SIZE               0x10000  // FM24CL64 F-RAM 64K (8Kx8)
41 41
 
42
-// USB Flash Drive support
43
-#define HAS_OTG_USB_HOST_SUPPORT
42
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
44 43
 
45 44
 //
46 45
 // Servos

+ 2
- 2
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h Datei anzeigen

@@ -32,8 +32,8 @@
32 32
 
33 33
 #define BOARD_INFO_NAME "MKS Monster8 V1.x"
34 34
 
35
-// USB Flash Drive support
36
-#define HAS_OTG_USB_HOST_SUPPORT
35
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
36
+#define USES_DIAG_JUMPERS
37 37
 
38 38
 //#define DISABLE_DEBUG
39 39
 

+ 2
- 4
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h Datei anzeigen

@@ -32,22 +32,20 @@
32 32
 
33 33
 #define BOARD_INFO_NAME "MKS Robin Nano V3"
34 34
 
35
+#define USES_DIAG_JUMPERS
36
+
35 37
 #ifndef X_CS_PIN
36 38
   #define X_CS_PIN                          PD5
37 39
 #endif
38
-
39 40
 #ifndef Y_CS_PIN
40 41
   #define Y_CS_PIN                          PD7
41 42
 #endif
42
-
43 43
 #ifndef Z_CS_PIN
44 44
   #define Z_CS_PIN                          PD4
45 45
 #endif
46
-
47 46
 #ifndef E0_CS_PIN
48 47
   #define E0_CS_PIN                         PD9
49 48
 #endif
50
-
51 49
 #ifndef E1_CS_PIN
52 50
   #define E1_CS_PIN                         PD8
53 51
 #endif

+ 1
- 2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h Datei anzeigen

@@ -26,8 +26,7 @@
26 26
 // MKS Robin Nano V3, MKS Eagle pinmap
27 27
 //
28 28
 
29
-// USB Flash Drive support
30
-#define HAS_OTG_USB_HOST_SUPPORT
29
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
31 30
 
32 31
 // Avoid conflict with TIMER_TONE
33 32
 #define STEP_TIMER                            10

+ 1
- 2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h Datei anzeigen

@@ -39,8 +39,7 @@
39 39
 #define I2C_EEPROM
40 40
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB
41 41
 
42
-// USB Flash Drive support
43
-#define HAS_OTG_USB_HOST_SUPPORT
42
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
44 43
 
45 44
 //
46 45
 // Release PB4 (Y_ENABLE_PIN) from JTAG NRST role

+ 1
- 2
Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX.h Datei anzeigen

@@ -32,8 +32,7 @@
32 32
 #define I2C_EEPROM
33 33
 #define MARLIN_EEPROM_SIZE                0x1000  // 4KB (24C32 ... 32Kb = 4KB)
34 34
 
35
-// USB Flash Drive support
36
-#define HAS_OTG_USB_HOST_SUPPORT
35
+#define HAS_OTG_USB_HOST_SUPPORT                  // USB Flash Drive support
37 36
 
38 37
 //
39 38
 // Limit Switches

Laden…
Abbrechen
Speichern