Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixes "Fix from MarlinFirmware#17770 breaks compiling with AUTO_BED_LEVELING_BILINEAR MarlinFirmware#18545"
  • Loading branch information
oliver-eifler committed Jul 5, 2020
1 parent c1da483 commit 80f5614
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Marlin/src/gcode/bedlevel/abl/G29.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ G29_TYPE GcodeSuite::G29() {

#if ENABLED(AUTO_BED_LEVELING_LINEAR)
ABL_VAR int abl_points;
#elif ENABLED(PROBE_MANUALLY) // Bilinear
#elif EITHER(PROBE_MANUALLY,AUTO_BED_LEVELING_BILINEAR) // Bilinear
int constexpr abl_points = GRID_MAX_POINTS;
#endif

Expand Down Expand Up @@ -644,7 +644,7 @@ G29_TYPE GcodeSuite::G29() {
if (TERN0(IS_KINEMATIC, !probe.can_reach(probePos))) continue;

if (verbose_level) SERIAL_ECHOLNPAIR("Probing mesh point ", int(pt_index), "/", abl_points, ".");
TERN_(HAS_DISPLAY, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), int(pt_index), int(GRID_MAX_POINTS)));
TERN_(HAS_DISPLAY, ui.status_printf_P(0, PSTR(S_FMT " %i/%i"), GET_TEXT(MSG_PROBING_MESH), int(pt_index), int(abl_points)));

measured_z = faux ? 0.001f * random(-100, 101) : probe.probe_at_point(probePos, raise_after, verbose_level);

Expand Down

0 comments on commit 80f5614

Please sign in to comment.