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

🐛 Fix PID edit menu for Bed, Chamber (#23987)

Browse source
This commit is contained in:
Giuliano Zaro 2022-04-03 01:27:05 +02:00 committed by Scott Lahteine
parent 74565890f3
commit bed8abe5b6
1 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Marlin/src/lcd/menu/menu_advanced.cpp
View file

@ -39,7 +39,7 @@
#include "../../module/probe.h" #include "../../module/probe.h"
#endif #endif
#if ENABLED(PIDTEMP) #if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
#include "../../module/temperature.h" #include "../../module/temperature.h"
#endif #endif
@ -190,7 +190,12 @@ void menu_backlash();
#if ENABLED(PIDTEMPCHAMBER) #if ENABLED(PIDTEMPCHAMBER)
case H_CHAMBER: tune_temp = autotune_temp_chamber; break; case H_CHAMBER: tune_temp = autotune_temp_chamber; break;
#endif #endif
default: tune_temp = autotune_temp[hid]; break; default:
#if ENABLED(PIDTEMP)
tune_temp = autotune_temp[hid]; break;
#else
return;
#endif
} }
sprintf_P(cmd, PSTR("M303 U1 E%i S%i"), hid, tune_temp); sprintf_P(cmd, PSTR("M303 U1 E%i S%i"), hid, tune_temp);
queue.inject(cmd); queue.inject(cmd);
@ -206,14 +211,36 @@ void menu_backlash();
// Helpers for editing PID Ki & Kd values // Helpers for editing PID Ki & Kd values
// grab the PID value out of the temp variable; scale it; then update the PID driver // grab the PID value out of the temp variable; scale it; then update the PID driver
void copy_and_scalePID_i(int16_t e) { void copy_and_scalePID_i(int16_t e) {
UNUSED(e); switch (e) {
#if ENABLED(PIDTEMPBED)
case H_BED: thermalManager.temp_bed.pid.Ki = scalePID_i(raw_Ki); break;
#endif
#if ENABLED(PIDTEMPCHAMBER)
case H_CHAMBER: thermalManager.temp_chamber.pid.Ki = scalePID_i(raw_Ki); break;
#endif
default:
#if ENABLED(PIDTEMP)
PID_PARAM(Ki, e) = scalePID_i(raw_Ki); PID_PARAM(Ki, e) = scalePID_i(raw_Ki);
thermalManager.updatePID(); thermalManager.updatePID();
#endif
break;
}
} }
void copy_and_scalePID_d(int16_t e) { void copy_and_scalePID_d(int16_t e) {
UNUSED(e); switch (e) {
#if ENABLED(PIDTEMPBED)
case H_BED: thermalManager.temp_bed.pid.Kd = scalePID_d(raw_Kd); break;
#endif
#if ENABLED(PIDTEMPCHAMBER)
case H_CHAMBER: thermalManager.temp_chamber.pid.Kd = scalePID_d(raw_Kd); break;
#endif
default:
#if ENABLED(PIDTEMP)
PID_PARAM(Kd, e) = scalePID_d(raw_Kd); PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
thermalManager.updatePID(); thermalManager.updatePID();
#endif
break;
}
} }
#define _DEFINE_PIDTEMP_BASE_FUNCS(N) \ #define _DEFINE_PIDTEMP_BASE_FUNCS(N) \