kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

CAM: Fix uccnc postprocessor for G2|G3 (#23194)

Browse Source
This commit is contained in:
tarman3
2025-09-02 19:20:14 +03:00
committed by GitHub
parent 96f32cae5a
commit 4fc408910c
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Mod/CAM/Path/Post/scripts/uccnc_post.py
View File

@@ -552,25 +552,17 @@ def parse(pathobj):
precision_string = "." + str(PRECISION) + "f"
currLocation = {} # keep track for no doubles
# Command which can not skip parameters
mandatoryCmd = ("G81", "G82", "G83")
# Int parameters which can not be skipped
mandatoryParamInt = ("D", "H", "S", "T")
# Float parameters which can not be skipped
mandatoryParamFloat = ("I", "J", "K")
# The params list control the order of parameters
params = [
"X",
"Y",
"Z",
"A",
"B",
"C",
"I",
"J",
"K",
"R",
"F",
"S",
"T",
"H",
"L",
"Q",
]
params = ("X", "Y", "Z", "A", "B", "C", "I", "J", "K", "R", "F", "S", "T", "H", "L", "Q")
firstmove = Path.Command("G0", {"X": -1, "Y": -1, "Z": -1, "F": 0.0})
currLocation.update(firstmove.Parameters) # set First location Parameters
@@ -623,17 +615,15 @@ def parse(pathobj):
)
else:
continue
elif param == "T":
commandlist.append(param + str(int(c.Parameters["T"])))
elif param == "H":
commandlist.append(param + str(int(c.Parameters["H"])))
elif param == "D":
commandlist.append(param + str(int(c.Parameters["D"])))
elif param == "S":
commandlist.append(param + str(int(c.Parameters["S"])))
elif param in mandatoryParamInt:
commandlist.append(param + str(int(c.Parameters[param])))
elif param in mandatoryParamFloat:
commandlist.append(
param + format(float(c.Parameters[param]), precision_string)
)
else:
if (
(not REPEAT_ARGUMENTS and c.Name not in ["G81", "G82", "G83"])
(not REPEAT_ARGUMENTS and c.Name not in mandatoryCmd)
and (param in currLocation)
and (currLocation[param] == c.Parameters[param])
):