From 8ef7baaf3efcc7d97aa3c7118d120dc6cedb2ecc Mon Sep 17 00:00:00 2001 From: PaulZC Date: Sat, 20 Sep 2025 13:01:54 +0100 Subject: [PATCH 1/2] v1.2.1 - update workflow actions --- .github/workflows/build_asset.yml | 2 +- .github/workflows/build_asset_release.yml | 2 +- SparkFunKiCadCAMmer/resource/_version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_asset.yml b/.github/workflows/build_asset.yml index 3385a1e..826d1a2 100644 --- a/.github/workflows/build_asset.yml +++ b/.github/workflows/build_asset.yml @@ -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 }} diff --git a/.github/workflows/build_asset_release.yml b/.github/workflows/build_asset_release.yml index e01485e..12e3277 100644 --- a/.github/workflows/build_asset_release.yml +++ b/.github/workflows/build_asset_release.yml @@ -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 }} diff --git a/SparkFunKiCadCAMmer/resource/_version.py b/SparkFunKiCadCAMmer/resource/_version.py index 4a2bfa8..42cf7cd 100644 --- a/SparkFunKiCadCAMmer/resource/_version.py +++ b/SparkFunKiCadCAMmer/resource/_version.py @@ -1 +1 @@ -__version__ = "1.2.0" \ No newline at end of file +__version__ = "1.2.1" \ No newline at end of file From 6fdba010d58bd05cefee8263190b5bd3fd842a77 Mon Sep 17 00:00:00 2001 From: PaulZC Date: Sat, 20 Sep 2025 13:50:11 +0100 Subject: [PATCH 2/2] Fix potential issue - see Panelizer issue #25 --- SparkFunKiCadCAMmer/cammer/cammer.py | 4 ++-- SparkFunKiCadCAMmer/dialog/dialog.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SparkFunKiCadCAMmer/cammer/cammer.py b/SparkFunKiCadCAMmer/cammer/cammer.py index b148c8a..c32c450 100644 --- a/SparkFunKiCadCAMmer/cammer/cammer.py +++ b/SparkFunKiCadCAMmer/cammer/cammer.py @@ -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) @@ -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 diff --git a/SparkFunKiCadCAMmer/dialog/dialog.py b/SparkFunKiCadCAMmer/dialog/dialog.py index 401f4fb..6375037 100644 --- a/SparkFunKiCadCAMmer/dialog/dialog.py +++ b/SparkFunKiCadCAMmer/dialog/dialog.py @@ -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: @@ -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: