From 8ce9306b275abb48422208c70003dfacbd28315e Mon Sep 17 00:00:00 2001
From: LVD-AC <lvd@sound-silence.com>
Date: Wed, 8 Nov 2017 09:43:29 +0100
Subject: [PATCH] PROBE_SELECTED etc.
---
Marlin/Marlin.h | 2 +-
Marlin/Marlin_main.cpp | 76 ++++++++-----------
Marlin/configuration_store.cpp | 2 +-
.../FLSUN/auto_calibrate/Configuration.h | 4 +-
.../delta/FLSUN/kossel_mini/Configuration.h | 2 +-
.../delta/generic/Configuration.h | 2 +-
.../delta/kossel_mini/Configuration.h | 2 +-
.../delta/kossel_pro/Configuration.h | 2 +-
.../delta/kossel_xl/Configuration.h | 2 +-
Marlin/ultralcd.cpp | 50 ++++++------
10 files changed, 66 insertions(+), 78 deletions(-)
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 67ed6c8a56e..cc4ec2aa5cc 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -310,7 +310,7 @@ void report_current_position();
delta_segments_per_second,
delta_tower_angle_trim[ABC],
delta_clip_start_height;
- void recalc_delta_settings(float radius, float diagonal_rod, float tower_angle_trim[ABC]);
+ void recalc_delta_settings();
#elif IS_SCARA
void forward_kinematics_SCARA(const float &a, const float &b);
#endif
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 2fbbee98b9f..8dbbcd919e5 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -2333,10 +2333,9 @@ static void clean_up_after_endstop_or_probe_move() {
* @details Used by probe_pt to do a single Z probe.
* Leaves current_position[Z_AXIS] at the height where the probe triggered.
*
- * @param short_move Flag for a shorter probe move towards the bed
* @return The raw Z position where the probe was triggered
*/
- static float run_z_probe(const bool short_move=true) {
+ static float run_z_probe() {
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS(">>> run_z_probe", current_position);
@@ -2374,7 +2373,7 @@ static void clean_up_after_endstop_or_probe_move() {
#endif
// move down slowly to find bed
- if (do_probe_move(-10 + (short_move ? 0 : -(Z_MAX_LENGTH)), Z_PROBE_SPEED_SLOW)) return NAN;
+ if (do_probe_move(-10, Z_PROBE_SPEED_SLOW)) return NAN;
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) DEBUG_POS("<<< run_z_probe", current_position);
@@ -2413,12 +2412,11 @@ static void clean_up_after_endstop_or_probe_move() {
const float nx = rx - (X_PROBE_OFFSET_FROM_EXTRUDER), ny = ry - (Y_PROBE_OFFSET_FROM_EXTRUDER);
- if (printable
+ if (!printable
? !position_is_reachable(nx, ny)
: !position_is_reachable_by_probe(rx, ry)
) return NAN;
-
const float old_feedrate_mm_s = feedrate_mm_s;
#if ENABLED(DELTA)
@@ -2426,12 +2424,6 @@ static void clean_up_after_endstop_or_probe_move() {
do_blocking_move_to_z(delta_clip_start_height);
#endif
- #if HAS_SOFTWARE_ENDSTOPS
- // Store the status of the soft endstops and disable if we're probing a non-printable location
- static bool enable_soft_endstops = soft_endstops_enabled;
- if (!printable) soft_endstops_enabled = false;
- #endif
-
feedrate_mm_s = XY_PROBE_FEEDRATE_MM_S;
// Move the probe to the given XY
@@ -2439,7 +2431,7 @@ static void clean_up_after_endstop_or_probe_move() {
float measured_z = NAN;
if (!DEPLOY_PROBE()) {
- measured_z = run_z_probe(printable);
+ measured_z = run_z_probe();
if (!stow)
do_blocking_move_to_z(current_position[Z_AXIS] + Z_CLEARANCE_BETWEEN_PROBES, MMM_TO_MMS(Z_PROBE_SPEED_FAST));
@@ -2447,11 +2439,6 @@ static void clean_up_after_endstop_or_probe_move() {
if (STOW_PROBE()) measured_z = NAN;
}
- #if HAS_SOFTWARE_ENDSTOPS
- // Restore the soft endstop status
- soft_endstops_enabled = enable_soft_endstops;
- #endif
-
if (verbose_level > 2) {
SERIAL_PROTOCOLPGM("Bed X: ");
SERIAL_PROTOCOL_F(LOGICAL_X_POSITION(rx), 3);
@@ -5592,7 +5579,7 @@ void home_all_axes() { gcode_G28(true); }
r = delta_calibration_radius * 0.1;
z_at_pt[CEN] +=
#if HAS_BED_PROBE
- probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1)
+ probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1, false)
#else
lcd_probe_pt(cos(a) * r, sin(a) * r)
#endif
@@ -5621,7 +5608,7 @@ void home_all_axes() { gcode_G28(true); }
interpol = fmod(axis, 1);
const float z_temp =
#if HAS_BED_PROBE
- probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1)
+ probe_pt(cos(a) * r + dx, sin(a) * r + dy, stow_after_each, 1, false)
#else
lcd_probe_pt(cos(a) * r, sin(a) * r)
#endif
@@ -5637,7 +5624,6 @@ void home_all_axes() { gcode_G28(true); }
z_at_pt[axis] /= _7P_STEP / steps;
}
-
float S1 = z_at_pt[CEN],
S2 = sq(z_at_pt[CEN]);
int16_t N = 1;
@@ -5675,6 +5661,7 @@ void home_all_axes() { gcode_G28(true); }
LOOP_XYZ(axis) {
delta_endstop_adj[axis] -= 1.0;
+ recalc_delta_settings();
endstops.enable(true);
if (!home_delta()) return;
@@ -5688,6 +5675,7 @@ void home_all_axes() { gcode_G28(true); }
LOOP_CAL_ALL(axis) z_at_pt[axis] -= z_at_pt_base[axis];
print_G33_results(z_at_pt, true, true);
delta_endstop_adj[axis] += 1.0;
+ recalc_delta_settings();
switch (axis) {
case A_AXIS :
h_fac += 4.0 / (Z03(CEN) +Z01(__A) +Z32(_CA) +Z32(_AB)); // Offset by X-tower end-stop
@@ -5705,7 +5693,7 @@ void home_all_axes() { gcode_G28(true); }
for (int8_t zig_zag = -1; zig_zag < 2; zig_zag += 2) {
delta_radius += 1.0 * zig_zag;
- recalc_delta_settings(delta_radius, delta_diagonal_rod, delta_tower_angle_trim);
+ recalc_delta_settings();
endstops.enable(true);
if (!home_delta()) return;
@@ -5718,7 +5706,7 @@ void home_all_axes() { gcode_G28(true); }
LOOP_CAL_ALL(axis) z_at_pt[axis] -= z_at_pt_base[axis];
print_G33_results(z_at_pt, true, true);
delta_radius -= 1.0 * zig_zag;
- recalc_delta_settings(delta_radius, delta_diagonal_rod, delta_tower_angle_trim);
+ recalc_delta_settings();
r_fac -= zig_zag * 6.0 / (Z03(__A) +Z03(__B) +Z03(__C) +Z03(_BC) +Z03(_CA) +Z03(_AB)); // Offset by delta radius
}
r_fac /= 2.0;
@@ -5731,7 +5719,7 @@ void home_all_axes() { gcode_G28(true); }
z_temp = MAX3(delta_endstop_adj[A_AXIS], delta_endstop_adj[B_AXIS], delta_endstop_adj[C_AXIS]);
delta_height -= z_temp;
LOOP_XYZ(axis) delta_endstop_adj[axis] -= z_temp;
- recalc_delta_settings(delta_radius, delta_diagonal_rod, delta_tower_angle_trim);
+ recalc_delta_settings();
endstops.enable(true);
if (!home_delta()) return;
@@ -5751,7 +5739,7 @@ void home_all_axes() { gcode_G28(true); }
z_temp = MAX3(delta_endstop_adj[A_AXIS], delta_endstop_adj[B_AXIS], delta_endstop_adj[C_AXIS]);
delta_height -= z_temp;
LOOP_XYZ(axis) delta_endstop_adj[axis] -= z_temp;
- recalc_delta_settings(delta_radius, delta_diagonal_rod, delta_tower_angle_trim);
+ recalc_delta_settings();
switch (axis) {
case A_AXIS :
a_fac += 4.0 / ( Z06(__B) -Z06(__C) +Z06(_CA) -Z06(_AB)); // Offset by alpha tower angle
@@ -6038,7 +6026,7 @@ void home_all_axes() { gcode_G28(true); }
delta_height -= z_temp;
LOOP_XYZ(axis) delta_endstop_adj[axis] -= z_temp;
}
- recalc_delta_settings(delta_radius, delta_diagonal_rod, delta_tower_angle_trim);
+ recalc_delta_settings();
NOMORE(zero_std_dev_min, zero_std_dev);
// print report
@@ -8997,7 +8985,7 @@ inline void gcode_M205() {
if (parser.seen('X')) delta_tower_angle_trim[A_AXIS] = parser.value_float();
if (parser.seen('Y')) delta_tower_angle_trim[B_AXIS] = parser.value_float();
if (parser.seen('Z')) delta_tower_angle_trim[C_AXIS] = parser.value_float();
- recalc_delta_settings(delta_radius, delta_diagonal_rod, delta_tower_angle_trim);
+ recalc_delta_settings();
}
/**
* M666: Set delta endstop adjustment
@@ -11409,17 +11397,13 @@ void process_parsed_command() {
#endif // HAS_BED_PROBE
- #if PROBE_SELECTED
+ #if ENABLED(DELTA_AUTO_CALIBRATION)
- #if ENABLED(DELTA_AUTO_CALIBRATION)
+ case 33: // G33: Delta Auto-Calibration
+ gcode_G33();
+ break;
- case 33: // G33: Delta Auto-Calibration
- gcode_G33();
- break;
-
- #endif // DELTA_AUTO_CALIBRATION
-
- #endif // PROBE_SELECTED
+ #endif // DELTA_AUTO_CALIBRATION
#if ENABLED(G38_PROBE_TARGET)
case 38: // G38.2 & G38.3
@@ -12355,18 +12339,20 @@ void ok_to_send() {
* Recalculate factors used for delta kinematics whenever
* settings have been changed (e.g., by M665).
*/
- void recalc_delta_settings(float radius, float diagonal_rod, float tower_angle_trim[ABC]) {
+ void recalc_delta_settings() {
const float trt[ABC] = DELTA_RADIUS_TRIM_TOWER,
drt[ABC] = DELTA_DIAGONAL_ROD_TRIM_TOWER;
- delta_tower[A_AXIS][X_AXIS] = cos(RADIANS(210 + tower_angle_trim[A_AXIS])) * (radius + trt[A_AXIS]); // front left tower
- delta_tower[A_AXIS][Y_AXIS] = sin(RADIANS(210 + tower_angle_trim[A_AXIS])) * (radius + trt[A_AXIS]);
- delta_tower[B_AXIS][X_AXIS] = cos(RADIANS(330 + tower_angle_trim[B_AXIS])) * (radius + trt[B_AXIS]); // front right tower
- delta_tower[B_AXIS][Y_AXIS] = sin(RADIANS(330 + tower_angle_trim[B_AXIS])) * (radius + trt[B_AXIS]);
- delta_tower[C_AXIS][X_AXIS] = cos(RADIANS( 90 + tower_angle_trim[C_AXIS])) * (radius + trt[C_AXIS]); // back middle tower
- delta_tower[C_AXIS][Y_AXIS] = sin(RADIANS( 90 + tower_angle_trim[C_AXIS])) * (radius + trt[C_AXIS]);
- delta_diagonal_rod_2_tower[A_AXIS] = sq(diagonal_rod + drt[A_AXIS]);
- delta_diagonal_rod_2_tower[B_AXIS] = sq(diagonal_rod + drt[B_AXIS]);
- delta_diagonal_rod_2_tower[C_AXIS] = sq(diagonal_rod + drt[C_AXIS]);
+ delta_tower[A_AXIS][X_AXIS] = cos(RADIANS(210 + delta_tower_angle_trim[A_AXIS])) * (delta_radius + trt[A_AXIS]); // front left tower
+ delta_tower[A_AXIS][Y_AXIS] = sin(RADIANS(210 + delta_tower_angle_trim[A_AXIS])) * (delta_radius + trt[A_AXIS]);
+ delta_tower[B_AXIS][X_AXIS] = cos(RADIANS(330 + delta_tower_angle_trim[B_AXIS])) * (delta_radius + trt[B_AXIS]); // front right tower
+ delta_tower[B_AXIS][Y_AXIS] = sin(RADIANS(330 + delta_tower_angle_trim[B_AXIS])) * (delta_radius + trt[B_AXIS]);
+ delta_tower[C_AXIS][X_AXIS] = cos(RADIANS( 90 + delta_tower_angle_trim[C_AXIS])) * (delta_radius + trt[C_AXIS]); // back middle tower
+ delta_tower[C_AXIS][Y_AXIS] = sin(RADIANS( 90 + delta_tower_angle_trim[C_AXIS])) * (delta_radius + trt[C_AXIS]);
+ delta_diagonal_rod_2_tower[A_AXIS] = sq(delta_diagonal_rod + drt[A_AXIS]);
+ delta_diagonal_rod_2_tower[B_AXIS] = sq(delta_diagonal_rod + drt[B_AXIS]);
+ delta_diagonal_rod_2_tower[C_AXIS] = sq(delta_diagonal_rod + drt[C_AXIS]);
+ update_software_endstops(Z_AXIS);
+ axis_homed[X_AXIS] = axis_homed[Y_AXIS] = axis_homed[Z_AXIS] = false;
}
#if ENABLED(DELTA_FAST_SQRT)
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index e0114c25cb8..088adc2fa4d 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -227,7 +227,7 @@ void MarlinSettings::postprocess() {
// Make sure delta kinematics are updated before refreshing the
// planner position so the stepper counts will be set correctly.
#if ENABLED(DELTA)
- recalc_delta_settings(delta_radius, delta_diagonal_rod, delta_tower_angle_trim);
+ recalc_delta_settings();
#endif
// Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
index c02a3928ac4..5460886931d 100644
--- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
@@ -487,7 +487,7 @@
// Delta calibration menu
// uncomment to add three points calibration menu option.
// See http://minow.blogspot.com/index.html#4918805519571907051
- #define DELTA_CALIBRATION_MENU
+ //#define DELTA_CALIBRATION_MENU
// uncomment to add G33 Delta Auto-Calibration (Enable EEPROM_SETTINGS to store results)
#define DELTA_AUTO_CALIBRATION
@@ -506,7 +506,7 @@
#endif
#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
- // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
+ // Set the radius for the calibration probe points - max 0.9 * DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 73.5 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
index 1f086e9b672..9f8f33ba491 100644
--- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
@@ -506,7 +506,7 @@
#endif
#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
- // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
+ // Set the radius for the calibration probe points - max 0.9 * DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 73.5 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 20a1dd28183..862fa1b6e2d 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -496,7 +496,7 @@
#endif
#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
- // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
+ // Set the radius for the calibration probe points - max 0.9 * DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 121.5 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index 995e61c5d56..92f3987934d 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -496,7 +496,7 @@
#endif
#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
- // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
+ // Set the radius for the calibration probe points - max 0.9 * DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 78.0 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index f51008f1373..8b9f5584b00 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -482,7 +482,7 @@
#endif
#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
- // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
+ // Set the radius for the calibration probe points - max 0.9 * DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 110.0 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
index cceda66ed98..1bf0f6fa20b 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@@ -500,7 +500,7 @@
#endif
#if ENABLED(DELTA_AUTO_CALIBRATION) || ENABLED(DELTA_CALIBRATION_MENU)
- // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
+ // Set the radius for the calibration probe points - max 0.9 * DELTA_PRINTABLE_RADIUS for non-eccentric probes
#define DELTA_CALIBRATION_RADIUS 121.5 // mm
// Set the steprate for papertest probing
#define PROBE_MANUALLY_STEP 0.025
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 7a03715e375..298c6068868 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -204,7 +204,7 @@ uint16_t max_display_update_time = 0;
void lcd_control_retract_menu();
#endif
- #if ENABLED(DELTA_CALIBRATION_MENU)
+ #if ENABLED(DELTA_CALIBRATION_MENU) || ENABLED(DELTA_AUTO_CALIBRATION)
void lcd_delta_calibrate_menu();
#endif
@@ -2558,7 +2558,7 @@ void kill_screen(const char* lcd_msg) {
// Move Axis
//
#if ENABLED(DELTA)
- if (axis_homed[Z_AXIS])
+ if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
#endif
MENU_ITEM(submenu, MSG_MOVE_AXIS, lcd_move_menu);
@@ -2673,7 +2673,7 @@ void kill_screen(const char* lcd_msg) {
//
// Delta Calibration
//
- #if ENABLED(DELTA_CALIBRATION_MENU)
+ #if ENABLED(DELTA_CALIBRATION_MENU) || ENABLED(DELTA_AUTO_CALIBRATION)
MENU_ITEM(submenu, MSG_DELTA_CALIBRATE, lcd_delta_calibrate_menu);
#endif
@@ -2742,22 +2742,22 @@ void kill_screen(const char* lcd_msg) {
void _goto_tower_z() { _man_probe_pt(cos(RADIANS( 90)) * delta_calibration_radius, sin(RADIANS( 90)) * delta_calibration_radius); }
void _goto_center() { _man_probe_pt(0,0); }
- void _lcd_set_delta_height() {
- update_software_endstops(Z_AXIS);
- }
+ #endif // DELTA_CALIBRATION_MENU
+
+ #if ENABLED(DELTA_CALIBRATION_MENU) || ENABLED(DELTA_AUTO_CALIBRATION)
void lcd_delta_settings() {
START_MENU();
MENU_BACK(MSG_DELTA_CALIBRATE);
- MENU_ITEM_EDIT(float52, MSG_DELTA_DIAG_ROG, &delta_diagonal_rod, DELTA_DIAGONAL_ROD - 5.0, DELTA_DIAGONAL_ROD + 5.0);
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10.0, delta_height + 10.0, _lcd_set_delta_height);
- MENU_ITEM_EDIT(float43, "Ex", &delta_endstop_adj[A_AXIS], -5.0, 5.0);
- MENU_ITEM_EDIT(float43, "Ey", &delta_endstop_adj[B_AXIS], -5.0, 5.0);
- MENU_ITEM_EDIT(float43, "Ez", &delta_endstop_adj[C_AXIS], -5.0, 5.0);
- MENU_ITEM_EDIT(float52, MSG_DELTA_RADIUS, &delta_radius, DELTA_RADIUS - 5.0, DELTA_RADIUS + 5.0);
- MENU_ITEM_EDIT(float43, "Tx", &delta_tower_angle_trim[A_AXIS], -5.0, 5.0);
- MENU_ITEM_EDIT(float43, "Ty", &delta_tower_angle_trim[B_AXIS], -5.0, 5.0);
- MENU_ITEM_EDIT(float43, "Tz", &delta_tower_angle_trim[C_AXIS], -5.0, 5.0);
+ MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_DIAG_ROG, &delta_diagonal_rod, delta_diagonal_rod - 5.0, delta_diagonal_rod + 5.0, recalc_delta_settings);
+ MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_HEIGHT, &delta_height, delta_height - 10.0, delta_height + 10.0, recalc_delta_settings);
+ MENU_ITEM_EDIT_CALLBACK(float43, "Ex", &delta_endstop_adj[A_AXIS], -5.0, 5.0, recalc_delta_settings);
+ MENU_ITEM_EDIT_CALLBACK(float43, "Ey", &delta_endstop_adj[B_AXIS], -5.0, 5.0, recalc_delta_settings);
+ MENU_ITEM_EDIT_CALLBACK(float43, "Ez", &delta_endstop_adj[C_AXIS], -5.0, 5.0, recalc_delta_settings);
+ MENU_ITEM_EDIT_CALLBACK(float52, MSG_DELTA_RADIUS, &delta_radius, delta_radius - 5.0, delta_radius + 5.0, recalc_delta_settings);
+ MENU_ITEM_EDIT_CALLBACK(float43, "Tx", &delta_tower_angle_trim[A_AXIS], -5.0, 5.0, recalc_delta_settings);
+ MENU_ITEM_EDIT_CALLBACK(float43, "Ty", &delta_tower_angle_trim[B_AXIS], -5.0, 5.0, recalc_delta_settings);
+ MENU_ITEM_EDIT_CALLBACK(float43, "Tz", &delta_tower_angle_trim[C_AXIS], -5.0, 5.0, recalc_delta_settings);
END_MENU();
}
@@ -2765,7 +2765,6 @@ void kill_screen(const char* lcd_msg) {
START_MENU();
MENU_BACK(MSG_MAIN);
#if ENABLED(DELTA_AUTO_CALIBRATION)
- MENU_ITEM(submenu, MSG_DELTA_SETTINGS, lcd_delta_settings);
MENU_ITEM(gcode, MSG_DELTA_AUTO_CALIBRATE, PSTR("G33"));
MENU_ITEM(gcode, MSG_DELTA_HEIGHT_CALIBRATE, PSTR("G33 P1"));
#if ENABLED(EEPROM_SETTINGS)
@@ -2773,17 +2772,20 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM(function, MSG_LOAD_EEPROM, lcd_load_settings);
#endif
#endif
- MENU_ITEM(submenu, MSG_AUTO_HOME, _lcd_delta_calibrate_home);
- if (axis_homed[Z_AXIS]) {
- MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_X, _goto_tower_x);
- MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_Y, _goto_tower_y);
- MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_Z, _goto_tower_z);
- MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_CENTER, _goto_center);
- }
+ MENU_ITEM(submenu, MSG_DELTA_SETTINGS, lcd_delta_settings);
+ #if ENABLED(DELTA_CALIBRATION_MENU)
+ MENU_ITEM(submenu, MSG_AUTO_HOME, _lcd_delta_calibrate_home);
+ if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) {
+ MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_X, _goto_tower_x);
+ MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_Y, _goto_tower_y);
+ MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_Z, _goto_tower_z);
+ MENU_ITEM(submenu, MSG_DELTA_CALIBRATE_CENTER, _goto_center);
+ }
+ #endif
END_MENU();
}
- #endif // DELTA_CALIBRATION_MENU
+ #endif // DELTA_CALIBRATION_MENU || DELTA_AUTO_CALIBRATION
#if IS_KINEMATIC
extern float feedrate_mm_s;