Skip to content

Add support for Excellon G85 commands. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for Excellon G85 commands. #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 49 additions & 19 deletions gerbmerge/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@

# Patterns for Excellon interpretation
xtool_pat = re.compile(r'^(T\d+)$') # Tool selection
xydraw_pat = re.compile(r'^X([+-]?\d+)Y([+-]?\d+)$') # Plunge command
xydraw_pat2 = re.compile(r'^X([+-]?\d+\.\d*)Y([+-]?\d+\.\d*)$') # Plunge command
xydraw_pat = re.compile(r'^X([+-]?\d+)Y([+-]?\d+)(?:G85X([+-]?\d+)Y([+-]?\d+))?$') # Plunge command with optional G85
xydraw_pat2 = re.compile(r'^X([+-]?\d+\.\d*)Y([+-]?\d+\.\d*)(?:G85X([+-]?\d+\.\d*)Y([+-]?\d+\.\d*))?$') # Plunge command with optional G85
xdraw_pat = re.compile(r'^X([+-]?\d+)$') # Plunge command, repeat last Y value
ydraw_pat = re.compile(r'^Y([+-]?\d+)$') # Plunge command, repeat last X value
xtdef_pat = re.compile(r'^(T\d+)(?:F\d+)?(?:S\d+)?C([0-9.]+)$') # Tool+diameter definition with optional
Expand Down Expand Up @@ -174,8 +174,9 @@ def __init__(self, name):
# This is to help sorting all jobs and writing out all plunge
# commands for a single tool.
#
# The key to this dictionary is the full tool name, e.g., T03
# as a string. Each command is an (X,Y) integer tuple.
# The key to this dictionary is the full tool name, e.g., T03 as a
# string. Each command is an (X,Y,STOP_X,STOP_Y) integer tuple.
# STOP_X and STOP_Y are not none only if this is a G85 command.
self.xcommands = {}

# This is a dictionary mapping LOCAL tool names (e.g., T03) to diameters
Expand Down Expand Up @@ -265,6 +266,11 @@ def fixcoordinates(self, x_shift, y_shift):
and ( type( command_list[1] ) == types.IntType ): ## ensure that first two elemenst are integers
command_list[0] += x_shift / 10
command_list[1] += y_shift / 10
if ( type( command_list[2] ) == types.IntType ) \
and ( type( command_list[3] ) == types.IntType ): ## ensure that first two elemenst are integerslen(command_list) == 4:
# G85 command, need to shift the second pair of xy, too.
command_list[2] += x_shift / 10
command_list[3] += y_shift / 10
command[index] = tuple(command_list) ## convert list back to tuple

self.xcommands[tool] = command ## set modified command
Expand Down Expand Up @@ -652,16 +658,22 @@ def parseExcellon(self, fullname):
def xln2tenthou(L, divisor=divisor, zeropadto=zeropadto):
V = []
for s in L:
if not suppress_leading:
s = s + '0'*(zeropadto-len(s))
V.append(int(round(int(s)*divisor)))
if s is not None:
if not suppress_leading:
s = s + '0'*(zeropadto-len(s))
V.append(int(round(int(s)*divisor)))
else:
V.append(None)
return tuple(V)

# Helper function to convert X/Y strings into integers in units of ten-thousandth of an inch.
def xln2tenthou2 (L, divisor=divisor, zeropadto=zeropadto):
V = []
for s in L:
V.append(int(float(s)*1000*divisor))
if s is not None:
V.append(int(float(s)*1000*divisor))
else:
V.append(None)
return tuple(V)

for line in fid.xreadlines():
Expand Down Expand Up @@ -751,11 +763,11 @@ def xln2tenthou2 (L, divisor=divisor, zeropadto=zeropadto):
# Plunge command?
match = xydraw_pat.match(line)
if match:
x, y = xln2tenthou(match.groups())
x, y, stop_x, stop_y = xln2tenthou(match.groups())
else:
match = xydraw_pat2.match(line)
if match:
x, y = xln2tenthou2(match.groups())
x, y, stop_x, stop_y = xln2tenthou2(match.groups())
else:
match = xdraw_pat.match(line)
if match:
Expand All @@ -772,9 +784,9 @@ def xln2tenthou2 (L, divisor=divisor, zeropadto=zeropadto):
raise RuntimeError, 'File %s has plunge command without previous tool selection' % fullname

try:
self.xcommands[currtool].append((x,y))
self.xcommands[currtool].append((x,y,stop_x,stop_y))
except KeyError:
self.xcommands[currtool] = [(x,y)]
self.xcommands[currtool] = [(x,y,stop_x,stop_y)]

last_x = x
last_y = y
Expand Down Expand Up @@ -888,10 +900,17 @@ def formatForXln(num):
for ltool in ltools:
if self.xcommands.has_key(ltool):
for cmd in self.xcommands[ltool]:
x, y = cmd
x, y, stop_x, stop_y = cmd
new_x = x+DX
new_y = y+DY
fid.write('X%sY%s\n' % (formatForXln(new_x), formatForXln(new_y)))
if stop_x is None:
fid.write('X%sY%s\n' % (formatForXln(new_x), formatForXln(new_y)))
else:
new_stop_x = stop_x+DX
new_stop_y = stop_y+DY
fid.write('X%sY%sG85X%sY%s\n' %
(formatForXln(new_x), formatForXln(new_y),
formatForXln(new_stop_x), formatForXln(new_stop_y)))

def writeDrillHits(self, fid, diameter, toolNum, Xoff, Yoff):
"""Write a drill hit pattern. diameter is tool diameter in inches, while toolNum is
Expand Down Expand Up @@ -919,10 +938,12 @@ def writeDrillHits(self, fid, diameter, toolNum, Xoff, Yoff):
for ltool in ltools:
if self.xcommands.has_key(ltool):
for cmd in self.xcommands[ltool]:
x, y = cmd
x, y, stop_x, stop_y = cmd
# add metric support (1/1000 mm vs. 1/100,000 inch)
# TODO - verify metric scaling is correct???
makestroke.drawDrillHit(fid, 10*x+DX, 10*y+DY, toolNum)
if stop_x is not None:
makestroke.drawDrillHit(fid, 10*stop_x+DX, 10*stop_y+DY, toolNum)

def aperturesAndMacros(self, layername):
"Return dictionaries whose keys are all necessary aperture names and macro names for this layer"
Expand Down Expand Up @@ -1138,8 +1159,9 @@ def trimExcellon(self):
keys = self.xcommands.keys()
for toolname in keys:
# Remember Excellon is 2.4 format while Gerber data is 2.5 format
validList = [(x,y) for x,y in self.xcommands[toolname] if self.inBorders(10*x,10*y)]

validList = [tup for tup in self.xcommands[toolname]
if (self.inBorders(10*tup[0],10*tup[1]) and
(tup[2] is None or self.inBorders(10*tup[2],10*tup[3])))]
if validList:
self.xcommands[toolname] = validList
else:
Expand Down Expand Up @@ -1424,7 +1446,7 @@ def rotateJob(job, degrees = 90, firstpass = True):
for tool in job.xcommands.keys():
J.xcommands[tool] = []

for x,y in job.xcommands[tool]:
for x,y,stop_x,stop_y in job.xcommands[tool]:
# add metric support (1/1000 mm vs. 1/100,000 inch)
# NOTE: There don't appear to be any need for a change. The usual x10 factor seems to apply

Expand All @@ -1434,8 +1456,16 @@ def rotateJob(job, degrees = 90, firstpass = True):
newx = int(round(newx/10.0))
newy = int(round(newy/10.0))

if stop_x is not None:
newstop_x = -(10*stop_y - job.miny) + job.minx + offset
newstop_y = (10*stop_x - job.minx) + job.miny

J.xcommands[tool].append((newx,newy))
newstop_x = int(round(newstop_x/10.0))
newstop_y = int(round(newstop_y/10.0))
else:
newstop_x = None
newstop_y = None
J.xcommands[tool].append((newx,newy,newstop_x,newstop_y))

# Rotate some more if required
degrees -= 90
Expand Down