From a2a304094f17b5391ef0662e39c9a011f3df8b7e Mon Sep 17 00:00:00 2001
From: vovodroid <vovodroid@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:56:33 +0200
Subject: [PATCH 1/2] Fix Z jerk menu to use 0.1 step.
---
Marlin/src/lcd/menu/menu_advanced.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 698687b96dcd..4b0f342014ca 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -605,7 +605,7 @@ void menu_backlash();
;
LOOP_LOGICAL_AXES(a) {
- if (TERN0(HAS_C_AXIS, a == C_AXIS) || TERN0(HAS_EXTRUDERS, a == E_AXIS))
+ if (TERN0(HAS_Z_AXIS, a == Z_AXIS) || TERN0(HAS_EXTRUDERS, a == E_AXIS))
EDIT_ITEM_FAST_N(float52sign, a, MSG_VN_JERK, &planner.max_jerk[a], 0.1f, max_jerk_edit[a]);
else
EDIT_ITEM_FAST_N(float3, a, MSG_VN_JERK, &planner.max_jerk[a], 1.0f, max_jerk_edit[a]);
From 8eef8caf69606e04b3b6d2c127700ad12d841aa8 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 9 Jan 2024 15:27:09 -0600
Subject: [PATCH 2/2] Fix HAS_*_AXIS for A,B,C
---
Marlin/src/inc/Conditionals_LCD.h | 3 +++
Marlin/src/lcd/menu/menu_advanced.cpp | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index e07d026cb961..752e3aef6bf8 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -263,10 +263,13 @@
#endif
#if NUM_AXES >= 1
#define HAS_X_AXIS 1
+ #define HAS_A_AXIS 1
#if NUM_AXES >= XY
#define HAS_Y_AXIS 1
+ #define HAS_B_AXIS 1
#if NUM_AXES >= XYZ
#define HAS_Z_AXIS 1
+ #define HAS_C_AXIS 1
#if NUM_AXES >= 4
#define HAS_I_AXIS 1
#if NUM_AXES >= 5
diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp
index 4b0f342014ca..698687b96dcd 100644
--- a/Marlin/src/lcd/menu/menu_advanced.cpp
+++ b/Marlin/src/lcd/menu/menu_advanced.cpp
@@ -605,7 +605,7 @@ void menu_backlash();
;
LOOP_LOGICAL_AXES(a) {
- if (TERN0(HAS_Z_AXIS, a == Z_AXIS) || TERN0(HAS_EXTRUDERS, a == E_AXIS))
+ if (TERN0(HAS_C_AXIS, a == C_AXIS) || TERN0(HAS_EXTRUDERS, a == E_AXIS))
EDIT_ITEM_FAST_N(float52sign, a, MSG_VN_JERK, &planner.max_jerk[a], 0.1f, max_jerk_edit[a]);
else
EDIT_ITEM_FAST_N(float3, a, MSG_VN_JERK, &planner.max_jerk[a], 1.0f, max_jerk_edit[a]);