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

Fix ExtUI UBL method calls (#15704)

Browse source
This commit is contained in:
InsanityAutomation 2019-10-28 16:50:27 -04:00 committed by Scott Lahteine
parent d4f5821cd6
commit cc4d3a215e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -338,7 +338,7 @@
} }
z_values[cpos.x][cpos.y] = NAN; z_values[cpos.x][cpos.y] = NAN;
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
ExtUI::onMeshUpdate(closest, 0); ExtUI::onMeshUpdate(cpos, 0.0f);
#endif #endif
cnt++; cnt++;
} }
@ -541,7 +541,7 @@
else { else {
z_values[cpos.x][cpos.y] = g29_constant; z_values[cpos.x][cpos.y] = g29_constant;
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
ExtUI::onMeshUpdate(closest, g29_constant); ExtUI::onMeshUpdate(cpos, g29_constant);
#endif #endif
} }
} }
@ -783,7 +783,7 @@
); );
z_values[best.pos.x][best.pos.y] = measured_z; z_values[best.pos.x][best.pos.y] = measured_z;
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
ExtUI::onMeshUpdate(best, measured_z); ExtUI::onMeshUpdate(best.pos, measured_z);
#endif #endif
} }
SERIAL_FLUSH(); // Prevent host M105 buffer overrun. SERIAL_FLUSH(); // Prevent host M105 buffer overrun.
@ -1335,7 +1335,7 @@
if (!isnan(v2)) { if (!isnan(v2)) {
z_values[x][y] = v1 < v2 ? v1 : v1 + v1 - v2; z_values[x][y] = v1 < v2 ? v1 : v1 + v1 - v2;
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
ExtUI::onMeshUpdate(x, y, z_values[pos.x][pos.y]); ExtUI::onMeshUpdate(x, y, z_values[x][y]);
#endif #endif
return true; return true;
} }