@@ -126,7 +126,7 @@ def startPanelizer(self, args, board=None, ordering=None, logger=None):
126
126
127
127
# 'Extra' ordering instructions
128
128
# Any PCB_TEXT containing any of these keywords will be copied into the ordering instructions
129
- possibleExtras = ['clean' , 'Clean' , 'CLEAN' ]
129
+ possibleExtras = ['clean' , 'Clean' , 'CLEAN' , 'stackup' , 'Stackup' , 'STACKUP' ]
130
130
131
131
# Permutations for Ordering Instructions
132
132
possibleOrderingInstructions = [
@@ -428,7 +428,7 @@ def startPanelizer(self, args, board=None, ordering=None, logger=None):
428
428
sparkxLogoSeen = False
429
429
solderMask = None
430
430
silkscreen = None
431
- numLayers = "Layers: {}" .format (board .GetCopperLayerCount ())
431
+ copperLayers = "Layers: {}" .format (board .GetCopperLayerCount ()) # Should we trust the instructions or the tracks?!
432
432
controlledImpedance = None
433
433
finish = None
434
434
thickness = None
@@ -568,8 +568,8 @@ def startPanelizer(self, args, board=None, ordering=None, logger=None):
568
568
if "mask" in line or "Mask" in line or "MASK" in line :
569
569
solderMask = line
570
570
if "layers" in line or "Layers" in line or "LAYERS" in line :
571
- if numLayers is None : # Should we trust the instructions or the tracks?!
572
- numLayers = line
571
+ if copperLayers is None : # Should we trust the instructions or the tracks?!
572
+ copperLayers = line
573
573
if "impedance" in line or "Impedance" in line or "IMPEDANCE" in line :
574
574
controlledImpedance = line
575
575
if "finish" in line or "Finish" in line or "FINISH" in line :
@@ -1191,9 +1191,9 @@ def startPanelizer(self, args, board=None, ordering=None, logger=None):
1191
1191
if silkscreen is None :
1192
1192
silkscreen = "Silkscreen: White (Default)"
1193
1193
report += silkscreen + "\n "
1194
- if numLayers is None :
1195
- numLayers = "Layers: 2 (Default)"
1196
- report += numLayers + "\n "
1194
+ if copperLayers is None :
1195
+ copperLayers = "Layers: 2 (Default)"
1196
+ report += copperLayers + "\n "
1197
1197
if finish is None :
1198
1198
finish = "Finish: HASL Lead-free (Default)"
1199
1199
report += finish + "\n "
@@ -1236,12 +1236,12 @@ def startPanelizer(self, args, board=None, ordering=None, logger=None):
1236
1236
'Warning' , wx .OK | wx .ICON_WARNING )
1237
1237
silkscreen = "Silkscreen: White (Default)"
1238
1238
oi .write (silkscreen + "\n " )
1239
- if numLayers is None :
1239
+ if copperLayers is None :
1240
1240
if wx .GetApp () is not None and orderingInstructionsSeen :
1241
1241
resp = wx .MessageBox ("Number of layers not found!" ,
1242
1242
'Warning' , wx .OK | wx .ICON_WARNING )
1243
- numLayers = "Layers: 2 (Default)"
1244
- oi .write (numLayers + "\n " )
1243
+ copperLayers = "Layers: 2 (Default)"
1244
+ oi .write (copperLayers + "\n " )
1245
1245
if finish is None :
1246
1246
if wx .GetApp () is not None and orderingInstructionsSeen :
1247
1247
resp = wx .MessageBox ("PCB finish not found!" ,
0 commit comments