zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Always report all PIDs in M503

Browse source 
Fix #14474
This commit is contained in:
Scott Lahteine 2019-10-07 21:13:15 -05:00
parent a525cc06c1
commit af80653f3f
1 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Marlin/src/module/configuration_store.cpp
View file

@ -2964,38 +2964,23 @@ void MarlinSettings::reset() {
#if HAS_PID_HEATING #if HAS_PID_HEATING
CONFIG_ECHO_HEADING("PID settings:"); CONFIG_ECHO_HEADING("PID settings:");
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
#if HOTENDS > 1 HOTEND_LOOP() {
if (forReplay) {
HOTEND_LOOP() {
CONFIG_ECHO_START();
SERIAL_ECHOPAIR(
" M301 E", e
, " P", PID_PARAM(Kp, e)
, " I", unscalePID_i(PID_PARAM(Ki, e))
, " D", unscalePID_d(PID_PARAM(Kd, e))
);
#if ENABLED(PID_EXTRUSION_SCALING)
SERIAL_ECHOPAIR(" C", PID_PARAM(Kc, e));
if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
#endif
SERIAL_EOL();
}
}
else
#endif // HOTENDS > 1
// !forReplay || HOTENDS == 1
{
CONFIG_ECHO_START(); CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR( SERIAL_ECHOPAIR(" M301"
" M301 P", PID_PARAM(Kp, 0) // for compatibility with hosts, only echo values for E0 #if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
, " I", unscalePID_i(PID_PARAM(Ki, 0)) " E", e,
, " D", unscalePID_d(PID_PARAM(Kd, 0))
#if ENABLED(PID_EXTRUSION_SCALING)
, " C", PID_PARAM(Kc, 0)
, " L", thermalManager.lpq_len
#endif #endif
" P", PID_PARAM(Kp, e)
, " I", unscalePID_i(PID_PARAM(Ki, e))
, " D", unscalePID_d(PID_PARAM(Kd, e))
); );
#if ENABLED(PID_EXTRUSION_SCALING)
SERIAL_ECHOPAIR(" C", PID_PARAM(Kc, e));
if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
#endif
SERIAL_EOL();
} }
#endif // PIDTEMP #endif // PIDTEMP