From 9697434981dd631fe5cc5e61deaa45d01779c17d Mon Sep 17 00:00:00 2001 From: Bob Anthony <42719046+bob-anthony@users.noreply.github.com> Date: Sat, 18 Feb 2023 03:45:50 -0600 Subject: [PATCH] Fix compiling errors for the dgus display Handler code section needed for any leveling not just probe. Fix for renamed variables upstream. Added default to switch statement to resolve compile warning. --- .../src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp | 2 +- Marlin/src/lcd/extui/dgus_creality_lcd.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp index e56e240f62..d19e7c0ea9 100644 --- a/Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp @@ -930,7 +930,7 @@ uint16_t CreateRgb(double h, double s, double v) { return (((static_cast(out.r * 255) & 0xf8)<<8) + ((static_cast(out.g * 255) & 0xfc)<<3) + (static_cast(out.b * 255)>>3)); } -#if HAS_BED_PROBE +#if HAS_LEVELING void DGUSScreenHandler::UpdateMeshValue(const int8_t x, const int8_t y, const float z) { //SERIAL_ECHOPGM("X", x); //SERIAL_ECHOPGM(" Y", y); diff --git a/Marlin/src/lcd/extui/dgus_creality_lcd.cpp b/Marlin/src/lcd/extui/dgus_creality_lcd.cpp index 328c5842ae..61c288f2f3 100644 --- a/Marlin/src/lcd/extui/dgus_creality_lcd.cpp +++ b/Marlin/src/lcd/extui/dgus_creality_lcd.cpp @@ -226,8 +226,8 @@ bool hasPrintTimer = false; void onPidTuning(const result_t rst) { // Called for temperature PID tuning result switch (rst) { - case PID_BAD_EXTRUDER_NUM: - PIDHandler::result_message = GET_TEXT(MSG_PID_BAD_EXTRUDER_NUM); + case PID_BAD_HEATER_ID: + PIDHandler::result_message = GET_TEXT(MSG_PID_BAD_HEATER_ID); ScreenHandler.setstatusmessagePGM(PIDHandler::result_message); break; case PID_TEMP_TOO_HIGH: @@ -237,11 +237,13 @@ bool hasPrintTimer = false; case PID_TUNING_TIMEOUT: PIDHandler::result_message = GET_TEXT(MSG_PID_TIMEOUT); ScreenHandler.setstatusmessagePGM(PIDHandler::result_message); - break; + break; case PID_DONE: PIDHandler::result_message = GET_TEXT(MSG_PID_AUTOTUNE_DONE); ScreenHandler.setstatusmessagePGM(PIDHandler::result_message); - break; + break; + default: + break; } } #endif