diff --git a/Marlin/src/lcd/dwin/proui/bedlevel_tools.cpp b/Marlin/src/lcd/dwin/proui/bedlevel_tools.cpp index 8564d882f6..78fa0bd833 100644 --- a/Marlin/src/lcd/dwin/proui/bedlevel_tools.cpp +++ b/Marlin/src/lcd/dwin/proui/bedlevel_tools.cpp @@ -184,7 +184,7 @@ float BedLevelTools::getMinValue() { // Return 'true' if mesh is good and within LCD limits bool BedLevelTools::meshValidate() { - if (TERN0(mesh_max.x <= mesh_min.x || mesh_max.y <= mesh_min.y)) + if (TERN0(PROUI_MESH_EDIT, mesh_max.x <= mesh_min.x || mesh_max.y <= mesh_min.y)) return false; GRID_LOOP(x, y) { const float z = bedlevel.z_values[x][y]; diff --git a/Marlin/src/lcd/dwin/proui/dwin.cpp b/Marlin/src/lcd/dwin/proui/dwin.cpp index 8ec3ed411c..b212ffea01 100644 --- a/Marlin/src/lcd/dwin/proui/dwin.cpp +++ b/Marlin/src/lcd/dwin/proui/dwin.cpp @@ -1903,8 +1903,8 @@ static_assert(ExtUI::eeprom_data_size >= EXTUI_EEPROM_DATA_SIZE, "Insufficient s void dwinSetDataDefaults() { dwinSetColorDefaults(); DWINUI::setColors(hmiData.colorText, hmiData.colorBackground, hmiData.colorStatusBg); - TERN_(PIDTEMP, hmiData.hotendPIDT = DEF_HOTENDPIDT); - TERN_(PIDTEMPBED, hmiData.bedPIDT = DEF_BEDPIDT); + TERN_(PIDTEMP, hmiData.hotendPIDT = PREHEAT_1_TEMP_HOTEND); + TERN_(PIDTEMPBED, hmiData.bedPIDT = PREHEAT_1_TEMP_BED); TERN_(HAS_PID_HEATING, hmiData.pidCycles = DEF_PIDCYCLES); #if ENABLED(PREVENT_COLD_EXTRUSION) hmiData.extMinT = EXTRUDE_MINTEMP; diff --git a/Marlin/src/lcd/dwin/proui/meshviewer.cpp b/Marlin/src/lcd/dwin/proui/meshviewer.cpp index 12997af776..cba98a31f1 100644 --- a/Marlin/src/lcd/dwin/proui/meshviewer.cpp +++ b/Marlin/src/lcd/dwin/proui/meshviewer.cpp @@ -69,7 +69,7 @@ void MeshViewer::drawMeshGrid(const uint8_t csizex, const uint8_t csizey) { for (uint8_t y = 1; y < sizey - 1; ++y) dwinDrawHLine(hmiData.colorSplitLine, px(0), py(y), width); } -void MeshViewer::drawMeshPoint(const xy_uint8_t xy, const float z) { +void MeshViewer::drawMeshPoint(const xy_int8_t xy, const float z) { const uint8_t fs = DWINUI::fontWidth(title.meshfont); const int16_t v = isnan(z) ? int16_t(0) : int16_t(LROUND(z * 100)); NOLESS(max, z); NOMORE(min, z); @@ -103,7 +103,7 @@ void MeshViewer::drawMesh(const bed_mesh_t zval, const uint8_t csizex, const uin drawMeshGrid(csizex, csizey); for (uint8_t y = 0; y < csizey; ++y) { hal.watchdog_refresh(); - for (uint8_t x = 0; x < csizex; ++x) drawMeshPoint(xy_uint8_t({x, y}), zval[x][y]); + for (uint8_t x = 0; x < csizex; ++x) drawMeshPoint(xy_int8_t({x, y}), zval[x][y]); } } diff --git a/Marlin/src/lcd/dwin/proui/meshviewer.h b/Marlin/src/lcd/dwin/proui/meshviewer.h index c7aec71485..63a2f08215 100644 --- a/Marlin/src/lcd/dwin/proui/meshviewer.h +++ b/Marlin/src/lcd/dwin/proui/meshviewer.h @@ -36,7 +36,7 @@ class MeshViewer { public: static float max, min; static void drawMeshGrid(const uint8_t csizex, const uint8_t csizey); - static void drawMeshPoint(const xy_uint8_t xy, const float z); + static void drawMeshPoint(const xy_int8_t xy, const float z); static void draw(const bool withsave=false, const bool redraw=true); static void drawMesh(const bed_mesh_t zval, const uint8_t csizex, const uint8_t csizey); }; diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index d2ecdcae40..190217fd68 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -88,8 +88,10 @@ bool relative_mode; // = false #if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) #if ENABLED(DWIN_LCD_PROUI) uint16_t z_probe_slow_mm_s = MMM_TO_MMS(Z_PROBE_FEEDRATE_SLOW); - xy_pos_t mesh_min{ MESH_MIN_X, MESH_MIN_Y }, - mesh_max{ MESH_MAX_X, MESH_MAX_Y }; + #if ENABLED(PROUI_MESH_EDIT) + xy_pos_t mesh_min{ MESH_MIN_X, MESH_MIN_Y }, + mesh_max{ MESH_MAX_X, MESH_MAX_Y }; + #endif #endif #endif diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index 51f9e56666..0197222084 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -30,7 +30,7 @@ #include "../inc/MarlinConfig.h" -#if ALL(DWIN_LCD_PROUI, INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING) +#if ALL(DWIN_LCD_PROUI, INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING) || (ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL) && ENABLED(DWIN_LCD_PROUI)) #include "../lcd/dwin/proui/dwin.h" // for Z_POST_CLEARANCE #endif