2017-09-06 13:28:31 +02:00
|
|
|
/**
|
|
|
|
* Marlin 3D Printer Firmware
|
2019-06-28 06:57:50 +02:00
|
|
|
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
2017-09-06 13:28:31 +02:00
|
|
|
*
|
|
|
|
* Based on Sprinter and grbl.
|
2019-06-28 06:57:50 +02:00
|
|
|
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
2017-09-06 13:28:31 +02:00
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2017-09-16 11:13:55 +02:00
|
|
|
#include "../../inc/MarlinConfig.h"
|
|
|
|
|
|
|
|
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
|
|
|
|
|
|
|
|
#include "../gcode.h"
|
|
|
|
#include "../../module/motion.h"
|
|
|
|
#include "../../module/probe.h"
|
|
|
|
|
2017-11-07 22:36:33 +01:00
|
|
|
#include "../../feature/bedlevel/bedlevel.h"
|
|
|
|
|
2019-07-30 09:31:14 +02:00
|
|
|
#if HAS_SPI_LCD
|
|
|
|
#include "../../lcd/ultralcd.h"
|
|
|
|
#endif
|
|
|
|
|
2017-10-13 17:25:05 +02:00
|
|
|
#if HAS_LEVELING
|
|
|
|
#include "../../module/planner.h"
|
|
|
|
#endif
|
|
|
|
|
2017-09-06 13:28:31 +02:00
|
|
|
/**
|
|
|
|
* M48: Z probe repeatability measurement function.
|
|
|
|
*
|
|
|
|
* Usage:
|
2018-02-14 12:17:58 +01:00
|
|
|
* M48 <P#> <X#> <Y#> <V#> <E> <L#> <S>
|
2017-09-06 13:28:31 +02:00
|
|
|
* P = Number of sampled points (4-50, default 10)
|
|
|
|
* X = Sample X position
|
|
|
|
* Y = Sample Y position
|
|
|
|
* V = Verbose level (0-4, default=1)
|
|
|
|
* E = Engage Z probe for each reading
|
|
|
|
* L = Number of legs of movement before probe
|
|
|
|
* S = Schizoid (Or Star if you prefer)
|
|
|
|
*
|
2017-11-07 22:36:33 +01:00
|
|
|
* This function requires the machine to be homed before invocation.
|
2017-09-06 13:28:31 +02:00
|
|
|
*/
|
2017-09-16 11:13:55 +02:00
|
|
|
void GcodeSuite::M48() {
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
if (axis_unhomed_error()) return;
|
|
|
|
|
|
|
|
const int8_t verbose_level = parser.byteval('V', 1);
|
|
|
|
if (!WITHIN(verbose_level, 0, 4)) {
|
2019-09-11 09:46:52 +02:00
|
|
|
SERIAL_ECHOLNPGM("?(V)erbose level implausible (0-4).");
|
2017-09-06 13:28:31 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (verbose_level > 0)
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOLNPGM("M48 Z-Probe Repeatability Test");
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
const int8_t n_samples = parser.byteval('P', 10);
|
|
|
|
if (!WITHIN(n_samples, 4, 50)) {
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOLNPGM("?Sample size not plausible (4-50).");
|
2017-09-06 13:28:31 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-03-21 07:01:43 +01:00
|
|
|
const ProbePtRaise raise_after = parser.boolval('E') ? PROBE_PT_STOW : PROBE_PT_RAISE;
|
2017-09-06 13:28:31 +02:00
|
|
|
|
2019-09-29 11:25:39 +02:00
|
|
|
xy_float_t next_pos = current_position;
|
2017-09-06 13:28:31 +02:00
|
|
|
|
2019-09-29 11:25:39 +02:00
|
|
|
const xy_pos_t probe_pos = {
|
|
|
|
parser.linearval('X', next_pos.x + probe_offset.x),
|
|
|
|
parser.linearval('Y', next_pos.y + probe_offset.y)
|
|
|
|
};
|
2017-09-06 13:28:31 +02:00
|
|
|
|
2019-09-29 11:25:39 +02:00
|
|
|
if (!position_is_reachable_by_probe(probe_pos)) {
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOLNPGM("? (X,Y) out of bounds.");
|
2018-03-13 07:15:22 +01:00
|
|
|
return;
|
|
|
|
}
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
bool seen_L = parser.seen('L');
|
|
|
|
uint8_t n_legs = seen_L ? parser.value_byte() : 0;
|
|
|
|
if (n_legs > 15) {
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOLNPGM("?Number of legs in movement not plausible (0-15).");
|
2017-09-06 13:28:31 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (n_legs == 1) n_legs = 2;
|
|
|
|
|
|
|
|
const bool schizoid_flag = parser.boolval('S');
|
|
|
|
if (schizoid_flag && !seen_L) n_legs = 7;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Now get everything to the specified probe point So we can safely do a
|
|
|
|
* probe to get us close to the bed. If the Z-Axis is far from the bed,
|
|
|
|
* we don't want to use that as a starting point for each probe.
|
|
|
|
*/
|
|
|
|
if (verbose_level > 2)
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOLNPGM("Positioning the probe...");
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
// Disable bed level correction in M48 because we want the raw data when we probe
|
|
|
|
|
|
|
|
#if HAS_LEVELING
|
2017-10-14 00:21:25 +02:00
|
|
|
const bool was_enabled = planner.leveling_active;
|
2017-09-06 13:28:31 +02:00
|
|
|
set_bed_leveling_enabled(false);
|
|
|
|
#endif
|
|
|
|
|
2019-09-24 03:58:01 +02:00
|
|
|
remember_feedrate_scaling_off();
|
2017-09-06 13:28:31 +02:00
|
|
|
|
2018-07-01 22:20:28 +02:00
|
|
|
float mean = 0.0, sigma = 0.0, min = 99999.9, max = -99999.9, sample_set[n_samples];
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
// Move to the first point, deploy, and probe
|
2019-09-29 11:25:39 +02:00
|
|
|
const float t = probe_at_point(probe_pos, raise_after, verbose_level);
|
2017-09-06 13:28:31 +02:00
|
|
|
bool probing_good = !isnan(t);
|
|
|
|
|
|
|
|
if (probing_good) {
|
|
|
|
randomSeed(millis());
|
|
|
|
|
|
|
|
for (uint8_t n = 0; n < n_samples; n++) {
|
2019-08-06 03:01:40 +02:00
|
|
|
#if HAS_SPI_LCD
|
|
|
|
// Display M48 progress in the status bar
|
|
|
|
ui.status_printf_P(0, PSTR(MSG_M48_POINT ": %d/%d"), int(n + 1), int(n_samples));
|
|
|
|
#endif
|
2017-09-06 13:28:31 +02:00
|
|
|
if (n_legs) {
|
|
|
|
const int dir = (random(0, 10) > 5.0) ? -1 : 1; // clockwise or counter clockwise
|
2017-10-19 17:44:45 +02:00
|
|
|
float angle = random(0, 360);
|
2017-09-06 13:28:31 +02:00
|
|
|
const float radius = random(
|
|
|
|
#if ENABLED(DELTA)
|
2019-08-06 03:01:40 +02:00
|
|
|
int(0.1250000000 * (DELTA_PRINTABLE_RADIUS)),
|
|
|
|
int(0.3333333333 * (DELTA_PRINTABLE_RADIUS))
|
2017-09-06 13:28:31 +02:00
|
|
|
#else
|
2019-08-06 03:01:40 +02:00
|
|
|
int(5), int(0.125 * _MIN(X_BED_SIZE, Y_BED_SIZE))
|
2017-09-06 13:28:31 +02:00
|
|
|
#endif
|
|
|
|
);
|
|
|
|
|
|
|
|
if (verbose_level > 3) {
|
2019-08-06 03:01:40 +02:00
|
|
|
SERIAL_ECHOPAIR("Start radius:", radius, " angle:", angle, " dir:");
|
|
|
|
if (dir > 0) SERIAL_CHAR('C');
|
|
|
|
SERIAL_ECHOLNPGM("CW");
|
2017-09-06 13:28:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for (uint8_t l = 0; l < n_legs - 1; l++) {
|
2018-07-01 22:20:28 +02:00
|
|
|
float delta_angle;
|
2017-09-06 13:28:31 +02:00
|
|
|
|
2019-08-06 03:01:40 +02:00
|
|
|
if (schizoid_flag) {
|
2017-09-06 13:28:31 +02:00
|
|
|
// The points of a 5 point star are 72 degrees apart. We need to
|
|
|
|
// skip a point and go to the next one on the star.
|
|
|
|
delta_angle = dir * 2.0 * 72.0;
|
2019-08-06 03:01:40 +02:00
|
|
|
}
|
|
|
|
else {
|
2017-09-06 13:28:31 +02:00
|
|
|
// If we do this line, we are just trying to move further
|
|
|
|
// around the circle.
|
|
|
|
delta_angle = dir * (float) random(25, 45);
|
2019-08-06 03:01:40 +02:00
|
|
|
}
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
angle += delta_angle;
|
2019-08-06 03:01:40 +02:00
|
|
|
while (angle > 360.0) angle -= 360.0; // We probably do not need to keep the angle between 0 and 2*PI, but the
|
|
|
|
// Arduino documentation says the trig functions should not be given values
|
|
|
|
while (angle < 0.0) angle += 360.0; // outside of this range. It looks like they behave correctly with
|
|
|
|
// numbers outside of the range, but just to be safe we clamp them.
|
2017-09-06 13:28:31 +02:00
|
|
|
|
2019-09-29 11:25:39 +02:00
|
|
|
next_pos.set(probe_pos.x - probe_offset.x + cos(RADIANS(angle)) * radius,
|
|
|
|
probe_pos.y - probe_offset.y + sin(RADIANS(angle)) * radius);
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
#if DISABLED(DELTA)
|
2019-09-29 11:25:39 +02:00
|
|
|
LIMIT(next_pos.x, X_MIN_POS, X_MAX_POS);
|
|
|
|
LIMIT(next_pos.y, Y_MIN_POS, Y_MAX_POS);
|
2017-09-06 13:28:31 +02:00
|
|
|
#else
|
|
|
|
// If we have gone out too far, we can do a simple fix and scale the numbers
|
|
|
|
// back in closer to the origin.
|
2019-09-29 11:25:39 +02:00
|
|
|
while (!position_is_reachable_by_probe(next_pos)) {
|
2019-09-30 00:24:55 +02:00
|
|
|
next_pos *= 0.8f;
|
2019-08-06 03:01:40 +02:00
|
|
|
if (verbose_level > 3)
|
2019-09-29 11:25:39 +02:00
|
|
|
SERIAL_ECHOLNPAIR("Moving inward: X", next_pos.x, " Y", next_pos.y);
|
2017-09-06 13:28:31 +02:00
|
|
|
}
|
|
|
|
#endif
|
2019-08-06 03:01:40 +02:00
|
|
|
|
|
|
|
if (verbose_level > 3)
|
2019-09-29 11:25:39 +02:00
|
|
|
SERIAL_ECHOLNPAIR("Going to: X", next_pos.x, " Y", next_pos.y);
|
2019-08-06 03:01:40 +02:00
|
|
|
|
2019-09-29 11:25:39 +02:00
|
|
|
do_blocking_move_to_xy(next_pos);
|
2017-09-06 13:28:31 +02:00
|
|
|
} // n_legs loop
|
|
|
|
} // n_legs
|
|
|
|
|
|
|
|
// Probe a single point
|
2019-09-29 11:25:39 +02:00
|
|
|
sample_set[n] = probe_at_point(probe_pos, raise_after, 0);
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
// Break the loop if the probe fails
|
|
|
|
probing_good = !isnan(sample_set[n]);
|
|
|
|
if (!probing_good) break;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get the current mean for the data points we have so far
|
|
|
|
*/
|
2018-07-01 22:20:28 +02:00
|
|
|
float sum = 0.0;
|
2017-09-06 13:28:31 +02:00
|
|
|
for (uint8_t j = 0; j <= n; j++) sum += sample_set[j];
|
|
|
|
mean = sum / (n + 1);
|
|
|
|
|
|
|
|
NOMORE(min, sample_set[n]);
|
|
|
|
NOLESS(max, sample_set[n]);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Now, use that mean to calculate the standard deviation for the
|
|
|
|
* data points we have so far
|
|
|
|
*/
|
|
|
|
sum = 0.0;
|
|
|
|
for (uint8_t j = 0; j <= n; j++)
|
|
|
|
sum += sq(sample_set[j] - mean);
|
|
|
|
|
|
|
|
sigma = SQRT(sum / (n + 1));
|
|
|
|
if (verbose_level > 0) {
|
|
|
|
if (verbose_level > 1) {
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHO(n + 1);
|
2019-08-06 03:01:40 +02:00
|
|
|
SERIAL_ECHOPAIR(" of ", int(n_samples));
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOPAIR_F(": z: ", sample_set[n], 3);
|
2017-09-06 13:28:31 +02:00
|
|
|
if (verbose_level > 2) {
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOPAIR_F(" mean: ", mean, 4);
|
|
|
|
SERIAL_ECHOPAIR_F(" sigma: ", sigma, 6);
|
|
|
|
SERIAL_ECHOPAIR_F(" min: ", min, 3);
|
|
|
|
SERIAL_ECHOPAIR_F(" max: ", max, 3);
|
|
|
|
SERIAL_ECHOPAIR_F(" range: ", max-min, 3);
|
2017-09-06 13:28:31 +02:00
|
|
|
}
|
|
|
|
SERIAL_EOL();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} // n_samples loop
|
|
|
|
}
|
|
|
|
|
|
|
|
STOW_PROBE();
|
|
|
|
|
|
|
|
if (probing_good) {
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOLNPGM("Finished!");
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
if (verbose_level > 0) {
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOPAIR_F("Mean: ", mean, 6);
|
|
|
|
SERIAL_ECHOPAIR_F(" Min: ", min, 3);
|
|
|
|
SERIAL_ECHOPAIR_F(" Max: ", max, 3);
|
|
|
|
SERIAL_ECHOLNPAIR_F(" Range: ", max-min, 3);
|
2017-09-06 13:28:31 +02:00
|
|
|
}
|
|
|
|
|
2018-11-29 23:58:58 +01:00
|
|
|
SERIAL_ECHOLNPAIR_F("Standard Deviation: ", sigma, 6);
|
2017-09-06 13:28:31 +02:00
|
|
|
SERIAL_EOL();
|
2019-07-30 09:31:14 +02:00
|
|
|
|
|
|
|
#if HAS_SPI_LCD
|
|
|
|
// Display M48 results in the status bar
|
|
|
|
char sigma_str[8];
|
2019-08-08 08:51:37 +02:00
|
|
|
ui.status_printf_P(0, PSTR(MSG_M48_DEVIATION ": %s"), dtostrf(sigma, 2, 6, sigma_str));
|
2019-07-30 09:31:14 +02:00
|
|
|
#endif
|
2017-09-06 13:28:31 +02:00
|
|
|
}
|
|
|
|
|
2019-09-24 03:58:01 +02:00
|
|
|
restore_feedrate_and_scaling();
|
2017-09-06 13:28:31 +02:00
|
|
|
|
|
|
|
// Re-enable bed level correction if it had been on
|
|
|
|
#if HAS_LEVELING
|
|
|
|
set_bed_leveling_enabled(was_enabled);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
report_current_position();
|
|
|
|
}
|
2017-09-16 11:13:55 +02:00
|
|
|
|
|
|
|
#endif // Z_MIN_PROBE_REPEATABILITY_TEST
|