From fbe2b5617036f00568940476b06e38f638ef6ae8 Mon Sep 17 00:00:00 2001 From: make-ing Date: Mon, 21 Sep 2015 16:09:03 +0200 Subject: [PATCH] laser position halt debuging --- src/octoprint/plugins/svgtogcode/__init__.py | 10 ++-- src/octoprint/util/comm_acc.py | 49 ++++++++++++-------- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/octoprint/plugins/svgtogcode/__init__.py b/src/octoprint/plugins/svgtogcode/__init__.py index b859f04c..954aa226 100644 --- a/src/octoprint/plugins/svgtogcode/__init__.py +++ b/src/octoprint/plugins/svgtogcode/__init__.py @@ -239,7 +239,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin, less=["less/svgtogcode.less"], css=["css/svgtogcode.css", "css/mrbeam.css"] ) - + ##~~ SettingsPlugin API def on_settings_save(self, data): @@ -267,7 +267,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin, intensity = min(max(data["defaultIntensity"], 1), 1000) s.set(["defaultIntensity"], intensity) if "defaultFeedrate" in data and data["defaultFeedrate"]: - feedrate = max(1,data["defaultFeedrate"]) + feedrate = max(1,data["defaultFeedrate"]) s.set(["defaultFeedrate"], feedrate) if "svgDPI" in data and data["svgDPI"]: s.set(["svgDPI"], data["svgDPI"]) @@ -353,8 +353,10 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin, converter_path = homedir+"/mrbeam-inkscape-ext" hostname = socket.gethostname() - if("Bucanero" in hostname): + if("Bucanero" in hostname): converter_path = '/home/teja/workspace/mrbeam-inkscape-ext' + elif("denkbrett" in hostname): + converter_path = '/home/flo/mrbeam/git/mrbeam-inkscape-ext' import sys sys.path.append(converter_path) @@ -399,7 +401,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin, self._svgtogcode_logger.info("-" * 40) -# ## shell call +# ## shell call # engine_settings = self._convert_to_engine(profile_path) # # from os.path import expanduser diff --git a/src/octoprint/util/comm_acc.py b/src/octoprint/util/comm_acc.py index 2646e13d..758bd837 100644 --- a/src/octoprint/util/comm_acc.py +++ b/src/octoprint/util/comm_acc.py @@ -257,6 +257,15 @@ class MachineCom(object): if self._state == newState: return + if newState == self.STATE_PRINTING: + self._temperature_timer.cancel() + self._temperature_timer = RepeatedTimer(1, self._poll_temperature, run_first=True) + self._temperature_timer.start() + else: + self._temperature_timer.cancel() + self._temperature_timer = RepeatedTimer(0.2, self._poll_temperature, run_first=True) + self._temperature_timer.start() + if newState == self.STATE_CLOSED or newState == self.STATE_CLOSED_WITH_ERROR: if settings().get(["feature", "sdSupport"]): self._sdFileList = False @@ -1367,7 +1376,7 @@ class MachineCom(object): def _onConnected(self, nextState): self._serial.timeout = settings().getFloat(["serial", "timeout", "communication"]) #self._temperature_timer = RepeatedTimer(lambda: get_interval("temperature"), self._poll_temperature, run_first=True) - self._temperature_timer = RepeatedTimer(0.2, self._poll_temperature, run_first=True) + self._temperature_timer = RepeatedTimer(0.5, self._poll_temperature, run_first=True) self._temperature_timer.start() if(nextState == None): @@ -1978,35 +1987,35 @@ class MachineCom(object): # line example: # try: - idx_mx_begin = line.index('MPos:') + 5 - idx_mx_end = line.index('.', idx_mx_begin) + 2 - idx_my_begin = line.index(',', idx_mx_end) + 1 - idx_my_end = line.index('.', idx_my_begin) + 2 - idx_mz_begin = line.index(',', idx_my_end) + 1 - idx_mz_end = line.index('.', idx_mz_begin) + 2 + #idx_mx_begin = line.index('MPos:') + 5 + #idx_mx_end = line.index('.', idx_mx_begin) + 2 + #idx_my_begin = line.index(',', idx_mx_end) + 1 + #idx_my_end = line.index('.', idx_my_begin) + 2 + #idx_mz_begin = line.index(',', idx_my_end) + 1 + #idx_mz_end = line.index('.', idx_mz_begin) + 2 idx_wx_begin = line.index('WPos:') + 5 idx_wx_end = line.index('.', idx_wx_begin) + 2 idx_wy_begin = line.index(',', idx_wx_end) + 1 idx_wy_end = line.index('.', idx_wy_begin) + 2 - idx_wz_begin = line.index(',', idx_wy_end) + 1 - idx_wz_end = line.index('.', idx_wz_begin) + 2 + #idx_wz_begin = line.index(',', idx_wy_end) + 1 + #idx_wz_end = line.index('.', idx_wz_begin) + 2 - idx_intensity_begin = line.index('S:', idx_wz_end) + 2 - idx_intensity_end = line.index(',', idx_intensity_begin) + #idx_intensity_begin = line.index('S:', idx_wz_end) + 2 + #idx_intensity_end = line.index(',', idx_intensity_begin) - idx_laserstate_begin = line.index('laser ', idx_intensity_end) + 6 - idx_laserstate_end = line.index(':', idx_laserstate_begin) + #idx_laserstate_begin = line.index('laser ', idx_intensity_end) + 6 + #idx_laserstate_end = line.index(':', idx_laserstate_begin) payload = { - "mx": line[idx_mx_begin:idx_mx_end], - "my": line[idx_my_begin:idx_my_end], - "mz": line[idx_mz_begin:idx_mz_end], + #"mx": line[idx_mx_begin:idx_mx_end], + #"my": line[idx_my_begin:idx_my_end], + #"mz": line[idx_mz_begin:idx_mz_end], "wx": line[idx_wx_begin:idx_wx_end], - "wy": line[idx_wy_begin:idx_wy_end], - "wz": line[idx_wz_begin:idx_wz_end], - "laser": line[idx_laserstate_begin:idx_laserstate_end], - "intensity": line[idx_intensity_begin:idx_intensity_end] + "wy": line[idx_wy_begin:idx_wy_end], + #"wz": line[idx_wz_begin:idx_wz_end], + #"laser": line[idx_laserstate_begin:idx_laserstate_end], + #"intensity": line[idx_intensity_begin:idx_intensity_end] } eventManager().fire(Events.RT_STATE, payload) except ValueError: