Browse Source

🐛 Followup to 6 linear axes (#22482)

DerAndere 4 years ago
parent
commit
0eda34e07d
No account linked to committer's email address

+ 1
- 0
Marlin/src/core/serial.h View File

37
                   SP_I_LBL[], SP_J_LBL[], SP_K_LBL[],
37
                   SP_I_LBL[], SP_J_LBL[], SP_K_LBL[],
38
                   SP_P_STR[], SP_T_STR[],
38
                   SP_P_STR[], SP_T_STR[],
39
                   X_STR[], Y_STR[], Z_STR[], E_STR[],
39
                   X_STR[], Y_STR[], Z_STR[], E_STR[],
40
+                  I_STR[], J_STR[], K_STR[],
40
                   X_LBL[], Y_LBL[], Z_LBL[], E_LBL[],
41
                   X_LBL[], Y_LBL[], Z_LBL[], E_LBL[],
41
                   I_LBL[], J_LBL[], K_LBL[];
42
                   I_LBL[], J_LBL[], K_LBL[];
42
 
43
 

+ 24
- 2
Marlin/src/inc/Conditionals_post.h View File

1784
   #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
1784
   #if defined(Z4_STALL_SENSITIVITY) && AXIS_HAS_STALLGUARD(Z4)
1785
     #define Z4_SENSORLESS 1
1785
     #define Z4_SENSORLESS 1
1786
   #endif
1786
   #endif
1787
+  #if defined(I_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(I)
1788
+    #define I_SENSORLESS 1
1789
+  #endif
1790
+  #if defined(J_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(J)
1791
+    #define J_SENSORLESS 1
1792
+  #endif
1793
+  #if defined(K_STALL_SENSITIVITY)  && AXIS_HAS_STALLGUARD(K)
1794
+    #define K_SENSORLESS 1
1795
+  #endif
1787
 
1796
 
1788
   #if AXIS_HAS_STEALTHCHOP(X)
1797
   #if AXIS_HAS_STEALTHCHOP(X)
1789
     #define X_HAS_STEALTHCHOP 1
1798
     #define X_HAS_STEALTHCHOP 1
1845
 
1854
 
1846
   #if ENABLED(SPI_ENDSTOPS)
1855
   #if ENABLED(SPI_ENDSTOPS)
1847
     #define X_SPI_SENSORLESS X_SENSORLESS
1856
     #define X_SPI_SENSORLESS X_SENSORLESS
1848
-    #define Y_SPI_SENSORLESS Y_SENSORLESS
1849
-    #define Z_SPI_SENSORLESS Z_SENSORLESS
1857
+    #if HAS_Y_AXIS
1858
+      #define Y_SPI_SENSORLESS Y_SENSORLESS
1859
+    #endif
1860
+    #if HAS_Z_AXIS
1861
+      #define Z_SPI_SENSORLESS Z_SENSORLESS
1862
+    #endif
1863
+    #if LINEAR_AXES >= 4
1864
+      #define I_SPI_SENSORLESS I_SENSORLESS
1865
+    #endif
1866
+    #if LINEAR_AXES >= 5
1867
+      #define J_SPI_SENSORLESS J_SENSORLESS
1868
+    #endif
1869
+    #if LINEAR_AXES >= 6
1870
+      #define K_SPI_SENSORLESS K_SENSORLESS
1871
+    #endif
1850
   #endif
1872
   #endif
1851
   #ifndef X_INTERPOLATE
1873
   #ifndef X_INTERPOLATE
1852
     #define X_INTERPOLATE INTERPOLATE
1874
     #define X_INTERPOLATE INTERPOLATE

+ 3
- 3
Marlin/src/lcd/menu/menu_motion.cpp View File

357
       GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
357
       GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
358
     #endif
358
     #endif
359
     #if LINEAR_AXES >= 4
359
     #if LINEAR_AXES >= 4
360
-      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" I_STR));
360
+      GCODES_ITEM(MSG_AUTO_HOME_I, PSTR("G28" AXIS4_STR));
361
     #endif
361
     #endif
362
     #if LINEAR_AXES >= 5
362
     #if LINEAR_AXES >= 5
363
-      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" J_STR));
363
+      GCODES_ITEM(MSG_AUTO_HOME_J, PSTR("G28" AXIS5_STR));
364
     #endif
364
     #endif
365
     #if LINEAR_AXES >= 6
365
     #if LINEAR_AXES >= 6
366
-      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" K_STR));
366
+      GCODES_ITEM(MSG_AUTO_HOME_K, PSTR("G28" AXIS6_STR));
367
     #endif
367
     #endif
368
   #endif
368
   #endif
369
 
369
 

+ 6
- 6
Marlin/src/module/endstops.cpp View File

754
     #endif
754
     #endif
755
   #endif
755
   #endif
756
 
756
 
757
-  #if HAS_I_MIN
757
+  #if HAS_I_MIN && !I_SPI_SENSORLESS
758
     #if ENABLED(I_DUAL_ENDSTOPS)
758
     #if ENABLED(I_DUAL_ENDSTOPS)
759
       UPDATE_ENDSTOP_BIT(I, MIN);
759
       UPDATE_ENDSTOP_BIT(I, MIN);
760
       #if HAS_I2_MIN
760
       #if HAS_I2_MIN
767
     #endif
767
     #endif
768
   #endif
768
   #endif
769
 
769
 
770
-  #if HAS_I_MAX
770
+  #if HAS_I_MAX && !I_SPI_SENSORLESS
771
     #if ENABLED(I_DUAL_ENDSTOPS)
771
     #if ENABLED(I_DUAL_ENDSTOPS)
772
       UPDATE_ENDSTOP_BIT(I, MAX);
772
       UPDATE_ENDSTOP_BIT(I, MAX);
773
       #if HAS_I2_MAX
773
       #if HAS_I2_MAX
780
     #endif
780
     #endif
781
   #endif
781
   #endif
782
 
782
 
783
-  #if HAS_J_MIN
783
+  #if HAS_J_MIN && !J_SPI_SENSORLESS
784
     #if ENABLED(J_DUAL_ENDSTOPS)
784
     #if ENABLED(J_DUAL_ENDSTOPS)
785
       UPDATE_ENDSTOP_BIT(J, MIN);
785
       UPDATE_ENDSTOP_BIT(J, MIN);
786
       #if HAS_J2_MIN
786
       #if HAS_J2_MIN
793
     #endif
793
     #endif
794
   #endif
794
   #endif
795
 
795
 
796
-  #if HAS_J_MAX
796
+  #if HAS_J_MAX && !J_SPI_SENSORLESS
797
     #if ENABLED(J_DUAL_ENDSTOPS)
797
     #if ENABLED(J_DUAL_ENDSTOPS)
798
       UPDATE_ENDSTOP_BIT(J, MAX);
798
       UPDATE_ENDSTOP_BIT(J, MAX);
799
       #if HAS_J2_MAX
799
       #if HAS_J2_MAX
806
     #endif
806
     #endif
807
   #endif
807
   #endif
808
 
808
 
809
-  #if HAS_K_MIN
809
+  #if HAS_K_MIN && !K_SPI_SENSORLESS
810
     #if ENABLED(K_DUAL_ENDSTOPS)
810
     #if ENABLED(K_DUAL_ENDSTOPS)
811
       UPDATE_ENDSTOP_BIT(K, MIN);
811
       UPDATE_ENDSTOP_BIT(K, MIN);
812
       #if HAS_K2_MIN
812
       #if HAS_K2_MIN
819
     #endif
819
     #endif
820
   #endif
820
   #endif
821
 
821
 
822
-  #if HAS_K_MAX
822
+  #if HAS_K_MAX && !K_SPI_SENSORLESS
823
     #if ENABLED(K_DUAL_ENDSTOPS)
823
     #if ENABLED(K_DUAL_ENDSTOPS)
824
       UPDATE_ENDSTOP_BIT(K, MAX);
824
       UPDATE_ENDSTOP_BIT(K, MAX);
825
       #if HAS_K2_MAX
825
       #if HAS_K2_MAX

+ 9
- 0
Marlin/src/module/endstops.h View File

84
   #if HAS_Z_MIN || HAS_Z_MAX || HOMING_Z_WITH_PROBE
84
   #if HAS_Z_MIN || HAS_Z_MAX || HOMING_Z_WITH_PROBE
85
     , Z_ENDSTOP = TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN))
85
     , Z_ENDSTOP = TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN))
86
   #endif
86
   #endif
87
+  #if HAS_I_MIN || HAS_I_MAX
88
+    , I_ENDSTOP = TERN(I_HOME_TO_MAX, I_MAX, I_MIN)
89
+  #endif
90
+  #if HAS_J_MIN || HAS_J_MAX
91
+    , J_ENDSTOP = TERN(J_HOME_TO_MAX, J_MAX, J_MIN)
92
+  #endif
93
+  #if HAS_K_MIN || HAS_K_MAX
94
+    , K_ENDSTOP = TERN(K_HOME_TO_MAX, K_MAX, K_MIN)
95
+  #endif
87
 };
96
 };
88
 
97
 
89
 #undef __ES_ITEM
98
 #undef __ES_ITEM

Loading…
Cancel
Save