Match G-code header command order

tests/test_tiff_to_gcode.py

@@ -0,0 +1,36 @@
+from __future__ import annotations
+
+import zipfile
+
+from PIL import Image
+
+from tiff_to_gcode import generate_snake_path_gcode
+
+
+def test_gcode_header_writes_presets_before_initial_aux_commands(tmp_path) -> None:
+    tiff_path = tmp_path / "slice_0000.tif"
+    Image.new("L", (1, 1), 0).save(tiff_path)
+
+    zip_path = tmp_path / "slices.zip"
+    with zipfile.ZipFile(zip_path, mode="w") as archive:
+        archive.write(tiff_path, arcname=tiff_path.name)
+
+    gcode_path = generate_snake_path_gcode(
+        zip_path,
+        shape_name="header_order",
+        pressure=25,
+        valve=7,
+        port=3,
+    )
+
+    lines = [
+        line.strip()
+        for line in gcode_path.read_text().splitlines()
+        if line.strip()
+    ]
+
+    assert lines[0] == "G91"
+    assert lines[1].startswith("{preset}serialPort3.write(")
+    assert lines[2].startswith("{preset}serialPort3.write(")
+    assert lines[3].startswith("{aux_command}WAGO_ValveCommands(")
+    assert lines[4].startswith("{aux_command}WAGO_ValveCommands(")

tiff_to_gcode.py

@@ -285,12 +285,12 @@ def generate_snake_path_gcode(
 
     with open(gcode_path, "w") as f:
         f.write("G91\n")
-        for color in color_dict:
-            f.write(_valve_cmd(color_dict[color], 0))
         for line in setpress_lines:
             f.write(f"{line}\n")
         for line in pressure_on_lines:
             f.write(f"{line}\n")
+        for color in color_dict:
+            f.write(_valve_cmd(color_dict[color], 0))
 
         pressure_next: str | None = None
         for i, move in enumerate(gcode_list):