fixed gcode generation

2024-11-18 15:14:47 +01:00
parent bf8671da84 783bf5bba9
commit d24e9e3013
15 changed files with 94 additions and 31 deletions
--- a/plotter-app/test_gcode.gcode
+++ b/plotter-app/test_gcode.gcode
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 G21   ;Unit to mm
 G90   ;Absolute positioning

@@ -407,3 +408,5 @@ G1 X131.07142857142858 Y7.5 Z0
 G0 Z5
 G0 X0.0 Y0.0 Z5
 M5
+=======
+>>>>>>> 783bf5bba9b28d0143a951285a2280d6fd0f3eeb