|
@@ -327,7 +327,7 @@
|
327
|
327
|
|
328
|
328
|
for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
|
329
|
329
|
for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
|
330
|
|
- if (!is_bit_set(circle_flags, i, j)) {
|
|
330
|
+ if (!is_bitmap_set(circle_flags, i, j)) {
|
331
|
331
|
const float mx = _GET_MESH_X(i), // We found a circle that needs to be printed
|
332
|
332
|
my = _GET_MESH_Y(j);
|
333
|
333
|
|
|
@@ -353,7 +353,7 @@
|
353
|
353
|
}
|
354
|
354
|
}
|
355
|
355
|
}
|
356
|
|
- bit_set(circle_flags, return_val.x_index, return_val.y_index); // Mark this location as done.
|
|
356
|
+ bitmap_set(circle_flags, return_val.x_index, return_val.y_index); // Mark this location as done.
|
357
|
357
|
return return_val;
|
358
|
358
|
}
|
359
|
359
|
|
|
@@ -418,8 +418,8 @@
|
418
|
418
|
if (i < GRID_MAX_POINTS_X) { // We can't connect to anything to the right than GRID_MAX_POINTS_X.
|
419
|
419
|
// This is already a half circle because we are at the edge of the bed.
|
420
|
420
|
|
421
|
|
- if (is_bit_set(circle_flags, i, j) && is_bit_set(circle_flags, i + 1, j)) { // check if we can do a line to the left
|
422
|
|
- if (!is_bit_set(horizontal_mesh_line_flags, i, j)) {
|
|
421
|
+ if (is_bitmap_set(circle_flags, i, j) && is_bitmap_set(circle_flags, i + 1, j)) { // check if we can do a line to the left
|
|
422
|
+ if (!is_bitmap_set(horizontal_mesh_line_flags, i, j)) {
|
423
|
423
|
|
424
|
424
|
//
|
425
|
425
|
// We found two circles that need a horizontal line to connect them
|
|
@@ -445,15 +445,15 @@
|
445
|
445
|
}
|
446
|
446
|
print_line_from_here_to_there(sx, sy, g26_layer_height, ex, ey, g26_layer_height);
|
447
|
447
|
}
|
448
|
|
- bit_set(horizontal_mesh_line_flags, i, j); // Mark it as done so we don't do it again, even if we skipped it
|
|
448
|
+ bitmap_set(horizontal_mesh_line_flags, i, j); // Mark it as done so we don't do it again, even if we skipped it
|
449
|
449
|
}
|
450
|
450
|
}
|
451
|
451
|
|
452
|
452
|
if (j < GRID_MAX_POINTS_Y) { // We can't connect to anything further back than GRID_MAX_POINTS_Y.
|
453
|
453
|
// This is already a half circle because we are at the edge of the bed.
|
454
|
454
|
|
455
|
|
- if (is_bit_set(circle_flags, i, j) && is_bit_set(circle_flags, i, j + 1)) { // check if we can do a line straight down
|
456
|
|
- if (!is_bit_set( vertical_mesh_line_flags, i, j)) {
|
|
455
|
+ if (is_bitmap_set(circle_flags, i, j) && is_bitmap_set(circle_flags, i, j + 1)) { // check if we can do a line straight down
|
|
456
|
+ if (!is_bitmap_set( vertical_mesh_line_flags, i, j)) {
|
457
|
457
|
//
|
458
|
458
|
// We found two circles that need a vertical line to connect them
|
459
|
459
|
// Print it!
|
|
@@ -481,7 +481,7 @@
|
481
|
481
|
}
|
482
|
482
|
print_line_from_here_to_there(sx, sy, g26_layer_height, ex, ey, g26_layer_height);
|
483
|
483
|
}
|
484
|
|
- bit_set(vertical_mesh_line_flags, i, j); // Mark it as done so we don't do it again, even if skipped
|
|
484
|
+ bitmap_set(vertical_mesh_line_flags, i, j); // Mark it as done so we don't do it again, even if skipped
|
485
|
485
|
}
|
486
|
486
|
}
|
487
|
487
|
}
|