Skip to content

Commit 50f4e6b

Browse files
committed
🎨 Tweak VALIDATE_MESH_TILT
1 parent db8f501 commit 50f4e6b

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@ void unified_bed_leveling::smart_fill_mesh() {
14891489
float measured_z;
14901490
bool abort_flag = false;
14911491

1492-
#ifdef VALIDATE_MESH_TILT
1492+
#if ENABLED(VALIDATE_MESH_TILT)
14931493
float z1, z2, z3; // Needed for algorithm validation below
14941494
#endif
14951495

@@ -1505,9 +1505,7 @@ void unified_bed_leveling::smart_fill_mesh() {
15051505
abort_flag = true;
15061506
else {
15071507
measured_z -= get_z_correction(points[0]);
1508-
#ifdef VALIDATE_MESH_TILT
1509-
z1 = measured_z;
1510-
#endif
1508+
TERN_(VALIDATE_MESH_TILT, z1 = measured_z);
15111509
if (param.V_verbosity > 3) {
15121510
serial_spaces(16);
15131511
SERIAL_ECHOLNPGM("Corrected_Z=", measured_z);
@@ -1520,9 +1518,7 @@ void unified_bed_leveling::smart_fill_mesh() {
15201518
TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " 2/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
15211519

15221520
measured_z = probe.probe_at_point(points[1], PROBE_PT_RAISE, param.V_verbosity);
1523-
#ifdef VALIDATE_MESH_TILT
1524-
z2 = measured_z;
1525-
#endif
1521+
TERN_(VALIDATE_MESH_TILT, z2 = measured_z);
15261522
if (isnan(measured_z))
15271523
abort_flag = true;
15281524
else {
@@ -1540,9 +1536,7 @@ void unified_bed_leveling::smart_fill_mesh() {
15401536
TERN_(HAS_STATUS_MESSAGE, ui.status_printf(0, F(S_FMT " 3/3"), GET_TEXT(MSG_LCD_TILTING_MESH)));
15411537

15421538
measured_z = probe.probe_at_point(points[2], PROBE_PT_LAST_STOW, param.V_verbosity);
1543-
#ifdef VALIDATE_MESH_TILT
1544-
z3 = measured_z;
1545-
#endif
1539+
TERN_(VALIDATE_MESH_TILT, z3 = measured_z);
15461540
if (isnan(measured_z))
15471541
abort_flag = true;
15481542
else {
@@ -1689,7 +1683,7 @@ void unified_bed_leveling::smart_fill_mesh() {
16891683
* The Z error between the probed point locations and the get_z_correction()
16901684
* numbers for those locations should be 0.
16911685
*/
1692-
#ifdef VALIDATE_MESH_TILT
1686+
#if ENABLED(VALIDATE_MESH_TILT)
16931687
auto d_from = []{ DEBUG_ECHOPGM("D from "); };
16941688
auto normed = [&](const xy_pos_t &pos, const_float_t zadd) {
16951689
return normal.x * pos.x + normal.y * pos.y + zadd;

0 commit comments

Comments
 (0)