Browse Source

Handle dependent Stepper Driver defaults later (#19820)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
ellensp 4 years ago
parent
commit
69d55cabd4
No account linked to committer's email address
2 changed files with 44 additions and 35 deletions
  1. 21
    31
      Marlin/src/inc/Conditionals_LCD.h
  2. 23
    4
      Marlin/src/inc/Conditionals_adv.h

+ 21
- 31
Marlin/src/inc/Conditionals_LCD.h View File

781
   #define HAS_ETHERNET 1
781
   #define HAS_ETHERNET 1
782
 #endif
782
 #endif
783
 
783
 
784
-// Fallback Stepper Driver types
784
+// Fallback Stepper Driver types that don't depend on Configuration_adv.h
785
 #ifndef X_DRIVER_TYPE
785
 #ifndef X_DRIVER_TYPE
786
-  #define X_DRIVER_TYPE A4988
786
+  #define X_DRIVER_TYPE  A4988
787
 #endif
787
 #endif
788
-#ifndef Y_DRIVER_TYPE
789
-  #define Y_DRIVER_TYPE A4988
790
-#endif
791
-#ifndef Z_DRIVER_TYPE
792
-  #define Z_DRIVER_TYPE A4988
793
-#endif
794
-#if NONE(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
795
-  #undef X2_DRIVER_TYPE
796
-#elif !defined(X2_DRIVER_TYPE)
788
+#ifndef X2_DRIVER_TYPE
797
   #define X2_DRIVER_TYPE A4988
789
   #define X2_DRIVER_TYPE A4988
798
 #endif
790
 #endif
799
-#if DISABLED(Y_DUAL_STEPPER_DRIVERS)
800
-  #undef Y2_DRIVER_TYPE
801
-#elif !defined(Y2_DRIVER_TYPE)
791
+#ifndef Y_DRIVER_TYPE
792
+  #define Y_DRIVER_TYPE  A4988
793
+#endif
794
+#ifndef Y2_DRIVER_TYPE
802
   #define Y2_DRIVER_TYPE A4988
795
   #define Y2_DRIVER_TYPE A4988
803
 #endif
796
 #endif
804
-#if NUM_Z_STEPPER_DRIVERS < 2
805
-  #undef Z2_DRIVER_TYPE
806
-#elif !defined(Z2_DRIVER_TYPE)
797
+#ifndef Z_DRIVER_TYPE
798
+  #define Z_DRIVER_TYPE  A4988
799
+#endif
800
+#ifndef Z2_DRIVER_TYPE
807
   #define Z2_DRIVER_TYPE A4988
801
   #define Z2_DRIVER_TYPE A4988
808
 #endif
802
 #endif
809
-#if NUM_Z_STEPPER_DRIVERS < 3
810
-  #undef Z3_DRIVER_TYPE
811
-#elif !defined(Z3_DRIVER_TYPE)
803
+#ifndef Z3_DRIVER_TYPE
812
   #define Z3_DRIVER_TYPE A4988
804
   #define Z3_DRIVER_TYPE A4988
813
 #endif
805
 #endif
814
-#if NUM_Z_STEPPER_DRIVERS < 4
815
-  #undef Z4_DRIVER_TYPE
816
-#elif !defined(Z4_DRIVER_TYPE)
806
+#ifndef Z4_DRIVER_TYPE
817
   #define Z4_DRIVER_TYPE A4988
807
   #define Z4_DRIVER_TYPE A4988
818
 #endif
808
 #endif
819
-#if E_STEPPERS < 1
809
+#if E_STEPPERS <= 0
820
   #undef E0_DRIVER_TYPE
810
   #undef E0_DRIVER_TYPE
821
 #elif !defined(E0_DRIVER_TYPE)
811
 #elif !defined(E0_DRIVER_TYPE)
822
   #define E0_DRIVER_TYPE A4988
812
   #define E0_DRIVER_TYPE A4988
823
 #endif
813
 #endif
824
-#if E_STEPPERS < 2
814
+#if E_STEPPERS <= 1
825
   #undef E1_DRIVER_TYPE
815
   #undef E1_DRIVER_TYPE
826
 #elif !defined(E1_DRIVER_TYPE)
816
 #elif !defined(E1_DRIVER_TYPE)
827
   #define E1_DRIVER_TYPE A4988
817
   #define E1_DRIVER_TYPE A4988
828
 #endif
818
 #endif
829
-#if E_STEPPERS < 3
819
+#if E_STEPPERS <= 2
830
   #undef E2_DRIVER_TYPE
820
   #undef E2_DRIVER_TYPE
831
 #elif !defined(E2_DRIVER_TYPE)
821
 #elif !defined(E2_DRIVER_TYPE)
832
   #define E2_DRIVER_TYPE A4988
822
   #define E2_DRIVER_TYPE A4988
833
 #endif
823
 #endif
834
-#if E_STEPPERS < 4
824
+#if E_STEPPERS <= 3
835
   #undef E3_DRIVER_TYPE
825
   #undef E3_DRIVER_TYPE
836
 #elif !defined(E3_DRIVER_TYPE)
826
 #elif !defined(E3_DRIVER_TYPE)
837
   #define E3_DRIVER_TYPE A4988
827
   #define E3_DRIVER_TYPE A4988
838
 #endif
828
 #endif
839
-#if E_STEPPERS < 5
829
+#if E_STEPPERS <= 4
840
   #undef E4_DRIVER_TYPE
830
   #undef E4_DRIVER_TYPE
841
 #elif !defined(E4_DRIVER_TYPE)
831
 #elif !defined(E4_DRIVER_TYPE)
842
   #define E4_DRIVER_TYPE A4988
832
   #define E4_DRIVER_TYPE A4988
843
 #endif
833
 #endif
844
-#if E_STEPPERS < 6
834
+#if E_STEPPERS <= 5
845
   #undef E5_DRIVER_TYPE
835
   #undef E5_DRIVER_TYPE
846
 #elif !defined(E5_DRIVER_TYPE)
836
 #elif !defined(E5_DRIVER_TYPE)
847
   #define E5_DRIVER_TYPE A4988
837
   #define E5_DRIVER_TYPE A4988
848
 #endif
838
 #endif
849
-#if E_STEPPERS < 7
839
+#if E_STEPPERS <= 6
850
   #undef E6_DRIVER_TYPE
840
   #undef E6_DRIVER_TYPE
851
 #elif !defined(E6_DRIVER_TYPE)
841
 #elif !defined(E6_DRIVER_TYPE)
852
   #define E6_DRIVER_TYPE A4988
842
   #define E6_DRIVER_TYPE A4988
853
 #endif
843
 #endif
854
-#if E_STEPPERS < 8
844
+#if E_STEPPERS <= 7
855
   #undef E7_DRIVER_TYPE
845
   #undef E7_DRIVER_TYPE
856
 #elif !defined(E7_DRIVER_TYPE)
846
 #elif !defined(E7_DRIVER_TYPE)
857
   #define E7_DRIVER_TYPE A4988
847
   #define E7_DRIVER_TYPE A4988

+ 23
- 4
Marlin/src/inc/Conditionals_adv.h View File

178
   #define HAS_MOTOR_CURRENT_I2C 1
178
   #define HAS_MOTOR_CURRENT_I2C 1
179
 #endif
179
 #endif
180
 
180
 
181
+#if ENABLED(Z_STEPPER_AUTO_ALIGN)
182
+  #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
183
+    #undef Z_STEPPER_ALIGN_AMP
184
+  #endif
185
+  #ifndef Z_STEPPER_ALIGN_AMP
186
+    #define Z_STEPPER_ALIGN_AMP 1.0
187
+  #endif
188
+#endif
189
+
181
 // Multiple Z steppers
190
 // Multiple Z steppers
182
 #ifndef NUM_Z_STEPPER_DRIVERS
191
 #ifndef NUM_Z_STEPPER_DRIVERS
183
   #define NUM_Z_STEPPER_DRIVERS 1
192
   #define NUM_Z_STEPPER_DRIVERS 1
184
 #endif
193
 #endif
185
 
194
 
186
-#if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
187
-  #undef Z_STEPPER_ALIGN_AMP
195
+// Fallback Stepper Driver types that depend on Configuration_adv.h
196
+#if NONE(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
197
+  #undef X2_DRIVER_TYPE
198
+#endif
199
+#if DISABLED(Y_DUAL_STEPPER_DRIVERS)
200
+  #undef Y2_DRIVER_TYPE
201
+#endif
202
+#if NUM_Z_STEPPER_DRIVERS < 2
203
+  #undef Z2_DRIVER_TYPE
204
+#endif
205
+#if NUM_Z_STEPPER_DRIVERS < 3
206
+  #undef Z3_DRIVER_TYPE
188
 #endif
207
 #endif
189
-#ifndef Z_STEPPER_ALIGN_AMP
190
-  #define Z_STEPPER_ALIGN_AMP 1.0
208
+#if NUM_Z_STEPPER_DRIVERS < 4
209
+  #undef Z4_DRIVER_TYPE
191
 #endif
210
 #endif
192
 
211
 
193
 //
212
 //

Loading…
Cancel
Save