From bc4e0f2e354299f859464438c9c529a1474a7c7b Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 4 Sep 2015 18:10:33 +0200 Subject: [PATCH 1/2] *try to fix grbl version bug (No such file or directory: 'src/octoprint/util/grblVersionRequirement.yml') with change in setup.py and moving of grblVersionRequirement.yml and grbl.hex into new grbl folder --- setup.py | 2 +- grbl.hex => src/octoprint/grbl/grbl.hex | 0 src/octoprint/{util => grbl}/grblVersionRequirement.yml | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename grbl.hex => src/octoprint/grbl/grbl.hex (100%) rename src/octoprint/{util => grbl}/grblVersionRequirement.yml (100%) diff --git a/setup.py b/setup.py index 7fff74ec..49dda60e 100644 --- a/setup.py +++ b/setup.py @@ -120,7 +120,7 @@ def params(): "": "src" } package_data = { - "octoprint": octoprint_setuptools.package_data_dirs('src/octoprint', ['static', 'templates', 'plugins', 'translations']) + "octoprint": octoprint_setuptools.package_data_dirs('src/octoprint', ['static', 'templates', 'plugins', 'translations', 'grbl']) } include_package_data = True diff --git a/grbl.hex b/src/octoprint/grbl/grbl.hex similarity index 100% rename from grbl.hex rename to src/octoprint/grbl/grbl.hex diff --git a/src/octoprint/util/grblVersionRequirement.yml b/src/octoprint/grbl/grblVersionRequirement.yml similarity index 100% rename from src/octoprint/util/grblVersionRequirement.yml rename to src/octoprint/grbl/grblVersionRequirement.yml From 6f1c9ed8d9fa96c85afb9925820dfa939cb78642 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 4 Sep 2015 18:14:55 +0200 Subject: [PATCH 2/2] changed grbl version regex to be non-greedy --- src/octoprint/util/comm_acc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py index f4bef674..da23ce64 100644 --- a/src/octoprint/util/comm_acc.py +++ b/src/octoprint/util/comm_acc.py @@ -1003,7 +1003,7 @@ class MachineCom(object): eventManager().fire(Events.ERROR, {"error": self.getErrorString()}) if("Grbl" in line): - versionMatch = re.search("Grbl (?P.+)(_(?P[0-9a-f]{7})(?P-dirty)?)? \[.+\]", line) + versionMatch = re.search("Grbl (?P.+?)(_(?P[0-9a-f]{7})(?P-dirty)?)? \[.+\]", line) if(versionMatch): versionDict = versionMatch.groupdict() self._writeGrblVersionToFile(versionDict)