jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #295 from bob-anthony/DGUS_DISPLAY_FIXES

Browse Source 
Fix compiling errors for DGUS displays
This commit is contained in:
InsanityAutomation
2023-02-19 18:30:31 -05:00
committed by InsanityAutomation
parent 313014515c
commit 1d9cf20d4b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.cpp
+1 -1
View File
@@ -930,7 +930,7 @@ uint16_t CreateRgb(double h, double s, double v) {
return (((static_cast<uint8_t>(out.r * 255) & 0xf8)<<8) + ((static_cast<uint8_t>(out.g * 255) & 0xfc)<<3) + (static_cast<uint8_t>(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);
Marlin/src/lcd/extui/dgus_creality_lcd.cpp
+6 -4
View File
@@ -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