From 4b6109f4e79504d3a562136644c53a9c3fe93d9d Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:54:06 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20E3V2=20types,=20other=20wa?= =?UTF-8?q?rnings=20(#27507)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/feature/powerloss.cpp | 2 +- Marlin/src/lcd/e3v2/common/limits.h | 4 ++-- Marlin/src/lcd/e3v2/proui/dwin.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp index 745260e3f5f..a97887773c5 100644 --- a/Marlin/src/feature/powerloss.cpp +++ b/Marlin/src/feature/powerloss.cpp @@ -99,7 +99,7 @@ PrintJobRecovery recovery; /** * Clear the recovery info */ -void PrintJobRecovery::init() { memset(&info, 0, sizeof(info)); } +void PrintJobRecovery::init() { info = {}; } /** * Enable or disable then call changed() diff --git a/Marlin/src/lcd/e3v2/common/limits.h b/Marlin/src/lcd/e3v2/common/limits.h index 409b735dc89..560c8735a7c 100644 --- a/Marlin/src/lcd/e3v2/common/limits.h +++ b/Marlin/src/lcd/e3v2/common/limits.h @@ -115,9 +115,9 @@ constexpr xyze_float_t max_steps_edit_values = constexpr xyz_uint_t min_homing_edit_values = NUM_AXIS_ARRAY_1(MIN_HOMING_EDIT_VALUE); #ifdef DEFAULT_MAX_MULTIPLIER - constexpr xyz_uint_t default_homing = HOMING_FEEDRATE_MM_M; + constexpr xyz_long_t default_homing = HOMING_FEEDRATE_MM_M; #endif - constexpr xyz_uint_t max_homing_edit_values = + constexpr xyz_long_t max_homing_edit_values = #ifdef DEFAULT_MAX_MULTIPLIER default_homing * DEFAULT_MAX_MULTIPLIER #else diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index e483d4a5ce4..f4b5ba5339a 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -2672,7 +2672,7 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu default: break; } } - void applyHomingFR() { updateHomingFR(HMI_value.axis, MenuData.Value); } + void applyHomingFR() { updateHomingFR(hmiValue.axis, menuData.value); } #if HAS_X_AXIS void setHomingX() { hmiValue.axis = X_AXIS; setIntOnClick(min_homing_edit_values.x, max_homing_edit_values.x, homing_feedrate_mm_m.x, applyHomingFR); } #endif @@ -3799,15 +3799,15 @@ void drawMaxAccelMenu() { if (SET_MENU(homingFRMenu, MSG_HOMING_FEEDRATE, 4)) { BACK_ITEM(drawMotionMenu); #if HAS_X_AXIS - static uint16_t xhome = static_cast(homing_feedrate_mm_m.x); + uint16_t xhome = static_cast(homing_feedrate_mm_m.x); EDIT_ITEM(ICON_MaxSpeedJerkX, MSG_HOMING_FEEDRATE_X, onDrawPIntMenu, setHomingX, &xhome); #endif #if HAS_Y_AXIS - static uint16_t yhome = static_cast(homing_feedrate_mm_m.y); + uint16_t yhome = static_cast(homing_feedrate_mm_m.y); EDIT_ITEM(ICON_MaxSpeedJerkY, MSG_HOMING_FEEDRATE_Y, onDrawPIntMenu, setHomingY, &yhome); #endif #if HAS_Z_AXIS - static uint16_t zhome = static_cast(homing_feedrate_mm_m.z); + uint16_t zhome = static_cast(homing_feedrate_mm_m.z); EDIT_ITEM(ICON_MaxSpeedJerkZ, MSG_HOMING_FEEDRATE_Z, onDrawPIntMenu, setHomingZ, &zhome); #endif }