SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

One fewer G29 error string

Browse source
This commit is contained in:
Scott Lahteine 2019-03-05 07:53:15 -06:00
parent 543fc4c117
commit 39f1222060
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

@ -1737,25 +1737,20 @@
* use cases for the users. So we can wait and see what to do with it. * use cases for the users. So we can wait and see what to do with it.
*/ */
void unified_bed_leveling::g29_compare_current_mesh_to_stored_mesh() { void unified_bed_leveling::g29_compare_current_mesh_to_stored_mesh() {
int16_t a = settings.calc_num_meshes(); const int16_t a = settings.calc_num_meshes();
if (!a) { if (!a) {
SERIAL_ECHOLNPGM("?EEPROM storage not available."); SERIAL_ECHOLNPGM("?EEPROM storage not available.");
return; return;
} }
if (!parser.has_value()) { if (!parser.has_value() || !WITHIN(g29_storage_slot, 0, a - 1)) {
SERIAL_ECHOLNPAIR("?Storage slot # required.\n?Use 0 to ", a - 1); SERIAL_ECHOLNPAIR("?Invalid storage slot.\n?Use 0 to ", a - 1);
return; return;
} }
g29_storage_slot = parser.value_int(); g29_storage_slot = parser.value_int();
if (!WITHIN(g29_storage_slot, 0, a - 1)) {
SERIAL_ECHOLNPAIR("?Invalid storage slot.\n?Use 0 to ", a - 1);
return;
}
float tmp_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y]; float tmp_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
settings.load_mesh(g29_storage_slot, &tmp_z_values); settings.load_mesh(g29_storage_slot, &tmp_z_values);