Skip to content

Commit c6d226f

Browse files
authored
Merge pull request #7 from sparkfun/release_candidate
Version 1.1.2
2 parents 622f674 + fcbaf7d commit c6d226f

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

.github/workflows/build_asset.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Python
1717
uses: actions/setup-python@v4
1818
with:
19-
python-version: '3.10'
19+
python-version: '3.11'
2020

2121
- name: Update zip
2222
run: |

.github/workflows/build_asset_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Python
1717
uses: actions/setup-python@v4
1818
with:
19-
python-version: '3.10'
19+
python-version: '3.11'
2020

2121
- name: Update zip
2222
run: |

SparkFunKiCadCAMmer/cammer/cammer.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,6 @@ def startCAMmer(self, args, board=None, logger=None):
115115
else:
116116
board.Save(board.GetFileName())
117117

118-
# Check if user wants to build zone fills
119-
if wx.GetApp() is not None:
120-
resp = wx.MessageBox("Do you want to build the zone fills?",
121-
'Fill zones?', wx.YES_NO | wx.ICON_INFORMATION)
122-
if resp == wx.YES:
123-
report += "Zones filled by user.\n"
124-
fillerTool = pcbnew.ZONE_FILLER(board)
125-
fillerTool.Fill(board.Zones())
126-
else:
127-
fillerTool = pcbnew.ZONE_FILLER(board)
128-
fillerTool.Fill(board.Zones())
129-
130118
if board is None:
131119
report += "Could not load board. Quitting.\n"
132120
sysExit = 2
@@ -168,6 +156,12 @@ def startCAMmer(self, args, board=None, logger=None):
168156
for i in range(1,31): # Add 30 internal copper layers. Convert In1.Cu to GL2 - see #3
169157
file_ext["In{}.Cu".format(i)] = "GL{}".format(i + 1)
170158

159+
# Fill the zones
160+
# This prevents badness with pads on "F.Cu, B.Cu and connected layers" and "Connected layers only"
161+
report += "Zones filled by CAMmer.\n"
162+
fillerTool = pcbnew.ZONE_FILLER(board)
163+
fillerTool.Fill(board.Zones())
164+
171165
# Start plotting: https://gitlab.com/kicad/code/kicad/-/blob/master/demos/python_scripts_examples/plot_board.py
172166

173167
pctl = PLOT_CONTROLLER(board)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.1.1"
1+
__version__ = "1.1.2"

0 commit comments

Comments
 (0)