Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build_asset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
echo "PCM_NAME=$(ls SparkFunKiCadCAMmer*.zip | rev | cut -c 5- | rev)" >> $GITHUB_ENV

- name: Upload pcm build to action - avoid double-zip
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.PCM_NAME }}
path: ./pcm/build/${{ env.PCM_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_asset_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
echo "PCM_NAME=$(ls SparkFunKiCadCAMmer*.zip | rev | cut -c 5- | rev)" >> $GITHUB_ENV

- name: Publish release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: |
./pcm/build/${{ env.ZIP_NAME }}
4 changes: 2 additions & 2 deletions SparkFunKiCadCAMmer/cammer/cammer.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def startCAMmer(self, args, board=None, logger=None):
layername = layer.replace(".", "_")
layerNumber = None
for id, names in layertable.items():
if layer in names['standardName']:
if layer == names['standardName']:
layerNumber = id
break
pctl.SetLayer(layerNumber)
Expand Down Expand Up @@ -235,7 +235,7 @@ def startCAMmer(self, args, board=None, logger=None):
edge_ext = file_ext[e]
layername = e.replace(".", "_")
for id, names in layertable.items():
if e in names['standardName']:
if e == names['standardName']:
allEdges.push_back(id)
break

Expand Down
4 changes: 2 additions & 2 deletions SparkFunKiCadCAMmer/dialog/dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def __init__(self, parent, config, layertable, cammer, func):
for layer in self.config[key].keys():
found = False
for id, names in self.layertable.items():
if layer in names['standardName']:
if layer == names['standardName']:
found = True
break
if not found:
Expand All @@ -126,7 +126,7 @@ def __init__(self, parent, config, layertable, cammer, func):
pass
found = False
for id, names in self.layertable.items():
if layer in names['standardName']:
if layer == names['standardName']:
found = True
break
if (not found) or hasKey:
Expand Down
2 changes: 1 addition & 1 deletion SparkFunKiCadCAMmer/resource/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.2.0"
__version__ = "1.2.1"