Browse Source

Default microsteps to axis first stepper (#21230)

Ilya 4 years ago
parent
commit
2b9842e094
No account linked to committer's email address
1 changed files with 114 additions and 114 deletions
  1. 114
    114
      Marlin/Configuration_adv.h

+ 114
- 114
Marlin/Configuration_adv.h View File

@@ -2244,7 +2244,7 @@
2244 2244
   #if AXIS_DRIVER_TYPE_X2(TMC26X)
2245 2245
     #define X2_MAX_CURRENT    1000
2246 2246
     #define X2_SENSE_RESISTOR   91
2247
-    #define X2_MICROSTEPS       16
2247
+    #define X2_MICROSTEPS       X_MICROSTEPS
2248 2248
   #endif
2249 2249
 
2250 2250
   #if AXIS_DRIVER_TYPE_Y(TMC26X)
@@ -2256,7 +2256,7 @@
2256 2256
   #if AXIS_DRIVER_TYPE_Y2(TMC26X)
2257 2257
     #define Y2_MAX_CURRENT    1000
2258 2258
     #define Y2_SENSE_RESISTOR   91
2259
-    #define Y2_MICROSTEPS       16
2259
+    #define Y2_MICROSTEPS       Y_MICROSTEPS
2260 2260
   #endif
2261 2261
 
2262 2262
   #if AXIS_DRIVER_TYPE_Z(TMC26X)
@@ -2268,19 +2268,19 @@
2268 2268
   #if AXIS_DRIVER_TYPE_Z2(TMC26X)
2269 2269
     #define Z2_MAX_CURRENT    1000
2270 2270
     #define Z2_SENSE_RESISTOR   91
2271
-    #define Z2_MICROSTEPS       16
2271
+    #define Z2_MICROSTEPS       Z_MICROSTEPS
2272 2272
   #endif
2273 2273
 
2274 2274
   #if AXIS_DRIVER_TYPE_Z3(TMC26X)
2275 2275
     #define Z3_MAX_CURRENT    1000
2276 2276
     #define Z3_SENSE_RESISTOR   91
2277
-    #define Z3_MICROSTEPS       16
2277
+    #define Z3_MICROSTEPS       Z_MICROSTEPS
2278 2278
   #endif
2279 2279
 
2280 2280
   #if AXIS_DRIVER_TYPE_Z4(TMC26X)
2281 2281
     #define Z4_MAX_CURRENT    1000
2282 2282
     #define Z4_SENSE_RESISTOR   91
2283
-    #define Z4_MICROSTEPS       16
2283
+    #define Z4_MICROSTEPS       Z_MICROSTEPS
2284 2284
   #endif
2285 2285
 
2286 2286
   #if AXIS_DRIVER_TYPE_E0(TMC26X)
@@ -2292,43 +2292,43 @@
2292 2292
   #if AXIS_DRIVER_TYPE_E1(TMC26X)
2293 2293
     #define E1_MAX_CURRENT    1000
2294 2294
     #define E1_SENSE_RESISTOR   91
2295
-    #define E1_MICROSTEPS       16
2295
+    #define E1_MICROSTEPS       E0_MICROSTEPS
2296 2296
   #endif
2297 2297
 
2298 2298
   #if AXIS_DRIVER_TYPE_E2(TMC26X)
2299 2299
     #define E2_MAX_CURRENT    1000
2300 2300
     #define E2_SENSE_RESISTOR   91
2301
-    #define E2_MICROSTEPS       16
2301
+    #define E2_MICROSTEPS       E0_MICROSTEPS
2302 2302
   #endif
2303 2303
 
2304 2304
   #if AXIS_DRIVER_TYPE_E3(TMC26X)
2305 2305
     #define E3_MAX_CURRENT    1000
2306 2306
     #define E3_SENSE_RESISTOR   91
2307
-    #define E3_MICROSTEPS       16
2307
+    #define E3_MICROSTEPS       E0_MICROSTEPS
2308 2308
   #endif
2309 2309
 
2310 2310
   #if AXIS_DRIVER_TYPE_E4(TMC26X)
2311 2311
     #define E4_MAX_CURRENT    1000
2312 2312
     #define E4_SENSE_RESISTOR   91
2313
-    #define E4_MICROSTEPS       16
2313
+    #define E4_MICROSTEPS       E0_MICROSTEPS
2314 2314
   #endif
2315 2315
 
2316 2316
   #if AXIS_DRIVER_TYPE_E5(TMC26X)
2317 2317
     #define E5_MAX_CURRENT    1000
2318 2318
     #define E5_SENSE_RESISTOR   91
2319
-    #define E5_MICROSTEPS       16
2319
+    #define E5_MICROSTEPS       E0_MICROSTEPS
2320 2320
   #endif
2321 2321
 
2322 2322
   #if AXIS_DRIVER_TYPE_E6(TMC26X)
2323 2323
     #define E6_MAX_CURRENT    1000
2324 2324
     #define E6_SENSE_RESISTOR   91
2325
-    #define E6_MICROSTEPS       16
2325
+    #define E6_MICROSTEPS       E0_MICROSTEPS
2326 2326
   #endif
2327 2327
 
2328 2328
   #if AXIS_DRIVER_TYPE_E7(TMC26X)
2329 2329
     #define E7_MAX_CURRENT    1000
2330 2330
     #define E7_SENSE_RESISTOR   91
2331
-    #define E7_MICROSTEPS       16
2331
+    #define E7_MICROSTEPS       E0_MICROSTEPS
2332 2332
   #endif
2333 2333
 
2334 2334
 #endif // TMC26X
@@ -2373,7 +2373,7 @@
2373 2373
   #if AXIS_IS_TMC(X2)
2374 2374
     #define X2_CURRENT      800
2375 2375
     #define X2_CURRENT_HOME X2_CURRENT
2376
-    #define X2_MICROSTEPS    16
2376
+    #define X2_MICROSTEPS    X_MICROSTEPS
2377 2377
     #define X2_RSENSE         0.11
2378 2378
     #define X2_CHAIN_POS     -1
2379 2379
     //#define X2_INTERPOLATE true
@@ -2391,7 +2391,7 @@
2391 2391
   #if AXIS_IS_TMC(Y2)
2392 2392
     #define Y2_CURRENT      800
2393 2393
     #define Y2_CURRENT_HOME Y2_CURRENT
2394
-    #define Y2_MICROSTEPS    16
2394
+    #define Y2_MICROSTEPS    Y_MICROSTEPS
2395 2395
     #define Y2_RSENSE         0.11
2396 2396
     #define Y2_CHAIN_POS     -1
2397 2397
     //#define Y2_INTERPOLATE true
@@ -2409,7 +2409,7 @@
2409 2409
   #if AXIS_IS_TMC(Z2)
2410 2410
     #define Z2_CURRENT      800
2411 2411
     #define Z2_CURRENT_HOME Z2_CURRENT
2412
-    #define Z2_MICROSTEPS    16
2412
+    #define Z2_MICROSTEPS    Z_MICROSTEPS
2413 2413
     #define Z2_RSENSE         0.11
2414 2414
     #define Z2_CHAIN_POS     -1
2415 2415
     //#define Z2_INTERPOLATE true
@@ -2418,7 +2418,7 @@
2418 2418
   #if AXIS_IS_TMC(Z3)
2419 2419
     #define Z3_CURRENT      800
2420 2420
     #define Z3_CURRENT_HOME Z3_CURRENT
2421
-    #define Z3_MICROSTEPS    16
2421
+    #define Z3_MICROSTEPS    Z_MICROSTEPS
2422 2422
     #define Z3_RSENSE         0.11
2423 2423
     #define Z3_CHAIN_POS     -1
2424 2424
     //#define Z3_INTERPOLATE true
@@ -2427,7 +2427,7 @@
2427 2427
   #if AXIS_IS_TMC(Z4)
2428 2428
     #define Z4_CURRENT      800
2429 2429
     #define Z4_CURRENT_HOME Z4_CURRENT
2430
-    #define Z4_MICROSTEPS    16
2430
+    #define Z4_MICROSTEPS    Z_MICROSTEPS
2431 2431
     #define Z4_RSENSE         0.11
2432 2432
     #define Z4_CHAIN_POS     -1
2433 2433
     //#define Z4_INTERPOLATE true
@@ -2443,7 +2443,7 @@
2443 2443
 
2444 2444
   #if AXIS_IS_TMC(E1)
2445 2445
     #define E1_CURRENT      800
2446
-    #define E1_MICROSTEPS    16
2446
+    #define E1_MICROSTEPS    E0_MICROSTEPS
2447 2447
     #define E1_RSENSE         0.11
2448 2448
     #define E1_CHAIN_POS     -1
2449 2449
     //#define E1_INTERPOLATE true
@@ -2451,7 +2451,7 @@
2451 2451
 
2452 2452
   #if AXIS_IS_TMC(E2)
2453 2453
     #define E2_CURRENT      800
2454
-    #define E2_MICROSTEPS    16
2454
+    #define E2_MICROSTEPS    E0_MICROSTEPS
2455 2455
     #define E2_RSENSE         0.11
2456 2456
     #define E2_CHAIN_POS     -1
2457 2457
     //#define E2_INTERPOLATE true
@@ -2459,7 +2459,7 @@
2459 2459
 
2460 2460
   #if AXIS_IS_TMC(E3)
2461 2461
     #define E3_CURRENT      800
2462
-    #define E3_MICROSTEPS    16
2462
+    #define E3_MICROSTEPS    E0_MICROSTEPS
2463 2463
     #define E3_RSENSE         0.11
2464 2464
     #define E3_CHAIN_POS     -1
2465 2465
     //#define E3_INTERPOLATE true
@@ -2467,7 +2467,7 @@
2467 2467
 
2468 2468
   #if AXIS_IS_TMC(E4)
2469 2469
     #define E4_CURRENT      800
2470
-    #define E4_MICROSTEPS    16
2470
+    #define E4_MICROSTEPS    E0_MICROSTEPS
2471 2471
     #define E4_RSENSE         0.11
2472 2472
     #define E4_CHAIN_POS     -1
2473 2473
     //#define E4_INTERPOLATE true
@@ -2475,7 +2475,7 @@
2475 2475
 
2476 2476
   #if AXIS_IS_TMC(E5)
2477 2477
     #define E5_CURRENT      800
2478
-    #define E5_MICROSTEPS    16
2478
+    #define E5_MICROSTEPS    E0_MICROSTEPS
2479 2479
     #define E5_RSENSE         0.11
2480 2480
     #define E5_CHAIN_POS     -1
2481 2481
     //#define E5_INTERPOLATE true
@@ -2483,7 +2483,7 @@
2483 2483
 
2484 2484
   #if AXIS_IS_TMC(E6)
2485 2485
     #define E6_CURRENT      800
2486
-    #define E6_MICROSTEPS    16
2486
+    #define E6_MICROSTEPS    E0_MICROSTEPS
2487 2487
     #define E6_RSENSE         0.11
2488 2488
     #define E6_CHAIN_POS     -1
2489 2489
     //#define E6_INTERPOLATE true
@@ -2491,7 +2491,7 @@
2491 2491
 
2492 2492
   #if AXIS_IS_TMC(E7)
2493 2493
     #define E7_CURRENT      800
2494
-    #define E7_MICROSTEPS    16
2494
+    #define E7_MICROSTEPS    E0_MICROSTEPS
2495 2495
     #define E7_RSENSE         0.11
2496 2496
     #define E7_CHAIN_POS     -1
2497 2497
     //#define E7_INTERPOLATE true
@@ -2766,138 +2766,138 @@
2766 2766
   #endif
2767 2767
 
2768 2768
   #if AXIS_IS_L64XX(X2)
2769
-    #define X2_MICROSTEPS      128
2770
-    #define X2_OVERCURRENT    2000
2771
-    #define X2_STALLCURRENT   1500
2772
-    #define X2_MAX_VOLTAGE     127
2773
-    #define X2_CHAIN_POS        -1
2774
-    #define X2_SLEW_RATE         1
2769
+    #define X2_MICROSTEPS     X_MICROSTEPS
2770
+    #define X2_OVERCURRENT            2000
2771
+    #define X2_STALLCURRENT           1500
2772
+    #define X2_MAX_VOLTAGE             127
2773
+    #define X2_CHAIN_POS                -1
2774
+    #define X2_SLEW_RATE                 1
2775 2775
   #endif
2776 2776
 
2777 2777
   #if AXIS_IS_L64XX(Y)
2778
-    #define Y_MICROSTEPS       128
2779
-    #define Y_OVERCURRENT     2000
2780
-    #define Y_STALLCURRENT    1500
2781
-    #define Y_MAX_VOLTAGE      127
2782
-    #define Y_CHAIN_POS         -1
2783
-    #define Y_SLEW_RATE          1
2778
+    #define Y_MICROSTEPS               128
2779
+    #define Y_OVERCURRENT             2000
2780
+    #define Y_STALLCURRENT            1500
2781
+    #define Y_MAX_VOLTAGE              127
2782
+    #define Y_CHAIN_POS                 -1
2783
+    #define Y_SLEW_RATE                  1
2784 2784
   #endif
2785 2785
 
2786 2786
   #if AXIS_IS_L64XX(Y2)
2787
-    #define Y2_MICROSTEPS      128
2788
-    #define Y2_OVERCURRENT    2000
2789
-    #define Y2_STALLCURRENT   1500
2790
-    #define Y2_MAX_VOLTAGE     127
2791
-    #define Y2_CHAIN_POS        -1
2792
-    #define Y2_SLEW_RATE         1
2787
+    #define Y2_MICROSTEPS     Y_MICROSTEPS
2788
+    #define Y2_OVERCURRENT            2000
2789
+    #define Y2_STALLCURRENT           1500
2790
+    #define Y2_MAX_VOLTAGE             127
2791
+    #define Y2_CHAIN_POS                -1
2792
+    #define Y2_SLEW_RATE                 1
2793 2793
   #endif
2794 2794
 
2795 2795
   #if AXIS_IS_L64XX(Z)
2796
-    #define Z_MICROSTEPS       128
2797
-    #define Z_OVERCURRENT     2000
2798
-    #define Z_STALLCURRENT    1500
2799
-    #define Z_MAX_VOLTAGE      127
2800
-    #define Z_CHAIN_POS         -1
2801
-    #define Z_SLEW_RATE          1
2796
+    #define Z_MICROSTEPS               128
2797
+    #define Z_OVERCURRENT             2000
2798
+    #define Z_STALLCURRENT            1500
2799
+    #define Z_MAX_VOLTAGE              127
2800
+    #define Z_CHAIN_POS                 -1
2801
+    #define Z_SLEW_RATE                  1
2802 2802
   #endif
2803 2803
 
2804 2804
   #if AXIS_IS_L64XX(Z2)
2805
-    #define Z2_MICROSTEPS      128
2806
-    #define Z2_OVERCURRENT    2000
2807
-    #define Z2_STALLCURRENT   1500
2808
-    #define Z2_MAX_VOLTAGE     127
2809
-    #define Z2_CHAIN_POS        -1
2810
-    #define Z2_SLEW_RATE         1
2805
+    #define Z2_MICROSTEPS     Z_MICROSTEPS
2806
+    #define Z2_OVERCURRENT            2000
2807
+    #define Z2_STALLCURRENT           1500
2808
+    #define Z2_MAX_VOLTAGE             127
2809
+    #define Z2_CHAIN_POS                -1
2810
+    #define Z2_SLEW_RATE                 1
2811 2811
   #endif
2812 2812
 
2813 2813
   #if AXIS_IS_L64XX(Z3)
2814
-    #define Z3_MICROSTEPS      128
2815
-    #define Z3_OVERCURRENT    2000
2816
-    #define Z3_STALLCURRENT   1500
2817
-    #define Z3_MAX_VOLTAGE     127
2818
-    #define Z3_CHAIN_POS        -1
2819
-    #define Z3_SLEW_RATE         1
2814
+    #define Z3_MICROSTEPS     Z_MICROSTEPS
2815
+    #define Z3_OVERCURRENT            2000
2816
+    #define Z3_STALLCURRENT           1500
2817
+    #define Z3_MAX_VOLTAGE             127
2818
+    #define Z3_CHAIN_POS                -1
2819
+    #define Z3_SLEW_RATE                 1
2820 2820
   #endif
2821 2821
 
2822 2822
   #if AXIS_IS_L64XX(Z4)
2823
-    #define Z4_MICROSTEPS      128
2824
-    #define Z4_OVERCURRENT    2000
2825
-    #define Z4_STALLCURRENT   1500
2826
-    #define Z4_MAX_VOLTAGE     127
2827
-    #define Z4_CHAIN_POS        -1
2828
-    #define Z4_SLEW_RATE         1
2823
+    #define Z4_MICROSTEPS     Z_MICROSTEPS
2824
+    #define Z4_OVERCURRENT            2000
2825
+    #define Z4_STALLCURRENT           1500
2826
+    #define Z4_MAX_VOLTAGE             127
2827
+    #define Z4_CHAIN_POS                -1
2828
+    #define Z4_SLEW_RATE                 1
2829 2829
   #endif
2830 2830
 
2831 2831
   #if AXIS_IS_L64XX(E0)
2832
-    #define E0_MICROSTEPS      128
2833
-    #define E0_OVERCURRENT    2000
2834
-    #define E0_STALLCURRENT   1500
2835
-    #define E0_MAX_VOLTAGE     127
2836
-    #define E0_CHAIN_POS        -1
2837
-    #define E0_SLEW_RATE         1
2832
+    #define E0_MICROSTEPS              128
2833
+    #define E0_OVERCURRENT            2000
2834
+    #define E0_STALLCURRENT           1500
2835
+    #define E0_MAX_VOLTAGE             127
2836
+    #define E0_CHAIN_POS                -1
2837
+    #define E0_SLEW_RATE                 1
2838 2838
   #endif
2839 2839
 
2840 2840
   #if AXIS_IS_L64XX(E1)
2841
-    #define E1_MICROSTEPS      128
2842
-    #define E1_OVERCURRENT    2000
2843
-    #define E1_STALLCURRENT   1500
2844
-    #define E1_MAX_VOLTAGE     127
2845
-    #define E1_CHAIN_POS        -1
2846
-    #define E1_SLEW_RATE         1
2841
+    #define E1_MICROSTEPS    E0_MICROSTEPS
2842
+    #define E1_OVERCURRENT            2000
2843
+    #define E1_STALLCURRENT           1500
2844
+    #define E1_MAX_VOLTAGE             127
2845
+    #define E1_CHAIN_POS                -1
2846
+    #define E1_SLEW_RATE                 1
2847 2847
   #endif
2848 2848
 
2849 2849
   #if AXIS_IS_L64XX(E2)
2850
-    #define E2_MICROSTEPS      128
2851
-    #define E2_OVERCURRENT    2000
2852
-    #define E2_STALLCURRENT   1500
2853
-    #define E2_MAX_VOLTAGE     127
2854
-    #define E2_CHAIN_POS        -1
2855
-    #define E2_SLEW_RATE         1
2850
+    #define E2_MICROSTEPS    E0_MICROSTEPS
2851
+    #define E2_OVERCURRENT            2000
2852
+    #define E2_STALLCURRENT           1500
2853
+    #define E2_MAX_VOLTAGE             127
2854
+    #define E2_CHAIN_POS                -1
2855
+    #define E2_SLEW_RATE                 1
2856 2856
   #endif
2857 2857
 
2858 2858
   #if AXIS_IS_L64XX(E3)
2859
-    #define E3_MICROSTEPS      128
2860
-    #define E3_OVERCURRENT    2000
2861
-    #define E3_STALLCURRENT   1500
2862
-    #define E3_MAX_VOLTAGE     127
2863
-    #define E3_CHAIN_POS        -1
2864
-    #define E3_SLEW_RATE         1
2859
+    #define E3_MICROSTEPS    E0_MICROSTEPS
2860
+    #define E3_OVERCURRENT            2000
2861
+    #define E3_STALLCURRENT           1500
2862
+    #define E3_MAX_VOLTAGE             127
2863
+    #define E3_CHAIN_POS                -1
2864
+    #define E3_SLEW_RATE                 1
2865 2865
   #endif
2866 2866
 
2867 2867
   #if AXIS_IS_L64XX(E4)
2868
-    #define E4_MICROSTEPS      128
2869
-    #define E4_OVERCURRENT    2000
2870
-    #define E4_STALLCURRENT   1500
2871
-    #define E4_MAX_VOLTAGE     127
2872
-    #define E4_CHAIN_POS        -1
2873
-    #define E4_SLEW_RATE         1
2868
+    #define E4_MICROSTEPS    E0_MICROSTEPS
2869
+    #define E4_OVERCURRENT            2000
2870
+    #define E4_STALLCURRENT           1500
2871
+    #define E4_MAX_VOLTAGE             127
2872
+    #define E4_CHAIN_POS                -1
2873
+    #define E4_SLEW_RATE                 1
2874 2874
   #endif
2875 2875
 
2876 2876
   #if AXIS_IS_L64XX(E5)
2877
-    #define E5_MICROSTEPS      128
2878
-    #define E5_OVERCURRENT    2000
2879
-    #define E5_STALLCURRENT   1500
2880
-    #define E5_MAX_VOLTAGE     127
2881
-    #define E5_CHAIN_POS        -1
2882
-    #define E5_SLEW_RATE         1
2877
+    #define E5_MICROSTEPS    E0_MICROSTEPS
2878
+    #define E5_OVERCURRENT            2000
2879
+    #define E5_STALLCURRENT           1500
2880
+    #define E5_MAX_VOLTAGE             127
2881
+    #define E5_CHAIN_POS                -1
2882
+    #define E5_SLEW_RATE                 1
2883 2883
   #endif
2884 2884
 
2885 2885
   #if AXIS_IS_L64XX(E6)
2886
-    #define E6_MICROSTEPS      128
2887
-    #define E6_OVERCURRENT    2000
2888
-    #define E6_STALLCURRENT   1500
2889
-    #define E6_MAX_VOLTAGE     127
2890
-    #define E6_CHAIN_POS        -1
2891
-    #define E6_SLEW_RATE         1
2886
+    #define E6_MICROSTEPS    E0_MICROSTEPS
2887
+    #define E6_OVERCURRENT            2000
2888
+    #define E6_STALLCURRENT           1500
2889
+    #define E6_MAX_VOLTAGE             127
2890
+    #define E6_CHAIN_POS                -1
2891
+    #define E6_SLEW_RATE                 1
2892 2892
   #endif
2893 2893
 
2894 2894
   #if AXIS_IS_L64XX(E7)
2895
-    #define E7_MICROSTEPS      128
2896
-    #define E7_OVERCURRENT    2000
2897
-    #define E7_STALLCURRENT   1500
2898
-    #define E7_MAX_VOLTAGE     127
2899
-    #define E7_CHAIN_POS        -1
2900
-    #define E7_SLEW_RATE         1
2895
+    #define E7_MICROSTEPS    E0_MICROSTEPS
2896
+    #define E7_OVERCURRENT            2000
2897
+    #define E7_STALLCURRENT           1500
2898
+    #define E7_MAX_VOLTAGE             127
2899
+    #define E7_CHAIN_POS                -1
2900
+    #define E7_SLEW_RATE                 1
2901 2901
   #endif
2902 2902
 
2903 2903
   /**

Loading…
Cancel
Save