diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 97253f805b1a250b6b90089e840880ce28679f1d..d8f6f26ecd15dc84c7a76b0b64b90466e291d3b5 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -5107,9 +5107,9 @@ void home_all_axes() { gcode_G28(true); }
* P4-P7 Probe all positions at different locations and average them.
*
* T Don't calibrate tower angle corrections
- *
+ *
* Cn.nn Calibration precision; when omitted calibrates to maximum precision
- *
+ *
* Vn Verbose level:
*
* V0 Dry-run mode. Report settings and probe results. No calibration.
@@ -5229,7 +5229,7 @@ void home_all_axes() { gcode_G28(true); }
#endif
int8_t iterations = 0;
-
+
home_offset[Z_AXIS] -= probe_pt(0.0, 0.0 , true, 1); // 1st probe to set height
do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);
@@ -5239,7 +5239,7 @@ void home_all_axes() { gcode_G28(true); }
int16_t N = 0;
test_precision = zero_std_dev_old != 999.0 ? (zero_std_dev + zero_std_dev_old) / 2 : zero_std_dev;
-
+
iterations++;
// Probe the points
@@ -5286,7 +5286,7 @@ void home_all_axes() { gcode_G28(true); }
}
zero_std_dev_old = zero_std_dev;
zero_std_dev = round(sqrt(S2 / N) * 1000.0) / 1000.0 + 0.00001;
-
+
if (iterations == 1) home_offset[Z_AXIS] = zh_old; // reset height after 1st probe change
// Solve matrices
@@ -5416,7 +5416,7 @@ void home_all_axes() { gcode_G28(true); }
else {
SERIAL_PROTOCOLPGM("std dev:");
SERIAL_PROTOCOL_F(zero_std_dev, 3);
- }
+ }
SERIAL_EOL;
LCD_MESSAGEPGM("Calibration OK"); // TODO: Make translatable string
}
@@ -5481,7 +5481,7 @@ void home_all_axes() { gcode_G28(true); }
home_delta();
endstops.not_homing();
- }
+ }
while (zero_std_dev < test_precision && zero_std_dev > calibration_precision && iterations < 31);
#if ENABLED(DELTA_HOME_TO_SAFE_ZONE)
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index 0d86d1338aca06de2f27f493174d09a5910d3f33..5fda591bbcd1e75570ec3ee39b021b6ddf704522 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -903,7 +903,7 @@
#define UBL_PROBE_PT_3_Y 20
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
-
+
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h
index 2492fc9ac5f333e536747fe8ef383acaaa1b4394..528c54e34cabbe59a4feb54e2d142cf7557d73e2 100644
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@@ -907,7 +907,7 @@
#define UBL_PROBE_PT_3_Y 20
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
-
+
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
diff --git a/Marlin/example_configurations/TinyBoy2/Configuration.h b/Marlin/example_configurations/TinyBoy2/Configuration.h
index 1bdc0f94ee0fa801f659eaaa00242c1d793f45d4..b10d7b1142fff836ada4273226384516fc49d785 100644
--- a/Marlin/example_configurations/TinyBoy2/Configuration.h
+++ b/Marlin/example_configurations/TinyBoy2/Configuration.h
@@ -943,7 +943,7 @@
#define UBL_PROBE_PT_3_Y 20
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
-
+
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index cb06b543c704e8aedfae8a30085a8a5cc0a04c43..7df93fc105870c8ae39bdeb1691e0ffda004089a 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -878,7 +878,7 @@
#define UBL_PROBE_PT_3_Y 20
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
-
+
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 550916356ea48ec8ac20fe13e26ab78a362a56e0..0af2f5bd942801726cd170a3d8d15048a8051094 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -883,7 +883,7 @@
#define UBL_PROBE_PT_3_Y 20
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
-
+
#elif ENABLED(MESH_BED_LEVELING)
//===========================================================================
diff --git a/Marlin/ubl_G29.cpp b/Marlin/ubl_G29.cpp
index 4f01dc9f3a08586adaf67ae187752370106dd6f7..506ae63223ca7a97a112cf896b8a40ec32de18b4 100644
--- a/Marlin/ubl_G29.cpp
+++ b/Marlin/ubl_G29.cpp
@@ -36,8 +36,7 @@
#define UBL_G29_P31
- extern float destination[XYZE];
- extern float current_position[XYZE];
+ extern float destination[XYZE], current_position[XYZE];
void lcd_return_to_status();
bool lcd_clicked();
@@ -63,6 +62,7 @@
#define SIZE_OF_LITTLE_RAISE 1
#define BIG_RAISE_NOT_NEEDED 0
+
extern void lcd_status_screen();
typedef void (*screenFunc_t)();
extern void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder = 0);
@@ -936,9 +936,7 @@
return current_position[Z_AXIS];
}
- static void echo_and_take_a_measurement() {
- SERIAL_PROTOCOLLNPGM(" and take a measurement.");
- }
+ static void echo_and_take_a_measurement() { SERIAL_PROTOCOLLNPGM(" and take a measurement."); }
float measure_business_card_thickness(float &in_height) {
ubl.has_control_of_lcd_panel = true;
@@ -1392,8 +1390,8 @@
for (uint8_t k = 0; k < GRID_MAX_POINTS_X; k++) {
for (uint8_t l = 0; l < GRID_MAX_POINTS_Y; l++) {
if (i != k && j != l && !isnan(ubl.z_values[k][l])) {
-// distance += pow((float) abs(i - k) * (MESH_X_DIST), 2) + pow((float) abs(j - l) * (MESH_Y_DIST), 2); // working here
- distance += HYPOT((MESH_X_DIST),(MESH_Y_DIST)) / log(HYPOT((i - k) * (MESH_X_DIST)+.001, (j - l) * (MESH_Y_DIST))+.001);
+ //distance += pow((float) abs(i - k) * (MESH_X_DIST), 2) + pow((float) abs(j - l) * (MESH_Y_DIST), 2); // working here
+ distance += HYPOT(MESH_X_DIST, MESH_Y_DIST) / log(HYPOT((i - k) * (MESH_X_DIST) + .001, (j - l) * (MESH_Y_DIST)) + .001);
}
}
}
@@ -1474,7 +1472,7 @@
do {
new_z = lcd_mesh_edit();
#ifdef UBL_MESH_EDIT_MOVES_Z
- do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES+new_z); // Move the nozzle as the point is edited
+ do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES + new_z); // Move the nozzle as the point is edited
#endif
idle();
} while (!ubl_lcd_clicked());