summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gerber/layers.py20
-rw-r--r--gerber/render/theme.py2
2 files changed, 11 insertions, 11 deletions
diff --git a/gerber/layers.py b/gerber/layers.py
index 93f0e36..c9e451a 100644
--- a/gerber/layers.py
+++ b/gerber/layers.py
@@ -29,46 +29,46 @@ Hint = namedtuple('Hint', 'layer ext name')
hints = [
Hint(layer='top',
ext=['gtl', 'cmp', 'top', ],
- name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', ]
+ name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', 'F.Cu', ]
),
Hint(layer='bottom',
ext=['gbl', 'sld', 'bot', 'sol', 'bottom', ],
- name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', ]
+ name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', 'B.Cu', ]
),
Hint(layer='internal',
ext=['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1',
'g2', 'g3', 'g4', 'g5', 'g6', ],
name=['art', 'internal', 'pgp', 'pwr', 'gp1', 'gp2', 'gp3', 'gp4',
- 'gt5', 'gp6', 'gnd', 'ground', ]
+ 'gt5', 'gp6', 'gnd', 'ground', 'In1.Cu', 'In2.Cu', 'In3.Cu', 'In4.Cu']
),
Hint(layer='topsilk',
ext=['gto', 'sst', 'plc', 'ts', 'skt', 'topsilk', ],
- name=['sst01', 'topsilk', 'silk', 'slk', 'sst', ]
+ name=['sst01', 'topsilk', 'silk', 'slk', 'sst', 'F.SilkS']
),
Hint(layer='bottomsilk',
- ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk', ],
+ ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk', 'B.SilkS'],
name=['bsilk', 'ssb', 'botsilk', ]
),
Hint(layer='topmask',
ext=['gts', 'stc', 'tmk', 'smt', 'tr', 'topmask', ],
name=['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask',
- 'mst', ]
+ 'mst', 'F.Mask',]
),
Hint(layer='bottommask',
ext=['gbs', 'sts', 'bmk', 'smb', 'br', 'bottommask', ],
- name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', ]
+ name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', 'B.Mask',]
),
Hint(layer='toppaste',
ext=['gtp', 'tm', 'toppaste', ],
- name=['sp01', 'toppaste', 'pst']
+ name=['sp01', 'toppaste', 'pst', 'F.Paste']
),
Hint(layer='bottompaste',
ext=['gbp', 'bm', 'bottompaste', ],
- name=['sp02', 'botpaste', 'psb']
+ name=['sp02', 'botpaste', 'psb', 'B.Paste', ]
),
Hint(layer='outline',
ext=['gko', 'outline', ],
- name=['BDR', 'border', 'out', ]
+ name=['BDR', 'border', 'out', 'Edge.Cuts', ]
),
Hint(layer='ipc_netlist',
ext=['ipc'],
diff --git a/gerber/render/theme.py b/gerber/render/theme.py
index d382a8d..2887216 100644
--- a/gerber/render/theme.py
+++ b/gerber/render/theme.py
@@ -53,7 +53,7 @@ class Theme(object):
return getattr(self, key)
def get(self, key, noneval=None):
- val = getattr(self, key)
+ val = getattr(self, key, None)
return val if val is not None else noneval