sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✏️ MPCTEMP_START => MPC_STARTED (#27002)

Browse Source
This commit is contained in:
ellensp
2024-04-24 12:35:11 +12:00
committed by GitHub
parent 882421a03e
commit a1ecea60fd
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/lcd/e3v2/proui/dwin.cpp
View File

@@ -1312,7 +1312,7 @@ void eachMomentUpdate() {
TERN_(PIDTEMP, if (hmiValue.tempControl == PIDTEMP_START) { plot.update(thermalManager.wholeDegHotend(0)); }) TERN_(PIDTEMP, if (hmiValue.tempControl == PIDTEMP_START) { plot.update(thermalManager.wholeDegHotend(0)); })
TERN_(PIDTEMPBED, if (hmiValue.tempControl == PIDTEMPBED_START) { plot.update(thermalManager.wholeDegBed()); }) TERN_(PIDTEMPBED, if (hmiValue.tempControl == PIDTEMPBED_START) { plot.update(thermalManager.wholeDegBed()); })
TERN_(PIDTEMPCHAMBER, if (hmiValue.tempControl == PIDTEMPCHAMBER_START) { plot.update(thermalManager.wholeDegChamber()); }) TERN_(PIDTEMPCHAMBER, if (hmiValue.tempControl == PIDTEMPCHAMBER_START) { plot.update(thermalManager.wholeDegChamber()); })
TERN_(MPCTEMP, if (hmiValue.tempControl == MPCTEMP_START) { plot.update(thermalManager.wholeDegHotend(0)); }) TERN_(MPCTEMP, if (hmiValue.tempControl == MPC_STARTED) { plot.update(thermalManager.wholeDegHotend(0)); })
if (hmiFlag.abort_flag || hmiFlag.pause_flag || print_job_timer.isPaused()) { if (hmiFlag.abort_flag || hmiFlag.pause_flag || print_job_timer.isPaused()) {
hmiReturnScreen(); hmiReturnScreen();
} }
@@ -1567,7 +1567,7 @@ void dwinLevelingDone() {
switch (hmiValue.tempControl) { switch (hmiValue.tempControl) {
default: return; default: return;
#if ENABLED(MPC_AUTOTUNE) #if ENABLED(MPC_AUTOTUNE)
case MPCTEMP_START: case MPC_STARTED:
DWINUI::drawCenteredString(hmiData.colorPopupTxt, 70, GET_TEXT_F(MSG_MPC_AUTOTUNE)); DWINUI::drawCenteredString(hmiData.colorPopupTxt, 70, GET_TEXT_F(MSG_MPC_AUTOTUNE));
DWINUI::drawString(hmiData.colorPopupTxt, gfrm.x, gfrm.y - DWINUI::fontHeight() - 4, F("MPC target: Celsius")); DWINUI::drawString(hmiData.colorPopupTxt, gfrm.x, gfrm.y - DWINUI::fontHeight() - 4, F("MPC target: Celsius"));
DWINUI::drawCenteredString(hmiData.colorPopupTxt, 92, GET_TEXT_F(MSG_PID_FOR_NOZZLE)); DWINUI::drawCenteredString(hmiData.colorPopupTxt, 92, GET_TEXT_F(MSG_PID_FOR_NOZZLE));
@@ -1620,7 +1620,7 @@ void dwinLevelingDone() {
switch (result) { switch (result) {
#if ENABLED(MPCTEMP) #if ENABLED(MPCTEMP)
case MPCTEMP_START: case MPC_STARTED:
#elif ENABLED(PIDTEMP) #elif ENABLED(PIDTEMP)
case PIDTEMP_START: case PIDTEMP_START:
#endif #endif
@@ -1656,7 +1656,7 @@ void dwinLevelingDone() {
void drawHPlot() { void drawHPlot() {
TERN_(PIDTEMP, dwinDrawPlot(PIDTEMP_START)); TERN_(PIDTEMP, dwinDrawPlot(PIDTEMP_START));
TERN_(MPCTEMP, dwinDrawPlot(MPCTEMP_START)); TERN_(MPCTEMP, dwinDrawPlot(MPC_STARTED));
} }
void drawBPlot() { void drawBPlot() {
TERN_(PIDTEMPBED, dwinDrawPlot(PIDTEMPBED_START)); TERN_(PIDTEMPBED, dwinDrawPlot(PIDTEMPBED_START));
@@ -1742,7 +1742,7 @@ void dwinLevelingDone() {
void dwinMPCTuning(tempcontrol_t result) { void dwinMPCTuning(tempcontrol_t result) {
hmiValue.tempControl = result; hmiValue.tempControl = result;
switch (result) { switch (result) {
case MPCTEMP_START: case MPC_STARTED:
hmiSaveProcessID(ID_MPCProcess); hmiSaveProcessID(ID_MPCProcess);
#if PROUI_TUNING_GRAPH #if PROUI_TUNING_GRAPH
dwinDrawPIDMPCPopup(); dwinDrawPIDMPCPopup();

2
Marlin/src/lcd/e3v2/proui/dwin.h
View File

@@ -90,7 +90,7 @@ enum processID : uint8_t {
PID_TUNING_TIMEOUT, PID_TUNING_TIMEOUT,
#endif #endif
#if ENABLED(MPC_AUTOTUNE) #if ENABLED(MPC_AUTOTUNE)
MPCTEMP_START, MPC_STARTED,
MPC_TEMP_ERROR, MPC_TEMP_ERROR,
MPC_INTERRUPTED, MPC_INTERRUPTED,
#endif #endif

2
Marlin/src/lcd/e3v2/proui/proui_extui.cpp
View File

@@ -222,7 +222,7 @@ namespace ExtUI {
void onMPCTuning(const mpcresult_t rst) { void onMPCTuning(const mpcresult_t rst) {
// Called for temperature MPC tuning result // Called for temperature MPC tuning result
switch (rst) { switch (rst) {
case MPC_STARTED: dwinMPCTuning(MPCTEMP_START); break; case MPC_STARTED: dwinMPCTuning(MPC_STARTED); break;
case MPC_TEMP_ERROR: dwinMPCTuning(MPC_TEMP_ERROR); break; case MPC_TEMP_ERROR: dwinMPCTuning(MPC_TEMP_ERROR); break;
case MPC_INTERRUPTED: dwinMPCTuning(MPC_INTERRUPTED); break; case MPC_INTERRUPTED: dwinMPCTuning(MPC_INTERRUPTED); break;
case MPC_DONE: dwinMPCTuning(AUTOTUNE_DONE); break; case MPC_DONE: dwinMPCTuning(AUTOTUNE_DONE); break;

2
Marlin/src/module/temperature.cpp
View File

@@ -1195,7 +1195,7 @@ volatile bool Temperature::raw_temps_ready = false;
// Determine ambient temperature. // Determine ambient temperature.
SERIAL_ECHOLNPGM(STR_MPC_COOLING_TO_AMBIENT); SERIAL_ECHOLNPGM(STR_MPC_COOLING_TO_AMBIENT);
TERN_(EXTENSIBLE_UI, ExtUI::onMPCTuning(ExtUI::mpcresult_t::MPCTEMP_START)); TERN_(EXTENSIBLE_UI, ExtUI::onMPCTuning(ExtUI::mpcresult_t::MPC_STARTED));
TERN(DWIN_LCD_PROUI, LCD_ALERTMESSAGE(MSG_MPC_COOLING_TO_AMBIENT), LCD_MESSAGE(MSG_COOLING)); TERN(DWIN_LCD_PROUI, LCD_ALERTMESSAGE(MSG_MPC_COOLING_TO_AMBIENT), LCD_MESSAGE(MSG_COOLING));
if (tuner.measure_ambient_temp() != MPC_autotuner::MeasurementState::SUCCESS) return; if (tuner.measure_ambient_temp() != MPC_autotuner::MeasurementState::SUCCESS) return;