Skip to content

Commit 4b6109f

Browse files
🩹 Fix E3V2 types, other warnings (#27507)
1 parent 70c3060 commit 4b6109f

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Marlin/src/feature/powerloss.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ PrintJobRecovery recovery;
9999
/**
100100
* Clear the recovery info
101101
*/
102-
void PrintJobRecovery::init() { memset(&info, 0, sizeof(info)); }
102+
void PrintJobRecovery::init() { info = {}; }
103103

104104
/**
105105
* Enable or disable then call changed()

Marlin/src/lcd/e3v2/common/limits.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ constexpr xyze_float_t max_steps_edit_values =
115115

116116
constexpr xyz_uint_t min_homing_edit_values = NUM_AXIS_ARRAY_1(MIN_HOMING_EDIT_VALUE);
117117
#ifdef DEFAULT_MAX_MULTIPLIER
118-
constexpr xyz_uint_t default_homing = HOMING_FEEDRATE_MM_M;
118+
constexpr xyz_long_t default_homing = HOMING_FEEDRATE_MM_M;
119119
#endif
120-
constexpr xyz_uint_t max_homing_edit_values =
120+
constexpr xyz_long_t max_homing_edit_values =
121121
#ifdef DEFAULT_MAX_MULTIPLIER
122122
default_homing * DEFAULT_MAX_MULTIPLIER
123123
#else

Marlin/src/lcd/e3v2/proui/dwin.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -2672,7 +2672,7 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu
26722672
default: break;
26732673
}
26742674
}
2675-
void applyHomingFR() { updateHomingFR(HMI_value.axis, MenuData.Value); }
2675+
void applyHomingFR() { updateHomingFR(hmiValue.axis, menuData.value); }
26762676
#if HAS_X_AXIS
26772677
void setHomingX() { hmiValue.axis = X_AXIS; setIntOnClick(min_homing_edit_values.x, max_homing_edit_values.x, homing_feedrate_mm_m.x, applyHomingFR); }
26782678
#endif
@@ -3799,15 +3799,15 @@ void drawMaxAccelMenu() {
37993799
if (SET_MENU(homingFRMenu, MSG_HOMING_FEEDRATE, 4)) {
38003800
BACK_ITEM(drawMotionMenu);
38013801
#if HAS_X_AXIS
3802-
static uint16_t xhome = static_cast<uint16_t>(homing_feedrate_mm_m.x);
3802+
uint16_t xhome = static_cast<uint16_t>(homing_feedrate_mm_m.x);
38033803
EDIT_ITEM(ICON_MaxSpeedJerkX, MSG_HOMING_FEEDRATE_X, onDrawPIntMenu, setHomingX, &xhome);
38043804
#endif
38053805
#if HAS_Y_AXIS
3806-
static uint16_t yhome = static_cast<uint16_t>(homing_feedrate_mm_m.y);
3806+
uint16_t yhome = static_cast<uint16_t>(homing_feedrate_mm_m.y);
38073807
EDIT_ITEM(ICON_MaxSpeedJerkY, MSG_HOMING_FEEDRATE_Y, onDrawPIntMenu, setHomingY, &yhome);
38083808
#endif
38093809
#if HAS_Z_AXIS
3810-
static uint16_t zhome = static_cast<uint16_t>(homing_feedrate_mm_m.z);
3810+
uint16_t zhome = static_cast<uint16_t>(homing_feedrate_mm_m.z);
38113811
EDIT_ITEM(ICON_MaxSpeedJerkZ, MSG_HOMING_FEEDRATE_Z, onDrawPIntMenu, setHomingZ, &zhome);
38123812
#endif
38133813
}

0 commit comments

Comments
 (0)