diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js index a133c2d4..b1e8efa5 100644 --- a/src/octoprint/static/js/app/dataupdater.js +++ b/src/octoprint/static/js/app/dataupdater.js @@ -236,7 +236,7 @@ function DataUpdater(allViewModels) { text: msg }); } else if (type === "RealTimeState") { - +// console.log(payload); } var legacyEventHandlers = { diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py index f4bef674..4e07cdfa 100644 --- a/src/octoprint/util/comm_acc.py +++ b/src/octoprint/util/comm_acc.py @@ -460,6 +460,9 @@ class MachineCom(object): cmd = process_gcode_line(cmd) if not cmd: return + eepromCmd = re.search("^\$[0-9]+=.+$", cmd) + if(eepromCmd and self.isPrinting()): + self._log("Warning: Configuration changes during print are not allowed!") if self.isPrinting() and not self.isSdFileSelected(): self._commandQueue.put((cmd, cmd_type)) diff --git a/src/octoprint/util/grblVersionRequirement.yml b/src/octoprint/util/grblVersionRequirement.yml index 08a68a60..cd652c3b 100644 --- a/src/octoprint/util/grblVersionRequirement.yml +++ b/src/octoprint/util/grblVersionRequirement.yml @@ -1 +1 @@ -{dirty: true, git: 694fb26, grbl: 0.9g, lastConnect: null, minor: ''} +{dirty: false, git: 694fb26, grbl: 0.9g, lastConnect: null, minor: ''}