bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

change G26 and G29 bit function names to avoid HAL collision

Browse Source
This commit is contained in:
Roxy-3D
2017-11-25 19:35:27 -06:00
committed by Scott Lahteine
parent 41ec449960
commit e48fcad615
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1422,7 +1422,7 @@
if ( (type == INVALID && isnan(z_values[i][j])) // Check to see if this location holds the right thing
|| (type == REAL && !isnan(z_values[i][j]))
|| (type == SET_IN_BITMAP && is_bit_set(bits, i, j))
|| (type == SET_IN_BITMAP && is_bitmap_set(bits, i, j))
) {
// We only get here if we found a Mesh Point of the specified type
@ -1490,8 +1490,8 @@
if (location.x_index < 0) break; // stop when we can't find any more reachable points.
bit_clear(not_done, location.x_index, location.y_index); // Mark this location as 'adjusted' so we will find a
// different location the next time through the loop
bitmap_clear(not_done, location.x_index, location.y_index); // Mark this location as 'adjusted' so we will find a
// different location the next time through the loop
const float rawx = mesh_index_to_xpos(location.x_index),
rawy = mesh_index_to_ypos(location.y_index);