|
@@ -129,6 +129,8 @@ static const uint32_t _DMA[] PROGMEM = DEFAULT_MAX_ACCELERATION;
|
129
|
129
|
static const float _DASU[] PROGMEM = DEFAULT_AXIS_STEPS_PER_UNIT;
|
130
|
130
|
static const feedRate_t _DMF[] PROGMEM = DEFAULT_MAX_FEEDRATE;
|
131
|
131
|
|
|
132
|
+extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[], SP_E_STR[];
|
|
133
|
+
|
132
|
134
|
/**
|
133
|
135
|
* Current EEPROM Layout
|
134
|
136
|
*
|
|
@@ -2728,40 +2730,40 @@ void MarlinSettings::reset() {
|
2728
|
2730
|
|
2729
|
2731
|
CONFIG_ECHO_HEADING("Maximum feedrates (units/s):");
|
2730
|
2732
|
CONFIG_ECHO_START();
|
2731
|
|
- SERIAL_ECHOLNPAIR(
|
2732
|
|
- " M203 X", LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS])
|
2733
|
|
- , " Y", LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS])
|
2734
|
|
- , " Z", LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS])
|
|
2733
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2734
|
+ PSTR(" M203 X"), LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS])
|
|
2735
|
+ , SP_Y_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS])
|
|
2736
|
+ , SP_Z_STR, LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS])
|
2735
|
2737
|
#if DISABLED(DISTINCT_E_FACTORS)
|
2736
|
|
- , " E", VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
|
|
2738
|
+ , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])
|
2737
|
2739
|
#endif
|
2738
|
2740
|
);
|
2739
|
2741
|
#if ENABLED(DISTINCT_E_FACTORS)
|
2740
|
2742
|
CONFIG_ECHO_START();
|
2741
|
2743
|
for (uint8_t i = 0; i < E_STEPPERS; i++) {
|
2742
|
|
- SERIAL_ECHOLNPAIR(
|
2743
|
|
- " M203 T", (int)i
|
2744
|
|
- , " E", VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
|
|
2744
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2745
|
+ PSTR(" M203 T"), (int)i
|
|
2746
|
+ , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS_N(i)])
|
2745
|
2747
|
);
|
2746
|
2748
|
}
|
2747
|
2749
|
#endif
|
2748
|
2750
|
|
2749
|
2751
|
CONFIG_ECHO_HEADING("Maximum Acceleration (units/s2):");
|
2750
|
2752
|
CONFIG_ECHO_START();
|
2751
|
|
- SERIAL_ECHOLNPAIR(
|
2752
|
|
- " M201 X", LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS])
|
2753
|
|
- , " Y", LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS])
|
2754
|
|
- , " Z", LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS])
|
|
2753
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2754
|
+ PSTR(" M201 X"), LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS])
|
|
2755
|
+ , SP_Y_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS])
|
|
2756
|
+ , SP_Z_STR, LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS])
|
2755
|
2757
|
#if DISABLED(DISTINCT_E_FACTORS)
|
2756
|
|
- , " E", VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
|
|
2758
|
+ , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])
|
2757
|
2759
|
#endif
|
2758
|
2760
|
);
|
2759
|
2761
|
#if ENABLED(DISTINCT_E_FACTORS)
|
2760
|
2762
|
CONFIG_ECHO_START();
|
2761
|
2763
|
for (uint8_t i = 0; i < E_STEPPERS; i++)
|
2762
|
|
- SERIAL_ECHOLNPAIR(
|
2763
|
|
- " M201 T", (int)i
|
2764
|
|
- , " E", VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
|
|
2764
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2765
|
+ PSTR(" M201 T"), (int)i
|
|
2766
|
+ , SP_E_STR, VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(i)])
|
2765
|
2767
|
);
|
2766
|
2768
|
#endif
|
2767
|
2769
|
|
|
@@ -2788,19 +2790,19 @@ void MarlinSettings::reset() {
|
2788
|
2790
|
SERIAL_EOL();
|
2789
|
2791
|
}
|
2790
|
2792
|
CONFIG_ECHO_START();
|
2791
|
|
- SERIAL_ECHOLNPAIR(
|
2792
|
|
- " M205 B", LINEAR_UNIT(planner.settings.min_segment_time_us)
|
2793
|
|
- , " S", LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
|
2794
|
|
- , " T", LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
|
|
2793
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2794
|
+ PSTR(" M205 B"), LINEAR_UNIT(planner.settings.min_segment_time_us)
|
|
2795
|
+ , PSTR(" S"), LINEAR_UNIT(planner.settings.min_feedrate_mm_s)
|
|
2796
|
+ , PSTR(" T"), LINEAR_UNIT(planner.settings.min_travel_feedrate_mm_s)
|
2795
|
2797
|
#if DISABLED(CLASSIC_JERK)
|
2796
|
|
- , " J", LINEAR_UNIT(planner.junction_deviation_mm)
|
|
2798
|
+ , PSTR(" J"), LINEAR_UNIT(planner.junction_deviation_mm)
|
2797
|
2799
|
#endif
|
2798
|
2800
|
#if HAS_CLASSIC_JERK
|
2799
|
|
- , " X", LINEAR_UNIT(planner.max_jerk.x)
|
2800
|
|
- , " Y", LINEAR_UNIT(planner.max_jerk.y)
|
2801
|
|
- , " Z", LINEAR_UNIT(planner.max_jerk.z)
|
|
2801
|
+ , SP_X_STR, LINEAR_UNIT(planner.max_jerk.x)
|
|
2802
|
+ , SP_Y_STR, LINEAR_UNIT(planner.max_jerk.y)
|
|
2803
|
+ , SP_Z_STR, LINEAR_UNIT(planner.max_jerk.z)
|
2802
|
2804
|
#if HAS_CLASSIC_E_JERK
|
2803
|
|
- , " E", LINEAR_UNIT(planner.max_jerk.e)
|
|
2805
|
+ , SP_E_STR, LINEAR_UNIT(planner.max_jerk.e)
|
2804
|
2806
|
#endif
|
2805
|
2807
|
#endif
|
2806
|
2808
|
);
|
|
@@ -2808,12 +2810,15 @@ void MarlinSettings::reset() {
|
2808
|
2810
|
#if HAS_M206_COMMAND
|
2809
|
2811
|
CONFIG_ECHO_HEADING("Home offset:");
|
2810
|
2812
|
CONFIG_ECHO_START();
|
2811
|
|
- SERIAL_ECHOLNPAIR(" M206"
|
|
2813
|
+ SERIAL_ECHOLNPAIR_P(
|
2812
|
2814
|
#if IS_CARTESIAN
|
2813
|
|
- " X", LINEAR_UNIT(home_offset.x),
|
2814
|
|
- " Y", LINEAR_UNIT(home_offset.y),
|
|
2815
|
+ PSTR(" M206 X"), LINEAR_UNIT(home_offset.x)
|
|
2816
|
+ , SP_Y_STR, LINEAR_UNIT(home_offset.y)
|
|
2817
|
+ , SP_Z_STR
|
|
2818
|
+ #else
|
|
2819
|
+ PSTR(" M206 Z")
|
2815
|
2820
|
#endif
|
2816
|
|
- " Z", LINEAR_UNIT(home_offset.z)
|
|
2821
|
+ , LINEAR_UNIT(home_offset.z)
|
2817
|
2822
|
);
|
2818
|
2823
|
#endif
|
2819
|
2824
|
|
|
@@ -2821,11 +2826,12 @@ void MarlinSettings::reset() {
|
2821
|
2826
|
CONFIG_ECHO_HEADING("Hotend offsets:");
|
2822
|
2827
|
CONFIG_ECHO_START();
|
2823
|
2828
|
for (uint8_t e = 1; e < HOTENDS; e++) {
|
2824
|
|
- SERIAL_ECHOPAIR(
|
2825
|
|
- " M218 T", (int)e,
|
2826
|
|
- " X", LINEAR_UNIT(hotend_offset[e].x), " Y", LINEAR_UNIT(hotend_offset[e].y)
|
|
2829
|
+ SERIAL_ECHOPAIR_P(
|
|
2830
|
+ PSTR(" M218 T"), (int)e,
|
|
2831
|
+ SP_X_STR, LINEAR_UNIT(hotend_offset[e].x),
|
|
2832
|
+ SP_Y_STR, LINEAR_UNIT(hotend_offset[e].y)
|
2827
|
2833
|
);
|
2828
|
|
- SERIAL_ECHOLNPAIR_F(" Z", LINEAR_UNIT(hotend_offset[e].z), 3);
|
|
2834
|
+ SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(hotend_offset[e].z), 3);
|
2829
|
2835
|
}
|
2830
|
2836
|
#endif
|
2831
|
2837
|
|
|
@@ -2853,10 +2859,10 @@ void MarlinSettings::reset() {
|
2853
|
2859
|
#endif
|
2854
|
2860
|
|
2855
|
2861
|
CONFIG_ECHO_START();
|
2856
|
|
- SERIAL_ECHOLNPAIR(
|
2857
|
|
- " M420 S", planner.leveling_active ? 1 : 0
|
|
2862
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2863
|
+ PSTR(" M420 S"), planner.leveling_active ? 1 : 0
|
2858
|
2864
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2859
|
|
- , " Z", LINEAR_UNIT(planner.z_fade_height)
|
|
2865
|
+ , SP_Z_STR, LINEAR_UNIT(planner.z_fade_height)
|
2860
|
2866
|
#endif
|
2861
|
2867
|
);
|
2862
|
2868
|
|
|
@@ -2866,8 +2872,8 @@ void MarlinSettings::reset() {
|
2866
|
2872
|
for (uint8_t py = 0; py < GRID_MAX_POINTS_Y; py++) {
|
2867
|
2873
|
for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
|
2868
|
2874
|
CONFIG_ECHO_START();
|
2869
|
|
- SERIAL_ECHOPAIR(" G29 S3 X", (int)px + 1, " Y", (int)py + 1);
|
2870
|
|
- SERIAL_ECHOLNPAIR_F(" Z", LINEAR_UNIT(mbl.z_values[px][py]), 5);
|
|
2875
|
+ SERIAL_ECHOPAIR_P(PSTR(" G29 S3 X"), (int)px + 1, SP_Y_STR, (int)py + 1);
|
|
2876
|
+ SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(mbl.z_values[px][py]), 5);
|
2871
|
2877
|
}
|
2872
|
2878
|
}
|
2873
|
2879
|
}
|
|
@@ -2890,7 +2896,7 @@ void MarlinSettings::reset() {
|
2890
|
2896
|
for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
|
2891
|
2897
|
CONFIG_ECHO_START();
|
2892
|
2898
|
SERIAL_ECHOPAIR(" G29 W I", (int)px, " J", (int)py);
|
2893
|
|
- SERIAL_ECHOLNPAIR_F(" Z", LINEAR_UNIT(z_values[px][py]), 5);
|
|
2899
|
+ SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(z_values[px][py]), 5);
|
2894
|
2900
|
}
|
2895
|
2901
|
}
|
2896
|
2902
|
}
|
|
@@ -2926,33 +2932,33 @@ void MarlinSettings::reset() {
|
2926
|
2932
|
|
2927
|
2933
|
CONFIG_ECHO_HEADING("SCARA settings: S<seg-per-sec> P<theta-psi-offset> T<theta-offset>");
|
2928
|
2934
|
CONFIG_ECHO_START();
|
2929
|
|
- SERIAL_ECHOLNPAIR(
|
2930
|
|
- " M665 S", delta_segments_per_second
|
2931
|
|
- , " P", scara_home_offset.a
|
2932
|
|
- , " T", scara_home_offset.b
|
2933
|
|
- , " Z", LINEAR_UNIT(scara_home_offset.z)
|
|
2935
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2936
|
+ PSTR(" M665 S"), delta_segments_per_second
|
|
2937
|
+ , PSTR(" P"), scara_home_offset.a
|
|
2938
|
+ , PSTR(" T"), scara_home_offset.b
|
|
2939
|
+ , SP_Z_STR, LINEAR_UNIT(scara_home_offset.z)
|
2934
|
2940
|
);
|
2935
|
2941
|
|
2936
|
2942
|
#elif ENABLED(DELTA)
|
2937
|
2943
|
|
2938
|
2944
|
CONFIG_ECHO_HEADING("Endstop adjustment:");
|
2939
|
2945
|
CONFIG_ECHO_START();
|
2940
|
|
- SERIAL_ECHOLNPAIR(
|
2941
|
|
- " M666 X", LINEAR_UNIT(delta_endstop_adj.a)
|
2942
|
|
- , " Y", LINEAR_UNIT(delta_endstop_adj.b)
|
2943
|
|
- , " Z", LINEAR_UNIT(delta_endstop_adj.c)
|
|
2946
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2947
|
+ PSTR(" M666 X"), LINEAR_UNIT(delta_endstop_adj.a)
|
|
2948
|
+ , SP_Y_STR, LINEAR_UNIT(delta_endstop_adj.b)
|
|
2949
|
+ , SP_Z_STR, LINEAR_UNIT(delta_endstop_adj.c)
|
2944
|
2950
|
);
|
2945
|
2951
|
|
2946
|
2952
|
CONFIG_ECHO_HEADING("Delta settings: L<diagonal_rod> R<radius> H<height> S<segments_per_s> XYZ<tower angle corrections>");
|
2947
|
2953
|
CONFIG_ECHO_START();
|
2948
|
|
- SERIAL_ECHOLNPAIR(
|
2949
|
|
- " M665 L", LINEAR_UNIT(delta_diagonal_rod)
|
2950
|
|
- , " R", LINEAR_UNIT(delta_radius)
|
2951
|
|
- , " H", LINEAR_UNIT(delta_height)
|
2952
|
|
- , " S", delta_segments_per_second
|
2953
|
|
- , " X", LINEAR_UNIT(delta_tower_angle_trim.a)
|
2954
|
|
- , " Y", LINEAR_UNIT(delta_tower_angle_trim.b)
|
2955
|
|
- , " Z", LINEAR_UNIT(delta_tower_angle_trim.c)
|
|
2954
|
+ SERIAL_ECHOLNPAIR_P(
|
|
2955
|
+ PSTR(" M665 L"), LINEAR_UNIT(delta_diagonal_rod)
|
|
2956
|
+ , PSTR(" R"), LINEAR_UNIT(delta_radius)
|
|
2957
|
+ , PSTR(" H"), LINEAR_UNIT(delta_height)
|
|
2958
|
+ , PSTR(" S"), delta_segments_per_second
|
|
2959
|
+ , SP_X_STR, LINEAR_UNIT(delta_tower_angle_trim.a)
|
|
2960
|
+ , SP_Y_STR, LINEAR_UNIT(delta_tower_angle_trim.b)
|
|
2961
|
+ , SP_Z_STR, LINEAR_UNIT(delta_tower_angle_trim.c)
|
2956
|
2962
|
);
|
2957
|
2963
|
|
2958
|
2964
|
#elif EITHER(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS) || Z_MULTI_ENDSTOPS
|
|
@@ -2961,17 +2967,17 @@ void MarlinSettings::reset() {
|
2961
|
2967
|
CONFIG_ECHO_START();
|
2962
|
2968
|
SERIAL_ECHOPGM(" M666");
|
2963
|
2969
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
2964
|
|
- SERIAL_ECHOPAIR(" X", LINEAR_UNIT(endstops.x2_endstop_adj));
|
|
2970
|
+ SERIAL_ECHOPAIR_P(SP_X_STR, LINEAR_UNIT(endstops.x2_endstop_adj));
|
2965
|
2971
|
#endif
|
2966
|
2972
|
#if ENABLED(Y_DUAL_ENDSTOPS)
|
2967
|
|
- SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(endstops.y2_endstop_adj));
|
|
2973
|
+ SERIAL_ECHOPAIR_P(SP_Y_STR, LINEAR_UNIT(endstops.y2_endstop_adj));
|
2968
|
2974
|
#endif
|
2969
|
2975
|
#if ENABLED(Z_TRIPLE_ENDSTOPS)
|
2970
|
2976
|
SERIAL_ECHOLNPAIR("S1 Z", LINEAR_UNIT(endstops.z2_endstop_adj));
|
2971
|
2977
|
CONFIG_ECHO_START();
|
2972
|
2978
|
SERIAL_ECHOPAIR(" M666 S2 Z", LINEAR_UNIT(endstops.z3_endstop_adj));
|
2973
|
2979
|
#elif ENABLED(Z_DUAL_ENDSTOPS)
|
2974
|
|
- SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(endstops.z2_endstop_adj));
|
|
2980
|
+ SERIAL_ECHOPAIR_P(SP_Z_STR, LINEAR_UNIT(endstops.z2_endstop_adj));
|
2975
|
2981
|
#endif
|
2976
|
2982
|
SERIAL_EOL();
|
2977
|
2983
|
|
|
@@ -2999,13 +3005,16 @@ void MarlinSettings::reset() {
|
2999
|
3005
|
#if ENABLED(PIDTEMP)
|
3000
|
3006
|
HOTEND_LOOP() {
|
3001
|
3007
|
CONFIG_ECHO_START();
|
3002
|
|
- SERIAL_ECHOPAIR(" M301"
|
|
3008
|
+ SERIAL_ECHOPAIR_P(
|
3003
|
3009
|
#if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
|
3004
|
|
- " E", e,
|
|
3010
|
+ PSTR(" M301 E"), e,
|
|
3011
|
+ PSTR(" P")
|
|
3012
|
+ #else
|
|
3013
|
+ PSTR(" M301 P")
|
3005
|
3014
|
#endif
|
3006
|
|
- " P", PID_PARAM(Kp, e)
|
3007
|
|
- , " I", unscalePID_i(PID_PARAM(Ki, e))
|
3008
|
|
- , " D", unscalePID_d(PID_PARAM(Kd, e))
|
|
3015
|
+ , PID_PARAM(Kp, e)
|
|
3016
|
+ , PSTR(" I"), unscalePID_i(PID_PARAM(Ki, e))
|
|
3017
|
+ , PSTR(" D"), unscalePID_d(PID_PARAM(Kd, e))
|
3009
|
3018
|
);
|
3010
|
3019
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
3011
|
3020
|
SERIAL_ECHOPAIR(" C", PID_PARAM(Kc, e));
|
|
@@ -3051,11 +3060,11 @@ void MarlinSettings::reset() {
|
3051
|
3060
|
|
3052
|
3061
|
CONFIG_ECHO_HEADING("Retract: S<length> F<units/m> Z<lift>");
|
3053
|
3062
|
CONFIG_ECHO_START();
|
3054
|
|
- SERIAL_ECHOLNPAIR(
|
3055
|
|
- " M207 S", LINEAR_UNIT(fwretract.settings.retract_length)
|
3056
|
|
- , " W", LINEAR_UNIT(fwretract.settings.swap_retract_length)
|
3057
|
|
- , " F", LINEAR_UNIT(MMS_TO_MMM(fwretract.settings.retract_feedrate_mm_s))
|
3058
|
|
- , " Z", LINEAR_UNIT(fwretract.settings.retract_zraise)
|
|
3063
|
+ SERIAL_ECHOLNPAIR_P(
|
|
3064
|
+ PSTR(" M207 S"), LINEAR_UNIT(fwretract.settings.retract_length)
|
|
3065
|
+ , PSTR(" W"), LINEAR_UNIT(fwretract.settings.swap_retract_length)
|
|
3066
|
+ , PSTR(" F"), LINEAR_UNIT(MMS_TO_MMM(fwretract.settings.retract_feedrate_mm_s))
|
|
3067
|
+ , SP_Z_STR, LINEAR_UNIT(fwretract.settings.retract_zraise)
|
3059
|
3068
|
);
|
3060
|
3069
|
|
3061
|
3070
|
CONFIG_ECHO_HEADING("Recover: S<length> F<units/m>");
|
|
@@ -3086,9 +3095,9 @@ void MarlinSettings::reset() {
|
3086
|
3095
|
say_units(true);
|
3087
|
3096
|
}
|
3088
|
3097
|
CONFIG_ECHO_START();
|
3089
|
|
- SERIAL_ECHOLNPAIR(" M851 X", LINEAR_UNIT(probe_offset.x),
|
3090
|
|
- " Y", LINEAR_UNIT(probe_offset.y),
|
3091
|
|
- " Z", LINEAR_UNIT(probe_offset.z));
|
|
3098
|
+ SERIAL_ECHOLNPAIR_P(PSTR(" M851 X"), LINEAR_UNIT(probe_offset.x),
|
|
3099
|
+ SP_Y_STR, LINEAR_UNIT(probe_offset.y),
|
|
3100
|
+ SP_Z_STR, LINEAR_UNIT(probe_offset.z));
|
3092
|
3101
|
#endif
|
3093
|
3102
|
|
3094
|
3103
|
/**
|
|
@@ -3115,15 +3124,15 @@ void MarlinSettings::reset() {
|
3115
|
3124
|
|
3116
|
3125
|
#if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
|
3117
|
3126
|
say_M906(forReplay);
|
3118
|
|
- SERIAL_ECHOLNPAIR(
|
|
3127
|
+ SERIAL_ECHOLNPAIR_P(
|
3119
|
3128
|
#if AXIS_IS_TMC(X)
|
3120
|
|
- " X", stepperX.getMilliamps(),
|
|
3129
|
+ SP_X_STR, stepperX.getMilliamps(),
|
3121
|
3130
|
#endif
|
3122
|
3131
|
#if AXIS_IS_TMC(Y)
|
3123
|
|
- " Y", stepperY.getMilliamps(),
|
|
3132
|
+ SP_Y_STR, stepperY.getMilliamps(),
|
3124
|
3133
|
#endif
|
3125
|
3134
|
#if AXIS_IS_TMC(Z)
|
3126
|
|
- " Z", stepperZ.getMilliamps()
|
|
3135
|
+ SP_Z_STR, stepperZ.getMilliamps()
|
3127
|
3136
|
#endif
|
3128
|
3137
|
);
|
3129
|
3138
|
#endif
|
|
@@ -3131,15 +3140,15 @@ void MarlinSettings::reset() {
|
3131
|
3140
|
#if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2)
|
3132
|
3141
|
say_M906(forReplay);
|
3133
|
3142
|
SERIAL_ECHOPGM(" I1");
|
3134
|
|
- SERIAL_ECHOLNPAIR(
|
|
3143
|
+ SERIAL_ECHOLNPAIR_P(
|
3135
|
3144
|
#if AXIS_IS_TMC(X2)
|
3136
|
|
- " X", stepperX2.getMilliamps(),
|
|
3145
|
+ SP_X_STR, stepperX2.getMilliamps(),
|
3137
|
3146
|
#endif
|
3138
|
3147
|
#if AXIS_IS_TMC(Y2)
|
3139
|
|
- " Y", stepperY2.getMilliamps(),
|
|
3148
|
+ SP_Y_STR, stepperY2.getMilliamps(),
|
3140
|
3149
|
#endif
|
3141
|
3150
|
#if AXIS_IS_TMC(Z2)
|
3142
|
|
- " Z", stepperZ2.getMilliamps()
|
|
3151
|
+ SP_Z_STR, stepperZ2.getMilliamps()
|
3143
|
3152
|
#endif
|
3144
|
3153
|
);
|
3145
|
3154
|
#endif
|
|
@@ -3184,13 +3193,13 @@ void MarlinSettings::reset() {
|
3184
|
3193
|
say_M913(forReplay);
|
3185
|
3194
|
#endif
|
3186
|
3195
|
#if AXIS_HAS_STEALTHCHOP(X)
|
3187
|
|
- SERIAL_ECHOPAIR(" X", stepperX.get_pwm_thrs());
|
|
3196
|
+ SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.get_pwm_thrs());
|
3188
|
3197
|
#endif
|
3189
|
3198
|
#if AXIS_HAS_STEALTHCHOP(Y)
|
3190
|
|
- SERIAL_ECHOPAIR(" Y", stepperY.get_pwm_thrs());
|
|
3199
|
+ SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.get_pwm_thrs());
|
3191
|
3200
|
#endif
|
3192
|
3201
|
#if AXIS_HAS_STEALTHCHOP(Z)
|
3193
|
|
- SERIAL_ECHOPAIR(" Z", stepperZ.get_pwm_thrs());
|
|
3202
|
+ SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.get_pwm_thrs());
|
3194
|
3203
|
#endif
|
3195
|
3204
|
#if AXIS_HAS_STEALTHCHOP(X) || AXIS_HAS_STEALTHCHOP(Y) || AXIS_HAS_STEALTHCHOP(Z)
|
3196
|
3205
|
SERIAL_EOL();
|
|
@@ -3201,13 +3210,13 @@ void MarlinSettings::reset() {
|
3201
|
3210
|
SERIAL_ECHOPGM(" I1");
|
3202
|
3211
|
#endif
|
3203
|
3212
|
#if AXIS_HAS_STEALTHCHOP(X2)
|
3204
|
|
- SERIAL_ECHOPAIR(" X", stepperX2.get_pwm_thrs());
|
|
3213
|
+ SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.get_pwm_thrs());
|
3205
|
3214
|
#endif
|
3206
|
3215
|
#if AXIS_HAS_STEALTHCHOP(Y2)
|
3207
|
|
- SERIAL_ECHOPAIR(" Y", stepperY2.get_pwm_thrs());
|
|
3216
|
+ SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.get_pwm_thrs());
|
3208
|
3217
|
#endif
|
3209
|
3218
|
#if AXIS_HAS_STEALTHCHOP(Z2)
|
3210
|
|
- SERIAL_ECHOPAIR(" Z", stepperZ2.get_pwm_thrs());
|
|
3219
|
+ SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
|
3211
|
3220
|
#endif
|
3212
|
3221
|
#if AXIS_HAS_STEALTHCHOP(X2) || AXIS_HAS_STEALTHCHOP(Y2) || AXIS_HAS_STEALTHCHOP(Z2)
|
3213
|
3222
|
SERIAL_EOL();
|
|
@@ -3254,13 +3263,13 @@ void MarlinSettings::reset() {
|
3254
|
3263
|
CONFIG_ECHO_START();
|
3255
|
3264
|
say_M914();
|
3256
|
3265
|
#if X_SENSORLESS
|
3257
|
|
- SERIAL_ECHOPAIR(" X", stepperX.homing_threshold());
|
|
3266
|
+ SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.homing_threshold());
|
3258
|
3267
|
#endif
|
3259
|
3268
|
#if Y_SENSORLESS
|
3260
|
|
- SERIAL_ECHOPAIR(" Y", stepperY.homing_threshold());
|
|
3269
|
+ SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.homing_threshold());
|
3261
|
3270
|
#endif
|
3262
|
3271
|
#if Z_SENSORLESS
|
3263
|
|
- SERIAL_ECHOPAIR(" Z", stepperZ.homing_threshold());
|
|
3272
|
+ SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.homing_threshold());
|
3264
|
3273
|
#endif
|
3265
|
3274
|
SERIAL_EOL();
|
3266
|
3275
|
#endif
|
|
@@ -3270,13 +3279,13 @@ void MarlinSettings::reset() {
|
3270
|
3279
|
say_M914();
|
3271
|
3280
|
SERIAL_ECHOPGM(" I1");
|
3272
|
3281
|
#if X2_SENSORLESS
|
3273
|
|
- SERIAL_ECHOPAIR(" X", stepperX2.homing_threshold());
|
|
3282
|
+ SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.homing_threshold());
|
3274
|
3283
|
#endif
|
3275
|
3284
|
#if Y2_SENSORLESS
|
3276
|
|
- SERIAL_ECHOPAIR(" Y", stepperY2.homing_threshold());
|
|
3285
|
+ SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.homing_threshold());
|
3277
|
3286
|
#endif
|
3278
|
3287
|
#if Z2_SENSORLESS
|
3279
|
|
- SERIAL_ECHOPAIR(" Z", stepperZ2.homing_threshold());
|
|
3288
|
+ SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.homing_threshold());
|
3280
|
3289
|
#endif
|
3281
|
3290
|
SERIAL_EOL();
|
3282
|
3291
|
#endif
|
|
@@ -3312,9 +3321,9 @@ void MarlinSettings::reset() {
|
3312
|
3321
|
|
3313
|
3322
|
if (chop_x || chop_y || chop_z) {
|
3314
|
3323
|
say_M569(forReplay);
|
3315
|
|
- if (chop_x) SERIAL_ECHOPGM(" X");
|
3316
|
|
- if (chop_y) SERIAL_ECHOPGM(" Y");
|
3317
|
|
- if (chop_z) SERIAL_ECHOPGM(" Z");
|
|
3324
|
+ if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR);
|
|
3325
|
+ if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR);
|
|
3326
|
+ if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR);
|
3318
|
3327
|
SERIAL_EOL();
|
3319
|
3328
|
}
|
3320
|
3329
|
|
|
@@ -3336,9 +3345,9 @@ void MarlinSettings::reset() {
|
3336
|
3345
|
|
3337
|
3346
|
if (chop_x2 || chop_y2 || chop_z2) {
|
3338
|
3347
|
say_M569(forReplay, PSTR("I1"));
|
3339
|
|
- if (chop_x2) SERIAL_ECHOPGM(" X");
|
3340
|
|
- if (chop_y2) SERIAL_ECHOPGM(" Y");
|
3341
|
|
- if (chop_z2) SERIAL_ECHOPGM(" Z");
|
|
3348
|
+ if (chop_x2) SERIAL_ECHOPGM_P(SP_X_STR);
|
|
3349
|
+ if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
|
|
3350
|
+ if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
|
3342
|
3351
|
SERIAL_EOL();
|
3343
|
3352
|
}
|
3344
|
3353
|
|
|
@@ -3386,10 +3395,10 @@ void MarlinSettings::reset() {
|
3386
|
3395
|
#if HAS_MOTOR_CURRENT_PWM
|
3387
|
3396
|
CONFIG_ECHO_HEADING("Stepper motor currents:");
|
3388
|
3397
|
CONFIG_ECHO_START();
|
3389
|
|
- SERIAL_ECHOLNPAIR(
|
3390
|
|
- " M907 X", stepper.motor_current_setting[0]
|
3391
|
|
- , " Z", stepper.motor_current_setting[1]
|
3392
|
|
- , " E", stepper.motor_current_setting[2]
|
|
3398
|
+ SERIAL_ECHOLNPAIR_P(
|
|
3399
|
+ PSTR(" M907 X"), stepper.motor_current_setting[0]
|
|
3400
|
+ , SP_Z_STR, stepper.motor_current_setting[1]
|
|
3401
|
+ , SP_E_STR, stepper.motor_current_setting[2]
|
3393
|
3402
|
);
|
3394
|
3403
|
#endif
|
3395
|
3404
|
|
|
@@ -3429,13 +3438,13 @@ void MarlinSettings::reset() {
|
3429
|
3438
|
#if ENABLED(BACKLASH_GCODE)
|
3430
|
3439
|
CONFIG_ECHO_HEADING("Backlash compensation:");
|
3431
|
3440
|
CONFIG_ECHO_START();
|
3432
|
|
- SERIAL_ECHOLNPAIR(
|
3433
|
|
- " M425 F", backlash.get_correction(),
|
3434
|
|
- " X", LINEAR_UNIT(backlash.distance_mm.x),
|
3435
|
|
- " Y", LINEAR_UNIT(backlash.distance_mm.y),
|
3436
|
|
- " Z", LINEAR_UNIT(backlash.distance_mm.z)
|
|
3441
|
+ SERIAL_ECHOLNPAIR_P(
|
|
3442
|
+ PSTR(" M425 F"), backlash.get_correction()
|
|
3443
|
+ , SP_X_STR, LINEAR_UNIT(backlash.distance_mm.x)
|
|
3444
|
+ , SP_Y_STR, LINEAR_UNIT(backlash.distance_mm.y)
|
|
3445
|
+ , SP_Z_STR, LINEAR_UNIT(backlash.distance_mm.z)
|
3437
|
3446
|
#ifdef BACKLASH_SMOOTHING_MM
|
3438
|
|
- , " S", LINEAR_UNIT(backlash.smoothing_mm)
|
|
3447
|
+ , PSTR(" S"), LINEAR_UNIT(backlash.smoothing_mm)
|
3439
|
3448
|
#endif
|
3440
|
3449
|
);
|
3441
|
3450
|
#endif
|