|
@@ -3638,7 +3638,7 @@ void Stepper::report_positions() {
|
3638
|
3638
|
void Stepper::microstep_ms(const uint8_t driver, const int8_t ms1, const int8_t ms2, const int8_t ms3) {
|
3639
|
3639
|
if (ms1 >= 0) switch (driver) {
|
3640
|
3640
|
#if HAS_X_MS_PINS || HAS_X2_MS_PINS
|
3641
|
|
- case 0:
|
|
3641
|
+ case X_AXIS:
|
3642
|
3642
|
#if HAS_X_MS_PINS
|
3643
|
3643
|
WRITE(X_MS1_PIN, ms1);
|
3644
|
3644
|
#endif
|
|
@@ -3648,7 +3648,7 @@ void Stepper::report_positions() {
|
3648
|
3648
|
break;
|
3649
|
3649
|
#endif
|
3650
|
3650
|
#if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
|
3651
|
|
- case 1:
|
|
3651
|
+ case Y_AXIS:
|
3652
|
3652
|
#if HAS_Y_MS_PINS
|
3653
|
3653
|
WRITE(Y_MS1_PIN, ms1);
|
3654
|
3654
|
#endif
|
|
@@ -3658,7 +3658,7 @@ void Stepper::report_positions() {
|
3658
|
3658
|
break;
|
3659
|
3659
|
#endif
|
3660
|
3660
|
#if HAS_SOME_Z_MS_PINS
|
3661
|
|
- case 2:
|
|
3661
|
+ case Z_AXIS:
|
3662
|
3662
|
#if HAS_Z_MS_PINS
|
3663
|
3663
|
WRITE(Z_MS1_PIN, ms1);
|
3664
|
3664
|
#endif
|
|
@@ -3673,52 +3673,52 @@ void Stepper::report_positions() {
|
3673
|
3673
|
#endif
|
3674
|
3674
|
break;
|
3675
|
3675
|
#endif
|
|
3676
|
+ #if HAS_I_MS_PINS
|
|
3677
|
+ case I_AXIS: WRITE(I_MS1_PIN, ms1); break
|
|
3678
|
+ #endif
|
|
3679
|
+ #if HAS_J_MS_PINS
|
|
3680
|
+ case J_AXIS: WRITE(J_MS1_PIN, ms1); break
|
|
3681
|
+ #endif
|
|
3682
|
+ #if HAS_K_MS_PINS
|
|
3683
|
+ case K_AXIS: WRITE(K_MS1_PIN, ms1); break
|
|
3684
|
+ #endif
|
|
3685
|
+ #if HAS_U_MS_PINS
|
|
3686
|
+ case U_AXIS: WRITE(U_MS1_PIN, ms1); break
|
|
3687
|
+ #endif
|
|
3688
|
+ #if HAS_V_MS_PINS
|
|
3689
|
+ case V_AXIS: WRITE(V_MS1_PIN, ms1); break
|
|
3690
|
+ #endif
|
|
3691
|
+ #if HAS_W_MS_PINS
|
|
3692
|
+ case W_AXIS: WRITE(W_MS1_PIN, ms1); break
|
|
3693
|
+ #endif
|
3676
|
3694
|
#if HAS_E0_MS_PINS
|
3677
|
|
- case 3: WRITE(E0_MS1_PIN, ms1); break;
|
|
3695
|
+ case E_AXIS: WRITE(E0_MS1_PIN, ms1); break;
|
3678
|
3696
|
#endif
|
3679
|
3697
|
#if HAS_E1_MS_PINS
|
3680
|
|
- case 4: WRITE(E1_MS1_PIN, ms1); break;
|
|
3698
|
+ case (E_AXIS + 1): WRITE(E1_MS1_PIN, ms1); break;
|
3681
|
3699
|
#endif
|
3682
|
3700
|
#if HAS_E2_MS_PINS
|
3683
|
|
- case 5: WRITE(E2_MS1_PIN, ms1); break;
|
|
3701
|
+ case (E_AXIS + 2): WRITE(E2_MS1_PIN, ms1); break;
|
3684
|
3702
|
#endif
|
3685
|
3703
|
#if HAS_E3_MS_PINS
|
3686
|
|
- case 6: WRITE(E3_MS1_PIN, ms1); break;
|
|
3704
|
+ case (E_AXIS + 3): WRITE(E3_MS1_PIN, ms1); break;
|
3687
|
3705
|
#endif
|
3688
|
3706
|
#if HAS_E4_MS_PINS
|
3689
|
|
- case 7: WRITE(E4_MS1_PIN, ms1); break;
|
|
3707
|
+ case (E_AXIS + 4): WRITE(E4_MS1_PIN, ms1); break;
|
3690
|
3708
|
#endif
|
3691
|
3709
|
#if HAS_E5_MS_PINS
|
3692
|
|
- case 8: WRITE(E5_MS1_PIN, ms1); break;
|
|
3710
|
+ case (E_AXIS + 5): WRITE(E5_MS1_PIN, ms1); break;
|
3693
|
3711
|
#endif
|
3694
|
3712
|
#if HAS_E6_MS_PINS
|
3695
|
|
- case 9: WRITE(E6_MS1_PIN, ms1); break;
|
|
3713
|
+ case (E_AXIS + 6): WRITE(E6_MS1_PIN, ms1); break;
|
3696
|
3714
|
#endif
|
3697
|
3715
|
#if HAS_E7_MS_PINS
|
3698
|
|
- case 10: WRITE(E7_MS1_PIN, ms1); break;
|
3699
|
|
- #endif
|
3700
|
|
- #if HAS_I_MS_PINS
|
3701
|
|
- case 11: WRITE(I_MS1_PIN, ms1); break
|
3702
|
|
- #endif
|
3703
|
|
- #if HAS_J_MS_PINS
|
3704
|
|
- case 12: WRITE(J_MS1_PIN, ms1); break
|
3705
|
|
- #endif
|
3706
|
|
- #if HAS_K_MS_PINS
|
3707
|
|
- case 13: WRITE(K_MS1_PIN, ms1); break
|
3708
|
|
- #endif
|
3709
|
|
- #if HAS_U_MS_PINS
|
3710
|
|
- case 14: WRITE(U_MS1_PIN, ms1); break
|
3711
|
|
- #endif
|
3712
|
|
- #if HAS_V_MS_PINS
|
3713
|
|
- case 15: WRITE(V_MS1_PIN, ms1); break
|
3714
|
|
- #endif
|
3715
|
|
- #if HAS_W_MS_PINS
|
3716
|
|
- case 16: WRITE(W_MS1_PIN, ms1); break
|
|
3716
|
+ case (E_AXIS + 7): WRITE(E7_MS1_PIN, ms1); break;
|
3717
|
3717
|
#endif
|
3718
|
3718
|
}
|
3719
|
3719
|
if (ms2 >= 0) switch (driver) {
|
3720
|
3720
|
#if HAS_X_MS_PINS || HAS_X2_MS_PINS
|
3721
|
|
- case 0:
|
|
3721
|
+ case X_AXIS:
|
3722
|
3722
|
#if HAS_X_MS_PINS
|
3723
|
3723
|
WRITE(X_MS2_PIN, ms2);
|
3724
|
3724
|
#endif
|
|
@@ -3728,7 +3728,7 @@ void Stepper::report_positions() {
|
3728
|
3728
|
break;
|
3729
|
3729
|
#endif
|
3730
|
3730
|
#if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
|
3731
|
|
- case 1:
|
|
3731
|
+ case Y_AXIS:
|
3732
|
3732
|
#if HAS_Y_MS_PINS
|
3733
|
3733
|
WRITE(Y_MS2_PIN, ms2);
|
3734
|
3734
|
#endif
|
|
@@ -3738,7 +3738,7 @@ void Stepper::report_positions() {
|
3738
|
3738
|
break;
|
3739
|
3739
|
#endif
|
3740
|
3740
|
#if HAS_SOME_Z_MS_PINS
|
3741
|
|
- case 2:
|
|
3741
|
+ case Z_AXIS:
|
3742
|
3742
|
#if HAS_Z_MS_PINS
|
3743
|
3743
|
WRITE(Z_MS2_PIN, ms2);
|
3744
|
3744
|
#endif
|
|
@@ -3753,52 +3753,52 @@ void Stepper::report_positions() {
|
3753
|
3753
|
#endif
|
3754
|
3754
|
break;
|
3755
|
3755
|
#endif
|
|
3756
|
+ #if HAS_I_MS_PINS
|
|
3757
|
+ case I_AXIS: WRITE(I_MS2_PIN, ms2); break
|
|
3758
|
+ #endif
|
|
3759
|
+ #if HAS_J_MS_PINS
|
|
3760
|
+ case J_AXIS: WRITE(J_MS2_PIN, ms2); break
|
|
3761
|
+ #endif
|
|
3762
|
+ #if HAS_K_MS_PINS
|
|
3763
|
+ case K_AXIS: WRITE(K_MS2_PIN, ms2); break
|
|
3764
|
+ #endif
|
|
3765
|
+ #if HAS_U_MS_PINS
|
|
3766
|
+ case U_AXIS: WRITE(U_MS2_PIN, ms2); break
|
|
3767
|
+ #endif
|
|
3768
|
+ #if HAS_V_MS_PINS
|
|
3769
|
+ case V_AXIS: WRITE(V_MS2_PIN, ms2); break
|
|
3770
|
+ #endif
|
|
3771
|
+ #if HAS_W_MS_PINS
|
|
3772
|
+ case W_AXIS: WRITE(W_MS2_PIN, ms2); break
|
|
3773
|
+ #endif
|
3756
|
3774
|
#if HAS_E0_MS_PINS
|
3757
|
|
- case 3: WRITE(E0_MS2_PIN, ms2); break;
|
|
3775
|
+ case E_AXIS: WRITE(E0_MS2_PIN, ms2); break;
|
3758
|
3776
|
#endif
|
3759
|
3777
|
#if HAS_E1_MS_PINS
|
3760
|
|
- case 4: WRITE(E1_MS2_PIN, ms2); break;
|
|
3778
|
+ case (E_AXIS + 1): WRITE(E1_MS2_PIN, ms2); break;
|
3761
|
3779
|
#endif
|
3762
|
3780
|
#if HAS_E2_MS_PINS
|
3763
|
|
- case 5: WRITE(E2_MS2_PIN, ms2); break;
|
|
3781
|
+ case (E_AXIS + 2): WRITE(E2_MS2_PIN, ms2); break;
|
3764
|
3782
|
#endif
|
3765
|
3783
|
#if HAS_E3_MS_PINS
|
3766
|
|
- case 6: WRITE(E3_MS2_PIN, ms2); break;
|
|
3784
|
+ case (E_AXIS + 3): WRITE(E3_MS2_PIN, ms2); break;
|
3767
|
3785
|
#endif
|
3768
|
3786
|
#if HAS_E4_MS_PINS
|
3769
|
|
- case 7: WRITE(E4_MS2_PIN, ms2); break;
|
|
3787
|
+ case (E_AXIS + 4): WRITE(E4_MS2_PIN, ms2); break;
|
3770
|
3788
|
#endif
|
3771
|
3789
|
#if HAS_E5_MS_PINS
|
3772
|
|
- case 8: WRITE(E5_MS2_PIN, ms2); break;
|
|
3790
|
+ case (E_AXIS + 5): WRITE(E5_MS2_PIN, ms2); break;
|
3773
|
3791
|
#endif
|
3774
|
3792
|
#if HAS_E6_MS_PINS
|
3775
|
|
- case 9: WRITE(E6_MS2_PIN, ms2); break;
|
|
3793
|
+ case (E_AXIS + 6): WRITE(E6_MS2_PIN, ms2); break;
|
3776
|
3794
|
#endif
|
3777
|
3795
|
#if HAS_E7_MS_PINS
|
3778
|
|
- case 10: WRITE(E7_MS2_PIN, ms2); break;
|
3779
|
|
- #endif
|
3780
|
|
- #if HAS_I_MS_PINS
|
3781
|
|
- case 11: WRITE(I_MS2_PIN, ms2); break
|
3782
|
|
- #endif
|
3783
|
|
- #if HAS_J_MS_PINS
|
3784
|
|
- case 12: WRITE(J_MS2_PIN, ms2); break
|
3785
|
|
- #endif
|
3786
|
|
- #if HAS_K_MS_PINS
|
3787
|
|
- case 13: WRITE(K_MS2_PIN, ms2); break
|
3788
|
|
- #endif
|
3789
|
|
- #if HAS_U_MS_PINS
|
3790
|
|
- case 14: WRITE(U_MS2_PIN, ms2); break
|
3791
|
|
- #endif
|
3792
|
|
- #if HAS_V_MS_PINS
|
3793
|
|
- case 15: WRITE(V_MS2_PIN, ms2); break
|
3794
|
|
- #endif
|
3795
|
|
- #if HAS_W_MS_PINS
|
3796
|
|
- case 16: WRITE(W_MS2_PIN, ms2); break
|
|
3796
|
+ case (E_AXIS + 7): WRITE(E7_MS2_PIN, ms2); break;
|
3797
|
3797
|
#endif
|
3798
|
3798
|
}
|
3799
|
3799
|
if (ms3 >= 0) switch (driver) {
|
3800
|
3800
|
#if HAS_X_MS_PINS || HAS_X2_MS_PINS
|
3801
|
|
- case 0:
|
|
3801
|
+ case X_AXIS:
|
3802
|
3802
|
#if HAS_X_MS_PINS && PIN_EXISTS(X_MS3)
|
3803
|
3803
|
WRITE(X_MS3_PIN, ms3);
|
3804
|
3804
|
#endif
|
|
@@ -3808,7 +3808,7 @@ void Stepper::report_positions() {
|
3808
|
3808
|
break;
|
3809
|
3809
|
#endif
|
3810
|
3810
|
#if HAS_Y_MS_PINS || HAS_Y2_MS_PINS
|
3811
|
|
- case 1:
|
|
3811
|
+ case Y_AXIS:
|
3812
|
3812
|
#if HAS_Y_MS_PINS && PIN_EXISTS(Y_MS3)
|
3813
|
3813
|
WRITE(Y_MS3_PIN, ms3);
|
3814
|
3814
|
#endif
|
|
@@ -3818,7 +3818,7 @@ void Stepper::report_positions() {
|
3818
|
3818
|
break;
|
3819
|
3819
|
#endif
|
3820
|
3820
|
#if HAS_SOME_Z_MS_PINS
|
3821
|
|
- case 2:
|
|
3821
|
+ case Z_AXIS:
|
3822
|
3822
|
#if HAS_Z_MS_PINS && PIN_EXISTS(Z_MS3)
|
3823
|
3823
|
WRITE(Z_MS3_PIN, ms3);
|
3824
|
3824
|
#endif
|
|
@@ -3833,29 +3833,47 @@ void Stepper::report_positions() {
|
3833
|
3833
|
#endif
|
3834
|
3834
|
break;
|
3835
|
3835
|
#endif
|
|
3836
|
+ #if HAS_I_MS_PINS
|
|
3837
|
+ case I_AXIS: WRITE(I_MS3_PIN, ms3); break
|
|
3838
|
+ #endif
|
|
3839
|
+ #if HAS_J_MS_PINS
|
|
3840
|
+ case J_AXIS: WRITE(J_MS3_PIN, ms3); break
|
|
3841
|
+ #endif
|
|
3842
|
+ #if HAS_K_MS_PINS
|
|
3843
|
+ case K_AXIS: WRITE(K_MS3_PIN, ms3); break
|
|
3844
|
+ #endif
|
|
3845
|
+ #if HAS_U_MS_PINS
|
|
3846
|
+ case U_AXIS: WRITE(U_MS3_PIN, ms3); break
|
|
3847
|
+ #endif
|
|
3848
|
+ #if HAS_V_MS_PINS
|
|
3849
|
+ case V_AXIS: WRITE(V_MS3_PIN, ms3); break
|
|
3850
|
+ #endif
|
|
3851
|
+ #if HAS_W_MS_PINS
|
|
3852
|
+ case W_AXIS: WRITE(W_MS3_PIN, ms3); break
|
|
3853
|
+ #endif
|
3836
|
3854
|
#if HAS_E0_MS_PINS && PIN_EXISTS(E0_MS3)
|
3837
|
|
- case 3: WRITE(E0_MS3_PIN, ms3); break;
|
|
3855
|
+ case E_AXIS: WRITE(E0_MS3_PIN, ms3); break;
|
3838
|
3856
|
#endif
|
3839
|
3857
|
#if HAS_E1_MS_PINS && PIN_EXISTS(E1_MS3)
|
3840
|
|
- case 4: WRITE(E1_MS3_PIN, ms3); break;
|
|
3858
|
+ case (E_AXIS + 1): WRITE(E1_MS3_PIN, ms3); break;
|
3841
|
3859
|
#endif
|
3842
|
3860
|
#if HAS_E2_MS_PINS && PIN_EXISTS(E2_MS3)
|
3843
|
|
- case 5: WRITE(E2_MS3_PIN, ms3); break;
|
|
3861
|
+ case (E_AXIS + 2): WRITE(E2_MS3_PIN, ms3); break;
|
3844
|
3862
|
#endif
|
3845
|
3863
|
#if HAS_E3_MS_PINS && PIN_EXISTS(E3_MS3)
|
3846
|
|
- case 6: WRITE(E3_MS3_PIN, ms3); break;
|
|
3864
|
+ case (E_AXIS + 3): WRITE(E3_MS3_PIN, ms3); break;
|
3847
|
3865
|
#endif
|
3848
|
3866
|
#if HAS_E4_MS_PINS && PIN_EXISTS(E4_MS3)
|
3849
|
|
- case 7: WRITE(E4_MS3_PIN, ms3); break;
|
|
3867
|
+ case (E_AXIS + 4): WRITE(E4_MS3_PIN, ms3); break;
|
3850
|
3868
|
#endif
|
3851
|
3869
|
#if HAS_E5_MS_PINS && PIN_EXISTS(E5_MS3)
|
3852
|
|
- case 8: WRITE(E5_MS3_PIN, ms3); break;
|
|
3870
|
+ case (E_AXIS + 5): WRITE(E5_MS3_PIN, ms3); break;
|
3853
|
3871
|
#endif
|
3854
|
3872
|
#if HAS_E6_MS_PINS && PIN_EXISTS(E6_MS3)
|
3855
|
|
- case 9: WRITE(E6_MS3_PIN, ms3); break;
|
|
3873
|
+ case (E_AXIS + 6): WRITE(E6_MS3_PIN, ms3); break;
|
3856
|
3874
|
#endif
|
3857
|
3875
|
#if HAS_E7_MS_PINS && PIN_EXISTS(E7_MS3)
|
3858
|
|
- case 10: WRITE(E7_MS3_PIN, ms3); break;
|
|
3876
|
+ case (E_AXIS + 7): WRITE(E7_MS3_PIN, ms3); break;
|
3859
|
3877
|
#endif
|
3860
|
3878
|
}
|
3861
|
3879
|
}
|