CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable hotend / bed PID separately in ExtUI (#16827)

Browse Source
This commit is contained in:
proferabg 2020-02-10 17:48:22 -05:00 committed by GitHub
parent fa4a6cdb5c
commit 3f87f912c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Marlin/src/lcd/extensible_ui/ui_api.cpp
View File

@ -894,25 +894,18 @@ namespace ExtUI {
float getFeedrate_percent() { return feedrate_percentage; } float getFeedrate_percent() { return feedrate_percentage; }
#if HAS_PID_HEATING #if ENABLED(PIDTEMP)
float getPIDValues_Kp(const extruder_t tool) { float getPIDValues_Kp(const extruder_t tool) {
return PID_PARAM(Kp, tool); return PID_PARAM(Kp, tool);
} }
float getPIDValues_Ki(const extruder_t tool) { float getPIDValues_Ki(const extruder_t tool) {
return unscalePID_i(PID_PARAM(Ki, tool)); return unscalePID_i(PID_PARAM(Ki, tool));
} }
float getPIDValues_Kd(const extruder_t tool) { float getPIDValues_Kd(const extruder_t tool) {
return unscalePID_d(PID_PARAM(Kd, tool)); return unscalePID_d(PID_PARAM(Kd, tool));
} }
float getBedPIDValues_Kp() {
return thermalManager.temp_bed.pid.Kp;
}
float getBedPIDValues_Ki() {
return unscalePID_i(thermalManager.temp_bed.pid.Ki);
}
float getBedPIDValues_Kd() {
return unscalePID_d(thermalManager.temp_bed.pid.Kd);
}
void setPIDValues(const float p, const float i, const float d, extruder_t tool) { void setPIDValues(const float p, const float i, const float d, extruder_t tool) {
thermalManager.temp_hotend[tool].pid.Kp = p; thermalManager.temp_hotend[tool].pid.Kp = p;
@ -920,16 +913,32 @@ namespace ExtUI {
thermalManager.temp_hotend[tool].pid.Kd = scalePID_d(d); thermalManager.temp_hotend[tool].pid.Kd = scalePID_d(d);
thermalManager.updatePID(); thermalManager.updatePID();
} }
void startPIDTune(const float temp, extruder_t tool){
thermalManager.PID_autotune(temp, (heater_ind_t)tool, 8, true);
}
#endif
#if ENABLED(PIDTEMPBED)
float getBedPIDValues_Kp() {
return thermalManager.temp_bed.pid.Kp;
}
float getBedPIDValues_Ki() {
return unscalePID_i(thermalManager.temp_bed.pid.Ki);
}
float getBedPIDValues_Kd() {
return unscalePID_d(thermalManager.temp_bed.pid.Kd);
}
void setBedPIDValues(const float p, const float i, const float d) { void setBedPIDValues(const float p, const float i, const float d) {
thermalManager.temp_bed.pid.Kp = p; thermalManager.temp_bed.pid.Kp = p;
thermalManager.temp_bed.pid.Ki = scalePID_i(i); thermalManager.temp_bed.pid.Ki = scalePID_i(i);
thermalManager.temp_bed.pid.Kd = scalePID_d(d); thermalManager.temp_bed.pid.Kd = scalePID_d(d);
thermalManager.updatePID(); thermalManager.updatePID();
} }
void startPIDTune(const float temp, extruder_t tool){
thermalManager.PID_autotune(temp, (heater_ind_t)tool, 8, true);
}
void startBedPIDTune(const float temp) { void startBedPIDTune(const float temp) {
thermalManager.PID_autotune(temp, H_BED, 4, true); thermalManager.PID_autotune(temp, H_BED, 4, true);
} }

9
Marlin/src/lcd/extensible_ui/ui_api.h
View File

@ -249,16 +249,19 @@ namespace ExtUI {
#endif #endif
#endif #endif
#if HAS_PID_HEATING #if ENABLED(PIDTEMP)
float getPIDValues_Kp(const extruder_t); float getPIDValues_Kp(const extruder_t);
float getPIDValues_Ki(const extruder_t); float getPIDValues_Ki(const extruder_t);
float getPIDValues_Kd(const extruder_t); float getPIDValues_Kd(const extruder_t);
void setPIDValues(const float, const float, const float, extruder_t);
void startPIDTune(const float, extruder_t);
#endif
#if ENABLED(PIDTEMPBED)
float getBedPIDValues_Kp(); float getBedPIDValues_Kp();
float getBedPIDValues_Ki(); float getBedPIDValues_Ki();
float getBedPIDValues_Kd(); float getBedPIDValues_Kd();
void setPIDValues(const float, const float, const float, extruder_t);
void setBedPIDValues(const float, const float, const float); void setBedPIDValues(const float, const float, const float);
void startPIDTune(const float, extruder_t);
void startBedPIDTune(const float); void startBedPIDTune(const float);
#endif #endif