3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcode_arcs: Allow either one of I, J, K to be default-zero on G2/G3 (#5939) 

Signed-off-by: Wijnand Modderman-Lenstra <maze@pyth0n.org>
This commit is contained in:
maze 2022-12-14 18:06:11 +01:00 committed by GitHub
parent 69f76b3b66
commit 347dfa58ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
klippy/extras/gcode_arcs.py
View File

@ -84,7 +84,7 @@ class ArcSupport:
asPlanar = [ gcmd.get_float(a, 0.) for i,a in enumerate('JK') ] asPlanar = [ gcmd.get_float(a, 0.) for i,a in enumerate('JK') ]
axes = (Y_AXIS, Z_AXIS, X_AXIS) axes = (Y_AXIS, Z_AXIS, X_AXIS)
if not asPlanar[0] or not asPlanar[1]: if not (asPlanar[0] or asPlanar[1]):
raise gcmd.error("G2/G3 requires IJ, IK or JK parameters") raise gcmd.error("G2/G3 requires IJ, IK or JK parameters")
asE = gcmd.get_float("E", None) asE = gcmd.get_float("E", None)

18
test/klippy/gcode_arcs.test
View File

@ -11,6 +11,12 @@ G2 X125 Y32 Z20 E1 I10.5 J10.5
# XY+Z arc move # XY+Z arc move
G2 X20 Y20 Z10 E1 I10.5 J10.5 G2 X20 Y20 Z10 E1 I10.5 J10.5
# allowable commands
G2 X20 Y20 I0 J10
G2 X20 Y20 J10
G2 X20 Y20 I10 J0
G2 X20 Y20 I10
# Home and move in XZ arc # Home and move in XZ arc
G28 G28
G90 G90
@ -21,6 +27,12 @@ G2 X125 Y20 Z32 E1 I10.5 K10.5
# XZ+Y arc move # XZ+Y arc move
G2 X20 Y10 Z20 E1 I10.5 K10.5 G2 X20 Y10 Z20 E1 I10.5 K10.5
# allowable commands
G2 X20 Y20 I0 K10
G2 X20 Y20 K10
G2 X20 Y20 I10 K0
G2 X20 Y20 I10
# Home and move in YZ arc # Home and move in YZ arc
G28 G28
G90 G90
@ -30,3 +42,9 @@ G2 X20 Y125 Z32 E1 J10.5 K10.5
# YZ+X arc move # YZ+X arc move
G2 X10 Y20 Z20 E1 J10.5 K10.5 G2 X10 Y20 Z20 E1 J10.5 K10.5
# allowable commands
G2 X20 Y20 J0 K10
G2 X20 Y20 K10
G2 X20 Y20 J10 K0
G2 X20 Y20 J10