Add safety buffer to Y and woodpile rasters

tests/test_tiff_to_gcode.py

@@ -483,6 +483,7 @@ def test_woodpile_raster_switches_print_axis_between_layers(tmp_path) -> None:
         pressure=25,
         valve=7,
         port=3,
+        fil_width=1.0,
         raster_pattern=RASTER_PATTERN_WOODPILE,
     )
 
@@ -509,10 +510,10 @@ def test_woodpile_raster_switches_print_axis_between_layers(tmp_path) -> None:
                 y += float(token[1:])
         x_positions.append(x)
         y_positions.append(y)
-    assert min(x_positions) >= 0.0
-    assert max(x_positions) <= 3.0
-    assert min(y_positions) >= 0.0
-    assert max(y_positions) <= 2.0
+    assert min(x_positions) == -1.0
+    assert max(x_positions) == 4.0
+    assert min(y_positions) == -1.0
+    assert max(y_positions) == 3.0
 
 
 def test_y_direction_raster_prints_each_layer_along_y_axis(tmp_path) -> None:
@@ -533,6 +534,7 @@ def test_y_direction_raster_prints_each_layer_along_y_axis(tmp_path) -> None:
         pressure=25,
         valve=7,
         port=3,
+        fil_width=1.0,
         raster_pattern=RASTER_PATTERN_Y_DIRECTION,
     )
 
@@ -562,8 +564,8 @@ def test_y_direction_raster_prints_each_layer_along_y_axis(tmp_path) -> None:
         y_positions.append(y)
     assert min(x_positions) >= 0.0
     assert max(x_positions) <= 3.0
-    assert min(y_positions) >= 0.0
-    assert max(y_positions) <= 2.0
+    assert min(y_positions) == -1.0
+    assert max(y_positions) == 3.0
 
 
 def test_contour_tracing_skips_inactive_nozzle_outline(tmp_path) -> None:

tiff_to_gcode.py

@@ -742,6 +742,16 @@ def _woodpile_layer_segments(
             prev_row = row_values[0]
             prev_color = int(color_img[prev_row, col])
             x = (int(col) + 0.5) * pixel_size
+            if forward:
+                sweep_start_y = f_idx * pixel_size
+                segments.append(
+                    (x, sweep_start_y - pixel_size, x, sweep_start_y, 0)
+                )
+            else:
+                sweep_start_y = (l_idx + 1) * pixel_size
+                segments.append(
+                    (x, sweep_start_y + pixel_size, x, sweep_start_y, 0)
+                )
             for row in row_values[1:]:
                 this_color = int(color_img[row, col])
                 if this_color == prev_color:
@@ -763,6 +773,10 @@ def _woodpile_layer_segments(
                 start_y = (run_start + 1) * pixel_size
                 end_y = prev_row * pixel_size
             segments.append((x, start_y, x, end_y, prev_color))
+            if forward:
+                segments.append((x, end_y, x, end_y + pixel_size, 0))
+            else:
+                segments.append((x, end_y, x, end_y - pixel_size, 0))
         return segments
 
     first_nonblank = np.where(mask.any(axis=1), mask.argmax(axis=1), -1)
@@ -781,6 +795,12 @@ def _woodpile_layer_segments(
         prev_col = col_values[0]
         prev_color = int(color_img[row, prev_col])
         y = (int(row) + 0.5) * pixel_size
+        if forward:
+            sweep_start_x = f_idx * pixel_size
+            segments.append((sweep_start_x - pixel_size, y, sweep_start_x, y, 0))
+        else:
+            sweep_start_x = (l_idx + 1) * pixel_size
+            segments.append((sweep_start_x + pixel_size, y, sweep_start_x, y, 0))
         for col in col_values[1:]:
             this_color = int(color_img[row, col])
             if this_color == prev_color:
@@ -802,6 +822,10 @@ def _woodpile_layer_segments(
             start_x = (run_start + 1) * pixel_size
             end_x = prev_col * pixel_size
         segments.append((start_x, y, end_x, y, prev_color))
+        if forward:
+            segments.append((end_x, y, end_x + pixel_size, y, 0))
+        else:
+            segments.append((end_x, y, end_x - pixel_size, y, 0))
     return segments