3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-12-28 18:30:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🩹 ProUI: Edit K for active E

Browse source
This commit is contained in:
Scott Lahteine 2025-11-01 16:22:35 -05:00
parent 8bf127afe6
commit bdfb0cc63f
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Marlin/src/lcd/e3v2/proui/dwin.cpp
View file

@ -2689,10 +2689,10 @@ void applyMaxAccel() { planner.set_max_acceleration(hmiValue.axis, menuData.valu
#if ENABLED(LIN_ADVANCE)
#define LA_FDIGITS 3
void applyLA_K() { planner.set_advance_k(menuData.value / POW(10, LA_FDIGITS)); }
void setLA_K() { setFloatOnClick(0, 10, LA_FDIGITS, planner.extruder_advance_K[0], applyLA_K); }
void setLA_K() { setFloatOnClick(0, 10, LA_FDIGITS, planner.get_advance_K(), applyLA_K); }
void onDrawLA_K(MenuItem* menuitem, int8_t line) { onDrawFloatMenu(menuitem, line, LA_FDIGITS, planner.get_advance_k()); }
#if ENABLED(SMOOTH_LIN_ADVANCE)
void applySmoothLA() { Stepper::set_advance_tau(menuData.value / POW(10, 2)); }
void applySmoothLA() { stepper.set_advance_tau(menuData.value / POW(10, 2)); }
void setSmoothLA() { setPFloatOnClick(0, 0.5, 2, applySmoothLA); }
#endif
#endif
@ -3551,11 +3551,13 @@ void drawTuneMenu() {
#if ENABLED(PROUI_ITEM_JD)
EDIT_ITEM(ICON_JDmm, MSG_JUNCTION_DEVIATION, onDrawPFloat3Menu, setJDmm, &planner.junction_deviation_mm);
#endif
#if ALL(PROUI_ITEM_ADVK, LIN_ADVANCE)
static float editable_k = planner.get_advance_k();
#if PROUI_ITEM_ADVK
static float editable_k;
editable_k = planner.get_advance_k();
EDIT_ITEM(ICON_MaxAccelerated, MSG_ADVANCE_K, onDrawLA_K, setLA_K, &editable_k);
#if ENABLED(SMOOTH_LIN_ADVANCE)
static float editable_u = Stepper::get_advance_tau();
static float editable_u;
editable_u = stepper.get_advance_tau();
EDIT_ITEM(ICON_MaxSpeed, MSG_ADVANCE_TAU, onDrawPFloat2Menu, setSmoothLA, &editable_u);
#endif
#endif
@ -3695,10 +3697,12 @@ void drawMotionMenu() {
MENU_ITEM(ICON_Homing, MSG_HOMING_FEEDRATE, onDrawSubMenu, drawHomingFRMenu);
#endif
#if ENABLED(LIN_ADVANCE)
static float editable_k = planner.get_advance_k();
static float editable_k;
editable_k = planner.get_advance_k();
EDIT_ITEM(ICON_MaxAccelerated, MSG_ADVANCE_K, onDrawLA_K, setLA_K, &editable_k);
#if ENABLED(SMOOTH_LIN_ADVANCE)
static float editable_u = Stepper::get_advance_tau();
static float editable_u;
editable_u = stepper.get_advance_tau();
EDIT_ITEM(ICON_MaxSpeed, MSG_ADVANCE_TAU, onDrawPFloat2Menu, setSmoothLA, &editable_u);
#endif
#endif

2
Marlin/src/lcd/e3v2/proui/dwin_defines.h
View file

@ -125,7 +125,7 @@
#define PROUI_ITEM_JD // Tune > Junction Deviation
#endif
#if ENABLED(LIN_ADVANCE)
#define PROUI_ITEM_ADVK // Tune > Linear Advance
#define PROUI_ITEM_ADVK 1 // Tune > Linear Advance
#endif
#if ANY(HAS_PID_HEATING, MPC_AUTOTUNE) && DISABLED(DISABLE_TUNING_GRAPH)
#define PROUI_TUNING_GRAPH 1