Skip to content

Commit 0f8bd89

Browse files
authored
Merge pull request #9 from sparkfun/release_candidate
Version 1.2.1
2 parents e08cf1a + 6fdba01 commit 0f8bd89

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/build_asset.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo "PCM_NAME=$(ls SparkFunKiCadCAMmer*.zip | rev | cut -c 5- | rev)" >> $GITHUB_ENV
2828
2929
- name: Upload pcm build to action - avoid double-zip
30-
uses: actions/upload-artifact@v3
30+
uses: actions/upload-artifact@v4
3131
with:
3232
name: ${{ env.PCM_NAME }}
3333
path: ./pcm/build/${{ env.PCM_NAME }}

.github/workflows/build_asset_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo "PCM_NAME=$(ls SparkFunKiCadCAMmer*.zip | rev | cut -c 5- | rev)" >> $GITHUB_ENV
2828
2929
- name: Publish release
30-
uses: softprops/action-gh-release@v1
30+
uses: softprops/action-gh-release@v2
3131
with:
3232
files: |
3333
./pcm/build/${{ env.ZIP_NAME }}

SparkFunKiCadCAMmer/cammer/cammer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def startCAMmer(self, args, board=None, logger=None):
198198
layername = layer.replace(".", "_")
199199
layerNumber = None
200200
for id, names in layertable.items():
201-
if layer in names['standardName']:
201+
if layer == names['standardName']:
202202
layerNumber = id
203203
break
204204
pctl.SetLayer(layerNumber)
@@ -235,7 +235,7 @@ def startCAMmer(self, args, board=None, logger=None):
235235
edge_ext = file_ext[e]
236236
layername = e.replace(".", "_")
237237
for id, names in layertable.items():
238-
if e in names['standardName']:
238+
if e == names['standardName']:
239239
allEdges.push_back(id)
240240
break
241241

SparkFunKiCadCAMmer/dialog/dialog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def __init__(self, parent, config, layertable, cammer, func):
103103
for layer in self.config[key].keys():
104104
found = False
105105
for id, names in self.layertable.items():
106-
if layer in names['standardName']:
106+
if layer == names['standardName']:
107107
found = True
108108
break
109109
if not found:
@@ -126,7 +126,7 @@ def __init__(self, parent, config, layertable, cammer, func):
126126
pass
127127
found = False
128128
for id, names in self.layertable.items():
129-
if layer in names['standardName']:
129+
if layer == names['standardName']:
130130
found = True
131131
break
132132
if (not found) or hasKey:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.2.0"
1+
__version__ = "1.2.1"

0 commit comments

Comments
 (0)