mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-11-29 23:07:42 +00:00
🩹 Fix E3V2 types, other warnings (#27507)
This commit is contained in:
parent
70c3060769
commit
4b6109f4e7
@ -99,7 +99,7 @@ PrintJobRecovery recovery;
|
|||||||
/**
|
/**
|
||||||
* Clear the recovery info
|
* Clear the recovery info
|
||||||
*/
|
*/
|
||||||
void PrintJobRecovery::init() { memset(&info, 0, sizeof(info)); }
|
void PrintJobRecovery::init() { info = {}; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enable or disable then call changed()
|
* Enable or disable then call changed()
|
||||||
|
@ -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);
|
constexpr xyz_uint_t min_homing_edit_values = NUM_AXIS_ARRAY_1(MIN_HOMING_EDIT_VALUE);
|
||||||
#ifdef DEFAULT_MAX_MULTIPLIER
|
#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
|
#endif
|
||||||
constexpr xyz_uint_t max_homing_edit_values =
|
constexpr xyz_long_t max_homing_edit_values =
|
||||||
#ifdef DEFAULT_MAX_MULTIPLIER
|
#ifdef DEFAULT_MAX_MULTIPLIER
|
||||||
default_homing * DEFAULT_MAX_MULTIPLIER
|
default_homing * DEFAULT_MAX_MULTIPLIER
|
||||||
#else
|
#else
|
||||||
|
@ -2672,7 +2672,7 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu
|
|||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void applyHomingFR() { updateHomingFR(HMI_value.axis, MenuData.Value); }
|
void applyHomingFR() { updateHomingFR(hmiValue.axis, menuData.value); }
|
||||||
#if HAS_X_AXIS
|
#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); }
|
void setHomingX() { hmiValue.axis = X_AXIS; setIntOnClick(min_homing_edit_values.x, max_homing_edit_values.x, homing_feedrate_mm_m.x, applyHomingFR); }
|
||||||
#endif
|
#endif
|
||||||
@ -3799,15 +3799,15 @@ void drawMaxAccelMenu() {
|
|||||||
if (SET_MENU(homingFRMenu, MSG_HOMING_FEEDRATE, 4)) {
|
if (SET_MENU(homingFRMenu, MSG_HOMING_FEEDRATE, 4)) {
|
||||||
BACK_ITEM(drawMotionMenu);
|
BACK_ITEM(drawMotionMenu);
|
||||||
#if HAS_X_AXIS
|
#if HAS_X_AXIS
|
||||||
static uint16_t xhome = static_cast<uint16_t>(homing_feedrate_mm_m.x);
|
uint16_t xhome = static_cast<uint16_t>(homing_feedrate_mm_m.x);
|
||||||
EDIT_ITEM(ICON_MaxSpeedJerkX, MSG_HOMING_FEEDRATE_X, onDrawPIntMenu, setHomingX, &xhome);
|
EDIT_ITEM(ICON_MaxSpeedJerkX, MSG_HOMING_FEEDRATE_X, onDrawPIntMenu, setHomingX, &xhome);
|
||||||
#endif
|
#endif
|
||||||
#if HAS_Y_AXIS
|
#if HAS_Y_AXIS
|
||||||
static uint16_t yhome = static_cast<uint16_t>(homing_feedrate_mm_m.y);
|
uint16_t yhome = static_cast<uint16_t>(homing_feedrate_mm_m.y);
|
||||||
EDIT_ITEM(ICON_MaxSpeedJerkY, MSG_HOMING_FEEDRATE_Y, onDrawPIntMenu, setHomingY, &yhome);
|
EDIT_ITEM(ICON_MaxSpeedJerkY, MSG_HOMING_FEEDRATE_Y, onDrawPIntMenu, setHomingY, &yhome);
|
||||||
#endif
|
#endif
|
||||||
#if HAS_Z_AXIS
|
#if HAS_Z_AXIS
|
||||||
static uint16_t zhome = static_cast<uint16_t>(homing_feedrate_mm_m.z);
|
uint16_t zhome = static_cast<uint16_t>(homing_feedrate_mm_m.z);
|
||||||
EDIT_ITEM(ICON_MaxSpeedJerkZ, MSG_HOMING_FEEDRATE_Z, onDrawPIntMenu, setHomingZ, &zhome);
|
EDIT_ITEM(ICON_MaxSpeedJerkZ, MSG_HOMING_FEEDRATE_Z, onDrawPIntMenu, setHomingZ, &zhome);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user