feat: pen omlaag op 10 en geen pauze na de pen
De oude standaard van 5 mm en 120 ms blijft alleen staan als die bewust was aangepast.
@@ -589,6 +589,13 @@ function applySaved (saved)
589
589
if (settings.penUpZ != null) $("pen-up").value = settings.penUpZ;
590
590
if (settings.penDownZ != null) $("pen-down").value = settings.penDownZ;
591
591
if (settings.dwellMs != null) $("dwell").value = settings.dwellMs;
592
if (!localStorage.getItem("timdraw-pen-v2"))
593
{
594
if (settings.penDownZ == null || Number(settings.penDownZ) === 5) $("pen-down").value = "10";
595
if (settings.dwellMs == null || Number(settings.dwellMs) === 120) $("dwell").value = "0";
596
localStorage.setItem("timdraw-pen-v2", "1");
597
persist();
598
}
592
599
if (localStorage.getItem("timdraw-origin-v2") && settings.origin) $("origin").value = settings.origin;
593
600
else $("origin").value = "top-left";
594
601
localStorage.setItem("timdraw-origin-v2", "1");
@@ -589,6 +589,13 @@ function applySaved (saved)589
if (settings.penUpZ != null) $("pen-up").value = settings.penUpZ;589
if (settings.penUpZ != null) $("pen-up").value = settings.penUpZ;590
if (settings.penDownZ != null) $("pen-down").value = settings.penDownZ;590
if (settings.penDownZ != null) $("pen-down").value = settings.penDownZ;591
if (settings.dwellMs != null) $("dwell").value = settings.dwellMs;591
if (settings.dwellMs != null) $("dwell").value = settings.dwellMs;592
if (!localStorage.getItem("timdraw-pen-v2"))593
{594
if (settings.penDownZ == null || Number(settings.penDownZ) === 5) $("pen-down").value = "10";595
if (settings.dwellMs == null || Number(settings.dwellMs) === 120) $("dwell").value = "0";596
localStorage.setItem("timdraw-pen-v2", "1");597
persist();598
}592
if (localStorage.getItem("timdraw-origin-v2") && settings.origin) $("origin").value = settings.origin;599
if (localStorage.getItem("timdraw-origin-v2") && settings.origin) $("origin").value = settings.origin;593
else $("origin").value = "top-left";600
else $("origin").value = "top-left";594
localStorage.setItem("timdraw-origin-v2", "1");601
localStorage.setItem("timdraw-origin-v2", "1");@@ -190,11 +190,11 @@
190
190
<input id="pen-up" type="number" min="0" max="12" step="0.1" value="0">
191
191
</label>
192
192
<label class="field">Pen omlaag Z
193
<input id="pen-down" type="number" min="0" max="12" step="0.1" value="5">
193
<input id="pen-down" type="number" min="0" max="12" step="0.1" value="10">
194
194
</label>
195
195
</div>
196
196
<label class="field">Pauze na pen ms
197
<input id="dwell" type="number" min="0" max="2000" step="10" value="120">
197
<input id="dwell" type="number" min="0" max="2000" step="10" value="0">
198
198
</label>
199
199
<label class="field">Nulpunt
200
200
<select id="origin">
@@ -190,11 +190,11 @@190
<input id="pen-up" type="number" min="0" max="12" step="0.1" value="0">190
<input id="pen-up" type="number" min="0" max="12" step="0.1" value="0">191
</label>191
</label>192
<label class="field">Pen omlaag Z192
<label class="field">Pen omlaag Z193
<input id="pen-down" type="number" min="0" max="12" step="0.1" value="5">193
<input id="pen-down" type="number" min="0" max="12" step="0.1" value="10">194
</label>194
</label>195
</div>195
</div>196
<label class="field">Pauze na pen ms196
<label class="field">Pauze na pen ms197
<input id="dwell" type="number" min="0" max="2000" step="10" value="120">197
<input id="dwell" type="number" min="0" max="2000" step="10" value="0">198
</label>198
</label>199
<label class="field">Nulpunt199
<label class="field">Nulpunt200
<select id="origin">200
<select id="origin">@@ -153,8 +153,8 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:
153
153
draw_speed = _clamp(float(settings.get("drawSpeed", 3000)), 50, 6000)
154
154
travel_speed = _clamp(float(settings.get("travelSpeed", 5000)), 50, 6000)
155
155
pen_up = _clamp(float(settings.get("penUpZ", 0)), 0, 12)
156
pen_down = _clamp(float(settings.get("penDownZ", 5)), 0, 12)
157
dwell = _clamp(float(settings.get("dwellMs", 120)), 0, 2000) / 1000.0
156
pen_down = _clamp(float(settings.get("penDownZ", 10)), 0, 12)
157
dwell = _clamp(float(settings.get("dwellMs", 0)), 0, 2000) / 1000.0
158
158
origin_top = settings.get("origin") == "top-left"
159
159
trace = bool(settings.get("trace"))
160
160
per_object = bool(settings.get("perObject"))
@@ -153,8 +153,8 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:153
draw_speed = _clamp(float(settings.get("drawSpeed", 3000)), 50, 6000)153
draw_speed = _clamp(float(settings.get("drawSpeed", 3000)), 50, 6000)154
travel_speed = _clamp(float(settings.get("travelSpeed", 5000)), 50, 6000)154
travel_speed = _clamp(float(settings.get("travelSpeed", 5000)), 50, 6000)155
pen_up = _clamp(float(settings.get("penUpZ", 0)), 0, 12)155
pen_up = _clamp(float(settings.get("penUpZ", 0)), 0, 12)156
pen_down = _clamp(float(settings.get("penDownZ", 5)), 0, 12)156
pen_down = _clamp(float(settings.get("penDownZ", 10)), 0, 12)157
dwell = _clamp(float(settings.get("dwellMs", 120)), 0, 2000) / 1000.0157
dwell = _clamp(float(settings.get("dwellMs", 0)), 0, 2000) / 1000.0158
origin_top = settings.get("origin") == "top-left"158
origin_top = settings.get("origin") == "top-left"159
trace = bool(settings.get("trace"))159
trace = bool(settings.get("trace"))160
per_object = bool(settings.get("perObject"))160
per_object = bool(settings.get("perObject"))@@ -459,7 +459,7 @@ class Machine:
459
459
self._track_until = time.time() + max(0.4, math.hypot(dx, dy) / feed * 60.0 + 0.6)
460
460
return notice
461
461
462
def pen(self, down: bool, up_z: float = 0, down_z: float = 5, feed: float = 5000) -> None:
462
def pen(self, down: bool, up_z: float = 0, down_z: float = 10, feed: float = 5000) -> None:
463
463
z = down_z if down else up_z
464
464
z = max(0, min(12, z))
465
465
feed = max(50, min(self.max_rate or 6000, feed))
@@ -459,7 +459,7 @@ class Machine:459
self._track_until = time.time() + max(0.4, math.hypot(dx, dy) / feed * 60.0 + 0.6)459
self._track_until = time.time() + max(0.4, math.hypot(dx, dy) / feed * 60.0 + 0.6)460
return notice460
return notice461
461
462
def pen(self, down: bool, up_z: float = 0, down_z: float = 5, feed: float = 5000) -> None:462
def pen(self, down: bool, up_z: float = 0, down_z: float = 10, feed: float = 5000) -> None:463
z = down_z if down else up_z463
z = down_z if down else up_z464
z = max(0, min(12, z))464
z = max(0, min(12, z))465
feed = max(50, min(self.max_rate or 6000, feed))465
feed = max(50, min(self.max_rate or 6000, feed))@@ -60,7 +60,7 @@ def test_text_and_gcode() -> None:
60
60
"strokes": heart["strokes"], "fills": heart["fills"],
61
61
}
62
62
planned = plan([obj], {"drawSpeed": 2500, "travelSpeed": 4000, "origin": "bottom-left"})
63
check("g-code bevat G21 en pen", "G21" in planned["gcode"] and "G1 Z5.000" in planned["gcode"])
63
check("g-code bevat G21 en pen", "G21" in planned["gcode"] and "G1 Z10.000" in planned["gcode"])
64
64
check("vulling maakt arcering", len(planned["draw"]) > len(heart["strokes"]), f"{len(planned['draw'])} lijnen")
65
65
both = dict(obj)
66
66
both["drawLine"] = True
@@ -87,9 +87,10 @@ def test_text_and_gcode() -> None:
87
87
check("blad ligt rechts en onder het nulpunt", "X20.000 Y-20.000" in corner["gcode"])
88
88
check("papierrand linksboven", _page_point(0, 297, True) == (-10.0, 4.0), str(_page_point(0, 297, True)))
89
89
check("papierrand rechtsonder", _page_point(200, 0, True) == (190.0, -293.0), str(_page_point(200, 0, True)))
90
check("pen gebruikt verplaatsingssnelheid", "G1 Z5.000 F4000" in planned["gcode"])
90
check("pen gebruikt verplaatsingssnelheid", "G1 Z10.000 F4000" in planned["gcode"])
91
check("standaard geen pauze na de pen", "G4 P0.120" not in planned["gcode"])
91
92
check("pen omhoog houdt de as vast", "G1 Z0.000" in planned["gcode"] and "$1=25\n" not in planned["gcode"])
92
check("pen omlaag vergrendelt", "$1=255\nG1 Z5.000" in planned["gcode"])
93
check("pen omlaag vergrendelt", "$1=255\nG1 Z10.000" in planned["gcode"])
93
94
linked = plan([{
94
95
"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,
95
96
"strokes": [
@@ -179,7 +180,7 @@ def test_text_and_gcode() -> None:
179
180
{"pts": inner, "closed": True},
180
181
],
181
182
}], {"origin": "top-left", "trace": True, "returnHome": False})
182
check("voorbeeld laat de pen omhoog", "Z5" not in traced["gcode"], traced["gcode"])
183
check("voorbeeld laat de pen omhoog", "Z10" not in traced["gcode"], traced["gcode"])
183
184
check("voorbeeld volgt de buitenkant", "X80.000" in traced["gcode"])
184
185
arc_lines = [line for line in traced["gcode"].splitlines() if line.startswith(("G2 ", "G3 "))]
185
186
check("voorbeeld houdt hoeken recht", not arc_lines, " | ".join(arc_lines))
@@ -60,7 +60,7 @@ def test_text_and_gcode() -> None:60
"strokes": heart["strokes"], "fills": heart["fills"],60
"strokes": heart["strokes"], "fills": heart["fills"],61
}61
}62
planned = plan([obj], {"drawSpeed": 2500, "travelSpeed": 4000, "origin": "bottom-left"})62
planned = plan([obj], {"drawSpeed": 2500, "travelSpeed": 4000, "origin": "bottom-left"})63
check("g-code bevat G21 en pen", "G21" in planned["gcode"] and "G1 Z5.000" in planned["gcode"])63
check("g-code bevat G21 en pen", "G21" in planned["gcode"] and "G1 Z10.000" in planned["gcode"])64
check("vulling maakt arcering", len(planned["draw"]) > len(heart["strokes"]), f"{len(planned['draw'])} lijnen")64
check("vulling maakt arcering", len(planned["draw"]) > len(heart["strokes"]), f"{len(planned['draw'])} lijnen")65
both = dict(obj)65
both = dict(obj)66
both["drawLine"] = True66
both["drawLine"] = True@@ -87,9 +87,10 @@ def test_text_and_gcode() -> None:87
check("blad ligt rechts en onder het nulpunt", "X20.000 Y-20.000" in corner["gcode"])87
check("blad ligt rechts en onder het nulpunt", "X20.000 Y-20.000" in corner["gcode"])88
check("papierrand linksboven", _page_point(0, 297, True) == (-10.0, 4.0), str(_page_point(0, 297, True)))88
check("papierrand linksboven", _page_point(0, 297, True) == (-10.0, 4.0), str(_page_point(0, 297, True)))89
check("papierrand rechtsonder", _page_point(200, 0, True) == (190.0, -293.0), str(_page_point(200, 0, True)))89
check("papierrand rechtsonder", _page_point(200, 0, True) == (190.0, -293.0), str(_page_point(200, 0, True)))90
check("pen gebruikt verplaatsingssnelheid", "G1 Z5.000 F4000" in planned["gcode"])90
check("pen gebruikt verplaatsingssnelheid", "G1 Z10.000 F4000" in planned["gcode"])91
check("standaard geen pauze na de pen", "G4 P0.120" not in planned["gcode"])91
check("pen omhoog houdt de as vast", "G1 Z0.000" in planned["gcode"] and "$1=25\n" not in planned["gcode"])92
check("pen omhoog houdt de as vast", "G1 Z0.000" in planned["gcode"] and "$1=25\n" not in planned["gcode"])92
check("pen omlaag vergrendelt", "$1=255\nG1 Z5.000" in planned["gcode"])93
check("pen omlaag vergrendelt", "$1=255\nG1 Z10.000" in planned["gcode"])93
linked = plan([{94
linked = plan([{94
"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,95
"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,95
"strokes": [96
"strokes": [@@ -179,7 +180,7 @@ def test_text_and_gcode() -> None:179
{"pts": inner, "closed": True},180
{"pts": inner, "closed": True},180
],181
],181
}], {"origin": "top-left", "trace": True, "returnHome": False})182
}], {"origin": "top-left", "trace": True, "returnHome": False})182
check("voorbeeld laat de pen omhoog", "Z5" not in traced["gcode"], traced["gcode"])183
check("voorbeeld laat de pen omhoog", "Z10" not in traced["gcode"], traced["gcode"])183
check("voorbeeld volgt de buitenkant", "X80.000" in traced["gcode"])184
check("voorbeeld volgt de buitenkant", "X80.000" in traced["gcode"])184
arc_lines = [line for line in traced["gcode"].splitlines() if line.startswith(("G2 ", "G3 "))]185
arc_lines = [line for line in traced["gcode"].splitlines() if line.startswith(("G2 ", "G3 "))]185
check("voorbeeld houdt hoeken recht", not arc_lines, " | ".join(arc_lines))186
check("voorbeeld houdt hoeken recht", not arc_lines, " | ".join(arc_lines))@@ -159,7 +159,7 @@ class Handler(BaseHTTPRequestHandler):
159
159
MACHINE.pen(
160
160
bool(data.get("down")),
161
161
float(data.get("penUpZ", 0)),
162
float(data.get("penDownZ", 5)),
162
float(data.get("penDownZ", 10)),
163
163
float(data.get("travelSpeed") or 5000),
164
164
)
165
165
elif path == "/api/home":
@@ -159,7 +159,7 @@ class Handler(BaseHTTPRequestHandler):159
MACHINE.pen(159
MACHINE.pen(160
bool(data.get("down")),160
bool(data.get("down")),161
float(data.get("penUpZ", 0)),161
float(data.get("penUpZ", 0)),162
float(data.get("penDownZ", 5)),162
float(data.get("penDownZ", 10)),163
float(data.get("travelSpeed") or 5000),163
float(data.get("travelSpeed") or 5000),164
)164
)165
elif path == "/api/home":165
elif path == "/api/home":