Merge pull request #5 from sparkfun/release_candidate

v1.1.0

Author: PaulZC

README.md

@@ -1,4 +1,4 @@
-# SparkFun PCB CAMmer plugin for KiCad 7
+# SparkFun PCB CAMmer plugin for KiCad 7 / 8
 
 This plugin generates the Gerber and Drill files for a KiCad PCB.
 

SparkFunKiCadCAMmer/cammer/cammer.py

@@ -8,13 +8,38 @@
 
 from pcbnew import *
 
+# sub folder for our resource files
+_RESOURCE_DIRECTORY = os.path.join("..", "resource")
+
+#https://stackoverflow.com/a/50914550
+def resource_path(relative_path):
+    """ Get absolute path to resource, works for dev and for PyInstaller """
+    base_path = getattr(sys, '_MEIPASS', os.path.dirname(os.path.abspath(__file__)))
+    return os.path.join(base_path, _RESOURCE_DIRECTORY, relative_path)
+
+def get_version(rel_path: str) -> str:
+    try: 
+        with open(resource_path(rel_path), encoding='utf-8') as fp:
+            for line in fp.read().splitlines():
+                if line.startswith("__version__"):
+                    delim = '"' if '"' in line else "'"
+                    return line.split(delim)[1]
+            raise RuntimeError("Unable to find version string.")
+    except:
+        raise RuntimeError("Unable to find _version.py.")
+
+_APP_VERSION = get_version("_version.py")
+
 class CAMmer():
     def __init__(self):
         pass
 
     def args_parse(self, args):
         # set up command-line arguments parser
         parser = ArgumentParser(description="A script to generate and zip PCB Gerber and drill files.")
+        parser.add_argument(
+            "-v", "--version", action="version", version="%(prog)s " + _APP_VERSION
+        )
         parser.add_argument(
             "-p", "--path", help="Path to the *.kicad_pcb file"
         )

SparkFunKiCadCAMmer/plugin.py

@@ -27,14 +27,16 @@ def __init__(self):
 
         self._pcbnew_frame = None
 
+        self.supportedVersions = ['7.','8.']
+
         self.kicad_build_version = pcbnew.GetBuildVersion()
 
-    def IsVersion(self, VersionStr):
-        for v in VersionStr:
-            if v in self.kicad_build_version:
+    def IsSupported(self):
+        for v in self.supportedVersions:
+            if self.kicad_build_version.startswith(v):
                 return True
         return False
-
+    
     def Run(self):
         if self._pcbnew_frame is None:
             try:
@@ -89,7 +91,7 @@ def Run(self):
         def run_cammer(dlg, p_cammer):
             self.logger.log(logging.INFO, "Running CAMmer")
 
-            if self.IsVersion(['7.']):
+            if self.IsSupported():
                 command = []
 
                 layers = dlg.CurrentSettings()["Layers"]
@@ -131,6 +133,9 @@ def run_cammer(dlg, p_cammer):
                     if sysExit > 0:
                         wx.MessageBox("CAMmer " + ("warning" if (sysExit == 1) else "error") + ".\nPlease check cammer.log for details.",
                             ("Warning" if (sysExit == 1) else "Error"), wx.OK | (wx.ICON_WARNING if (sysExit == 1) else wx.ICON_ERROR))
+                    else:
+                        wx.MessageBox("CAMmer complete.\nPlease check cammer.log for details.",
+                            "Info", wx.OK | wx.ICON_INFORMATION)
                 else:
                     self.logger.log(logging.ERROR, "Could not get the board")
 

SparkFunKiCadCAMmer/resource/_version.py

@@ -1 +1 @@
-__version__ = "1.0.2"
+__version__ = "1.1.0"

pcm/metadata_template.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://go.kicad.org/pcm/schemas/v1",
     "name": "SparkFun KiCad CAMmer",
-    "description": "SparkFun's simple PCB CAMmer (Gerber generator) for KiCad 7",
+    "description": "SparkFun's simple PCB CAMmer (Gerber generator) for KiCad 7 / 8",
     "description_full": "Generates the Gerber and drill files for a KiCad PCB and zips them",
     "identifier": "com.github.sparkfun.SparkFunKiCadCAMmer",
     "type": "plugin",