Skip to content

Commit 12e41b5

Browse files
committed
Add jerk setting #189
1 parent b205036 commit 12e41b5

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/AxisSettingsHandler.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ uint16_t AxisSettingsHandler::axis_settings_title_icon = ICON_AXIS_SETTINGS_TITL
2222

2323
float AxisSettingsHandler::axis_steps_mm;
2424
uint32_t AxisSettingsHandler::max_acceleration_mm_per_s2;
25+
float AxisSettingsHandler::jerk;
2526

2627
void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr) {
2728
switch (uInt16Value(val_ptr)) {
@@ -51,12 +52,14 @@ void AxisSettingsHandler::HandleNavigation(DGUS_VP_Variable &var, void *val_ptr)
5152
// Load settings for axis
5253
axis_steps_mm = planner.settings.axis_steps_per_mm[current_axis];
5354
max_acceleration_mm_per_s2 = planner.settings.max_acceleration_mm_per_s2[current_axis];
55+
IF_ENABLED(CLASSIC_JERK, jerk = planner.max_jerk[current_axis]);
5456
}
5557

5658
void AxisSettingsHandler::HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr) {
5759
// Save settings for axis
5860
planner.settings.axis_steps_per_mm[current_axis] = axis_steps_mm;
5961
planner.settings.max_acceleration_mm_per_s2[current_axis] = max_acceleration_mm_per_s2;
62+
IF_ENABLED(CLASSIC_JERK, planner.max_jerk[current_axis] = jerk);
6063

6164
// Save and pop
6265
ScreenHandler.PopToOldScreen();

Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/AxisSettingsHandler.h

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ class AxisSettingsHandler {
1010
static float axis_steps_mm;
1111
static uint32_t max_acceleration_mm_per_s2;
1212

13+
static float jerk;
14+
1315
public:
1416
static void HandleNavigation(DGUS_VP_Variable &var, void *val_ptr);
1517
static void HandleBackNavigation(DGUS_VP_Variable &var, void *val_ptr);

Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ const uint16_t VPList_AxisSettingsAxis[] PROGMEM = {
297297

298298
VP_AXIS_SETTINGS_AXIS_STEPSMM,
299299
VP_AXIS_SETTINGS_AXIS_MAX_ACCEL,
300+
VP_AXIS_SETTINGS_AXIS_JERK,
300301

301302
0x0000
302303
};
@@ -428,6 +429,7 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
428429
VPHELPER(VP_AXIS_SETTINGS_AXIS_STEPSMM, &AxisSettingsHandler::axis_steps_mm, ScreenHandler.DGUSLCD_SetFloatAsIntFromDisplay<1>, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
429430
VPHELPER(VP_AXIS_SETTINGS_AXIS_MAX_ACCEL, &AxisSettingsHandler::max_acceleration_mm_per_s2, ScreenHandler.DGUSLCD_ReceiveUint32LongFromDisplay, ScreenHandler.DGUSLCD_SendUint32LongToDisplay),
430431

432+
VPHELPER(VP_AXIS_SETTINGS_AXIS_JERK, &AxisSettingsHandler::jerk, ScreenHandler.DGUSLCD_SetFloatAsIntFromDisplay<1>, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
431433

432434
VPHELPER(VP_AXIS_SETTINGS_NAV_BACKBUTTON, nullptr, AxisSettingsHandler::HandleBackNavigation, nullptr),
433435

Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.h

+1
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ constexpr uint16_t VP_AXIS_SETTINGS_NAV_BACKBUTTON = 0x22DD;
310310

311311
constexpr uint16_t VP_AXIS_SETTINGS_AXIS_STEPSMM = 0x22DF; // 2-byte
312312
constexpr uint16_t VP_AXIS_SETTINGS_AXIS_MAX_ACCEL = 0x22E1; // 4-byte (!)
313+
constexpr uint16_t VP_AXIS_SETTINGS_AXIS_JERK = 0x22E5; // 2-byte
313314

314315

315316
// Mesh leveling

0 commit comments

Comments
 (0)