|
|
|
@ -2946,7 +2946,7 @@ void MarlinSettings::reset() { |
|
|
|
} |
|
|
|
|
|
|
|
#define CONFIG_ECHO_START() do{ if (!forReplay) SERIAL_ECHO_START(); }while(0) |
|
|
|
#define CONFIG_ECHO_MSG(STR) do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPGM(STR); }while(0) |
|
|
|
#define CONFIG_ECHO_MSG(V...) do{ CONFIG_ECHO_START(); SERIAL_ECHOLNPAIR(V); }while(0) |
|
|
|
#define CONFIG_ECHO_HEADING(STR) config_heading(forReplay, PSTR(STR)) |
|
|
|
|
|
|
|
#if HAS_TRINAMIC_CONFIG |
|
|
|
@ -3039,26 +3039,24 @@ void MarlinSettings::reset() { |
|
|
|
} |
|
|
|
|
|
|
|
#if EXTRUDERS == 1 |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M200 S", int(parser.volumetric_enabled) |
|
|
|
, " D", LINEAR_UNIT(planner.filament_size[0]) |
|
|
|
CONFIG_ECHO_MSG(" M200 S", int(parser.volumetric_enabled) |
|
|
|
, " D", LINEAR_UNIT(planner.filament_size[0]) |
|
|
|
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) |
|
|
|
, " L", LINEAR_UNIT(planner.volumetric_extruder_limit[0]) |
|
|
|
#endif |
|
|
|
); |
|
|
|
#else |
|
|
|
LOOP_L_N(i, EXTRUDERS) { |
|
|
|
CONFIG_ECHO_MSG(" M200 T", int(i) |
|
|
|
, " D", LINEAR_UNIT(planner.filament_size[i]) |
|
|
|
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) |
|
|
|
, " L", LINEAR_UNIT(planner.volumetric_extruder_limit[0]) |
|
|
|
, " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i]) |
|
|
|
#endif |
|
|
|
); |
|
|
|
#else |
|
|
|
LOOP_L_N(i, EXTRUDERS) { |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M200 T", int(i) |
|
|
|
, " D", LINEAR_UNIT(planner.filament_size[i]) |
|
|
|
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT) |
|
|
|
, " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i]) |
|
|
|
#endif |
|
|
|
); |
|
|
|
} |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M200 S", int(parser.volumetric_enabled)); |
|
|
|
CONFIG_ECHO_MSG(" M200 S", int(parser.volumetric_enabled)); |
|
|
|
#endif |
|
|
|
|
|
|
|
#endif // EXTRUDERS && !NO_VOLUMETRICS
|
|
|
|
|
|
|
|
CONFIG_ECHO_HEADING("Steps per unit:"); |
|
|
|
@ -3194,7 +3192,7 @@ void MarlinSettings::reset() { |
|
|
|
|
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR_P( |
|
|
|
PSTR(" M420 S"), planner.leveling_active ? 1 : 0 |
|
|
|
PSTR(" M420 S"), int(planner.leveling_active) |
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) |
|
|
|
, SP_Z_STR, LINEAR_UNIT(planner.z_fade_height) |
|
|
|
#endif |
|
|
|
@ -3260,8 +3258,7 @@ void MarlinSettings::reset() { |
|
|
|
#elif ENABLED(BLTOUCH) || (HAS_Z_SERVO_PROBE && defined(Z_SERVO_ANGLES)) |
|
|
|
case Z_PROBE_SERVO_NR: |
|
|
|
#endif |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M281 P", int(i), " L", servo_angles[i][0], " U", servo_angles[i][1]); |
|
|
|
CONFIG_ECHO_MSG(" M281 P", int(i), " L", servo_angles[i][0], " U", servo_angles[i][1]); |
|
|
|
default: break; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -3382,8 +3379,7 @@ void MarlinSettings::reset() { |
|
|
|
#endif // PIDTEMP
|
|
|
|
|
|
|
|
#if ENABLED(PIDTEMPBED) |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR( |
|
|
|
CONFIG_ECHO_MSG( |
|
|
|
" M304 P", thermalManager.temp_bed.pid.Kp |
|
|
|
, " I", unscalePID_i(thermalManager.temp_bed.pid.Ki) |
|
|
|
, " D", unscalePID_d(thermalManager.temp_bed.pid.Kd) |
|
|
|
@ -3400,16 +3396,14 @@ void MarlinSettings::reset() { |
|
|
|
|
|
|
|
#if HAS_LCD_CONTRAST |
|
|
|
CONFIG_ECHO_HEADING("LCD Contrast:"); |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M250 C", ui.contrast); |
|
|
|
CONFIG_ECHO_MSG(" M250 C", ui.contrast); |
|
|
|
#endif |
|
|
|
|
|
|
|
TERN_(CONTROLLER_FAN_EDITABLE, M710_report(forReplay)); |
|
|
|
|
|
|
|
#if ENABLED(POWER_LOSS_RECOVERY) |
|
|
|
CONFIG_ECHO_HEADING("Power-Loss Recovery:"); |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M413 S", int(recovery.enabled)); |
|
|
|
CONFIG_ECHO_MSG(" M413 S", int(recovery.enabled)); |
|
|
|
#endif |
|
|
|
|
|
|
|
#if ENABLED(FWRETRACT) |
|
|
|
@ -3424,8 +3418,7 @@ void MarlinSettings::reset() { |
|
|
|
); |
|
|
|
|
|
|
|
CONFIG_ECHO_HEADING("Recover: S<length> F<units/m>"); |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR( |
|
|
|
CONFIG_ECHO_MSG( |
|
|
|
" M208 S", LINEAR_UNIT(fwretract.settings.retract_recover_extra) |
|
|
|
, " W", LINEAR_UNIT(fwretract.settings.swap_retract_recover_extra) |
|
|
|
, " F", LINEAR_UNIT(MMS_TO_MMM(fwretract.settings.retract_recover_feedrate_mm_s)) |
|
|
|
@ -3434,8 +3427,7 @@ void MarlinSettings::reset() { |
|
|
|
#if ENABLED(FWRETRACT_AUTORETRACT) |
|
|
|
|
|
|
|
CONFIG_ECHO_HEADING("Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover"); |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M209 S", fwretract.autoretract_enabled ? 1 : 0); |
|
|
|
CONFIG_ECHO_MSG(" M209 S", int(fwretract.autoretract_enabled)); |
|
|
|
|
|
|
|
#endif // FWRETRACT_AUTORETRACT
|
|
|
|
|
|
|
|
@ -3780,13 +3772,10 @@ void MarlinSettings::reset() { |
|
|
|
#if ENABLED(LIN_ADVANCE) |
|
|
|
CONFIG_ECHO_HEADING("Linear Advance:"); |
|
|
|
#if EXTRUDERS < 2 |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M900 K", planner.extruder_advance_K[0]); |
|
|
|
CONFIG_ECHO_MSG(" M900 K", planner.extruder_advance_K[0]); |
|
|
|
#else |
|
|
|
LOOP_L_N(i, EXTRUDERS) { |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR(" M900 T", int(i), " K", planner.extruder_advance_K[i]); |
|
|
|
} |
|
|
|
LOOP_L_N(i, EXTRUDERS) |
|
|
|
CONFIG_ECHO_MSG(" M900 T", int(i), " K", planner.extruder_advance_K[i]); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
@ -3851,8 +3840,7 @@ void MarlinSettings::reset() { |
|
|
|
|
|
|
|
#if HAS_FILAMENT_SENSOR |
|
|
|
CONFIG_ECHO_HEADING("Filament runout sensor:"); |
|
|
|
CONFIG_ECHO_START(); |
|
|
|
SERIAL_ECHOLNPAIR( |
|
|
|
CONFIG_ECHO_MSG( |
|
|
|
" M412 S", int(runout.enabled) |
|
|
|
#if HAS_FILAMENT_RUNOUT_DISTANCE |
|
|
|
, " D", LINEAR_UNIT(runout.runout_distance()) |
|
|
|
|
Scott Lahteine
3 years ago
Scott Lahteine