CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix M420 C for UBL

Browse Source
This commit is contained in:
Scott Lahteine 2018-04-28 08:14:20 -05:00
parent ed8d2bc225
commit 8db7fb226a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/ubl/ubl.h
View File

@ -124,7 +124,7 @@ class unified_bed_leveling {
static void reset(); static void reset();
static void invalidate(); static void invalidate();
static void set_all_mesh_points_to_value(const float value); static void set_all_mesh_points_to_value(const float value);
static void adjust_mesh_to_mean(const float value); static void adjust_mesh_to_mean(const bool cflag, const float value);
static bool sanity_check(); static bool sanity_check();
static void G29() _O0; // O0 for no optimization static void G29() _O0; // O0 for no optimization

8
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -544,7 +544,7 @@
#endif #endif
break; break;
case 5: adjust_mesh_to_mean(g29_constant); break; case 5: adjust_mesh_to_mean(g29_c_flag, g29_constant); break;
case 6: shift_mesh_height(); break; case 6: shift_mesh_height(); break;
} }
@ -634,7 +634,7 @@
return; return;
} }
void unified_bed_leveling::adjust_mesh_to_mean(const float value) { void unified_bed_leveling::adjust_mesh_to_mean(const bool cflag, const float value) {
float sum = 0.0; float sum = 0.0;
int n = 0; int n = 0;
for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
@ -665,7 +665,7 @@
SERIAL_ECHO_F(sigma, 6); SERIAL_ECHO_F(sigma, 6);
SERIAL_EOL(); SERIAL_EOL();
if (g29_c_flag) if (cflag)
for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
if (!isnan(z_values[x][y])) if (!isnan(z_values[x][y]))
@ -1081,7 +1081,7 @@
SERIAL_EOL(); SERIAL_EOL();
#endif #endif
adjust_mesh_to_mean(g29_constant); adjust_mesh_to_mean(g29_c_flag, g29_constant);
#if HAS_BED_PROBE #if HAS_BED_PROBE
SERIAL_PROTOCOLPGM("zprobe_zoffset: "); SERIAL_PROTOCOLPGM("zprobe_zoffset: ");

2
Marlin/src/gcode/bedlevel/M420.cpp
View File

@ -116,7 +116,7 @@ void GcodeSuite::M420() {
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
set_bed_leveling_enabled(false); set_bed_leveling_enabled(false);
ubl.adjust_mesh_to_mean(cval); ubl.adjust_mesh_to_mean(true, cval);
#else #else