zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Signal an invalid mesh for M420 enable / load

Browse source
This commit is contained in:
Scott Lahteine 2018-12-07 16:14:11 -06:00
parent 50b2fbd031
commit b7e38ea249
1 changed files with 52 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
Marlin/src/gcode/bedlevel/M420.cpp
View file

@ -126,61 +126,71 @@ void GcodeSuite::M420() {
#endif // AUTO_BED_LEVELING_UBL #endif // AUTO_BED_LEVELING_UBL
const bool seenV = parser.seen('V');
#if HAS_MESH #if HAS_MESH
// Subtract the given value or the mean from all mesh values if (leveling_is_valid()) {
if (leveling_is_valid() && parser.seen('C')) {
const float cval = parser.value_float();
#if ENABLED(AUTO_BED_LEVELING_UBL)
set_bed_leveling_enabled(false); // Subtract the given value or the mean from all mesh values
ubl.adjust_mesh_to_mean(true, cval); if (parser.seen('C')) {
const float cval = parser.value_float();
#if ENABLED(AUTO_BED_LEVELING_UBL)
#else set_bed_leveling_enabled(false);
ubl.adjust_mesh_to_mean(true, cval);
#if ENABLED(M420_C_USE_MEAN)
// Get the sum and average of all mesh values
float mesh_sum = 0;
for (uint8_t x = GRID_MAX_POINTS_X; x--;)
for (uint8_t y = GRID_MAX_POINTS_Y; y--;)
mesh_sum += Z_VALUES(x, y);
const float zmean = mesh_sum / float(GRID_MAX_POINTS);
#else #else
// Find the low and high mesh values #if ENABLED(M420_C_USE_MEAN)
float lo_val = 100, hi_val = -100;
for (uint8_t x = GRID_MAX_POINTS_X; x--;) // Get the sum and average of all mesh values
for (uint8_t y = GRID_MAX_POINTS_Y; y--;) { float mesh_sum = 0;
const float z = Z_VALUES(x, y); for (uint8_t x = GRID_MAX_POINTS_X; x--;)
NOMORE(lo_val, z); for (uint8_t y = GRID_MAX_POINTS_Y; y--;)
NOLESS(hi_val, z); mesh_sum += Z_VALUES(x, y);
} const float zmean = mesh_sum / float(GRID_MAX_POINTS);
// Take the mean of the lowest and highest
const float zmean = (lo_val + hi_val) / 2.0 + cval; #else
// Find the low and high mesh values
float lo_val = 100, hi_val = -100;
for (uint8_t x = GRID_MAX_POINTS_X; x--;)
for (uint8_t y = GRID_MAX_POINTS_Y; y--;) {
const float z = Z_VALUES(x, y);
NOMORE(lo_val, z);
NOLESS(hi_val, z);
}
// Take the mean of the lowest and highest
const float zmean = (lo_val + hi_val) / 2.0 + cval;
#endif
// If not very close to 0, adjust the mesh
if (!NEAR_ZERO(zmean)) {
set_bed_leveling_enabled(false);
// Subtract the mean from all values
for (uint8_t x = GRID_MAX_POINTS_X; x--;)
for (uint8_t y = GRID_MAX_POINTS_Y; y--;)
Z_VALUES(x, y) -= zmean;
#if ENABLED(ABL_BILINEAR_SUBDIVISION)
bed_level_virt_interpolate();
#endif
}
#endif #endif
}
// If not very close to 0, adjust the mesh }
if (!NEAR_ZERO(zmean)) { else if (to_enable || seenV) {
set_bed_leveling_enabled(false); SERIAL_ERROR_MSG("Invalid mesh.");
// Subtract the mean from all values goto EXIT_M420;
for (uint8_t x = GRID_MAX_POINTS_X; x--;)
for (uint8_t y = GRID_MAX_POINTS_Y; y--;)
Z_VALUES(x, y) -= zmean;
#if ENABLED(ABL_BILINEAR_SUBDIVISION)
bed_level_virt_interpolate();
#endif
}
#endif
} }
#endif // HAS_MESH #endif // HAS_MESH
// V to print the matrix or mesh // V to print the matrix or mesh
if (parser.seen('V')) { if (seenV) {
#if ABL_PLANAR #if ABL_PLANAR
planner.bed_level_matrix.debug(PSTR("Bed Level Correction Matrix:")); planner.bed_level_matrix.debug(PSTR("Bed Level Correction Matrix:"));
#else #else
@ -205,6 +215,8 @@ void GcodeSuite::M420() {
// Enable leveling if specified, or if previously active // Enable leveling if specified, or if previously active
set_bed_leveling_enabled(to_enable); set_bed_leveling_enabled(to_enable);
EXIT_M420:
// Error if leveling failed to enable or reenable // Error if leveling failed to enable or reenable
if (to_enable && !planner.leveling_active) if (to_enable && !planner.leveling_active)
SERIAL_ERROR_MSG(MSG_ERR_M420_FAILED); SERIAL_ERROR_MSG(MSG_ERR_M420_FAILED);