Skip to content

Commit

Permalink
✨ JyersUI TMC Settings (MarlinFirmware#25048)
Browse files Browse the repository at this point in the history
  • Loading branch information
@blazewicz @thinkyhead
blazewicz authored and thinkyhead committed Dec 16, 2022
1 parent 7265559 commit 313716e
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 7 deletions.
121 changes: 114 additions & 7 deletions Marlin/src/lcd/e3v2/jyersui/dwin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@
#include "../../../feature/powerloss.h"
#endif

#if HAS_TRINAMIC_CONFIG
#include "../../../module/stepper/trinamic.h"

#define TMC_MIN_CURRENT 400
#define TMC_MAX_CURRENT 1500
#endif

#define MACHINE_SIZE STRINGIFY(X_BED_SIZE) "x" STRINGIFY(Y_BED_SIZE) "x" STRINGIFY(Z_MAX_POS)

#define DWIN_FONT_MENU font8x16
Expand Down Expand Up @@ -2295,7 +2302,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Float(planner.flow_percentage[0], row, false, 1);
}
else
Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1, []{ planner.refresh_e_factor(0); });
break;
#endif
}
Expand Down Expand Up @@ -2720,7 +2727,8 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
#define ADVANCED_BACK 0
#define ADVANCED_BEEPER (ADVANCED_BACK + ENABLED(SOUND_MENU_ITEM))
#define ADVANCED_PROBE (ADVANCED_BEEPER + ENABLED(HAS_BED_PROBE))
#define ADVANCED_CORNER (ADVANCED_PROBE + 1)
#define ADVANCED_TMC (ADVANCED_PROBE + ENABLED(HAS_TRINAMIC_CONFIG))
#define ADVANCED_CORNER (ADVANCED_TMC + 1)
#define ADVANCED_LA (ADVANCED_CORNER + ENABLED(LIN_ADVANCE))
#define ADVANCED_LOAD (ADVANCED_LA + ENABLED(ADVANCED_PAUSE_FEATURE))
#define ADVANCED_UNLOAD (ADVANCED_LOAD + ENABLED(ADVANCED_PAUSE_FEATURE))
Expand Down Expand Up @@ -2760,6 +2768,15 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
break;
#endif

#if HAS_TRINAMIC_CONFIG
case ADVANCED_TMC:
if (draw)
Draw_Menu_Item(row, ICON_Motion, F("TMC Drivers"), nullptr, true);
else
Draw_Menu(TMCMenu);
break;
#endif

case ADVANCED_CORNER:
if (draw) {
Draw_Menu_Item(row, ICON_MaxAccelerated, F("Bed Screw Inset"));
Expand Down Expand Up @@ -2905,7 +2922,93 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
break;
}
break;
#endif
#endif // HAS_PROBE_MENU

#if HAS_TRINAMIC_CONFIG
case TMCMenu:

#define TMC_BACK 0
#define TMC_STEPPER_CURRENT_X (TMC_BACK + AXIS_IS_TMC(X))
#define TMC_STEPPER_CURRENT_Y (TMC_STEPPER_CURRENT_X + AXIS_IS_TMC(Y))
#define TMC_STEPPER_CURRENT_Z (TMC_STEPPER_CURRENT_Y + AXIS_IS_TMC(Z))
#define TMC_STEPPER_CURRENT_E (TMC_STEPPER_CURRENT_Z + AXIS_IS_TMC(E0))
#define TMC_TOTAL TMC_STEPPER_CURRENT_E

switch (item) {

case TMC_BACK:
if (draw)
Draw_Menu_Item(row, ICON_Back, F("Back"));
else
Draw_Menu(Advanced, ADVANCED_TMC);
break;

#if AXIS_IS_TMC(X)
case TMC_STEPPER_CURRENT_X:

static float stepper_current_x;

if (draw) {
Draw_Menu_Item(row, ICON_StepX, F("Stepper X current"));
stepper_current_x = stepperX.getMilliamps();
Draw_Float(stepper_current_x, row, false, 1);
}
else {
Modify_Value(stepper_current_x, TMC_MIN_CURRENT, TMC_MAX_CURRENT, 1, []{ stepperX.rms_current(stepper_current_x); });
}
break;
#endif

#if AXIS_IS_TMC(Y)
case TMC_STEPPER_CURRENT_Y:

static float stepper_current_y;

if (draw) {
Draw_Menu_Item(row, ICON_StepY, F("Stepper Y current"));
stepper_current_y = stepperY.getMilliamps();
Draw_Float(stepper_current_y, row, false, 1);
}
else {
Modify_Value(stepper_current_y, TMC_MIN_CURRENT, TMC_MAX_CURRENT, 1, []{ stepperY.rms_current(stepper_current_y); });
}
break;
#endif

#if AXIS_IS_TMC(Z)
case TMC_STEPPER_CURRENT_Z:

static float stepper_current_z;

if (draw) {
Draw_Menu_Item(row, ICON_StepZ, F("Stepper Z current"));
stepper_current_z = stepperZ.getMilliamps();
Draw_Float(stepper_current_z, row, false, 1);
}
else {
Modify_Value(stepper_current_z, TMC_MIN_CURRENT, TMC_MAX_CURRENT, 1, []{ stepperZ.rms_current(stepper_current_z); });
}
break;
#endif

#if AXIS_IS_TMC(E0)
case TMC_STEPPER_CURRENT_E:

static float stepper_current_e;

if (draw) {
Draw_Menu_Item(row, ICON_StepE, F("Stepper E current"));
stepper_current_e = stepperE0.getMilliamps();
Draw_Float(stepper_current_e, row, false, 1);
}
else {
Modify_Value(stepper_current_e, TMC_MIN_CURRENT, TMC_MAX_CURRENT, 1, []{ stepperE0.rms_current(stepper_current_e); });
}
break;
#endif
};
break;
#endif // HAS_TRINAMIC_CONFIG

case InfoMain:
case Info:
Expand Down Expand Up @@ -3637,7 +3740,7 @@ void CrealityDWINClass::Menu_Item_Handler(uint8_t menu, uint8_t item, bool draw/
Draw_Float(planner.flow_percentage[0], row, false, 1);
}
else
Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1);
Modify_Value(planner.flow_percentage[0], MIN_FLOW_RATE, MAX_FLOW_RATE, 1, []{ planner.refresh_e_factor(0); });
break;
case TUNE_HOTEND:
if (draw) {
Expand Down Expand Up @@ -3879,7 +3982,10 @@ FSTR_P CrealityDWINClass::Get_Menu_Title(uint8_t menu) {
case Visual: return F("Visual Settings");
case Advanced: return F("Advanced Settings");
#if HAS_BED_PROBE
case ProbeMenu: return F("Probe Menu");
case ProbeMenu: return F("Bed Probe");
#endif
#if HAS_TRINAMIC_CONFIG
case TMCMenu: return F("TMC Drivers");
#endif
case ColorSettings: return F("UI Color Settings");
case Info: return F("Info");
Expand Down Expand Up @@ -3949,6 +4055,9 @@ uint8_t CrealityDWINClass::Get_Menu_Size(uint8_t menu) {
#if HAS_BED_PROBE
case ProbeMenu: return PROBE_TOTAL;
#endif
#if HAS_TRINAMIC_CONFIG
case TMCMenu: return TMC_TOTAL;
#endif
case Info: return INFO_TOTAL;
case InfoMain: return INFO_TOTAL;
#if ENABLED(AUTO_BED_LEVELING_UBL) && !HAS_BED_PROBE
Expand Down Expand Up @@ -4117,8 +4226,6 @@ void CrealityDWINClass::Value_Control() {
case LevelManual: mesh_conf.manual_mesh_move(selection == LEVELING_M_OFFSET); break;
#endif
}
if (valuepointer == &planner.flow_percentage[0])
planner.refresh_e_factor(0);
if (funcpointer) funcpointer();
return;
}
Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/lcd/e3v2/jyersui/dwin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ enum menuID : uint8_t {
ColorSettings,
Advanced,
ProbeMenu,
#if HAS_TRINAMIC_CONFIG
TMCMenu,
#endif
Info,
Leveling,
LevelManual,
Expand Down

0 comments on commit 313716e

Please sign in to comment.