Skip to content

Commit

Permalink
#124 change from "octoprint.comm.protocol.gcode.sending" to "octoprin…
Browse files Browse the repository at this point in the history
…t.comm.protocol.gcode.queuing"

So, the comm.sending_thread is also not used, instead comm._monitor
  • Loading branch information
OllisGit committed Apr 21, 2020
1 parent 7e9fa48 commit 1682bc9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions octoprint_DisplayLayerProgress/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def createFilePreProcessor(self, path, file_object, blinks=None, printer_profile
LayerDetectorFileProcessor(fileStream, self._allLayerExpressions, self._logger)
)

# eval current layer from modified g-code (comm.sending_tread)
# eval current layer from modified g-code (comm.sending_tread, comm._monitor)
def sendingGCodeHook(self, comm_instance, phase, cmd, cmd_type, gcode, *args, **kwargs):
# needed to handle non utf-8 characters
# commandAsString = cmd.encode('ascii', 'ignore')
Expand Down Expand Up @@ -1333,7 +1333,8 @@ def __plugin_load__():
__plugin_hooks__ = {
"octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.get_update_information,
#"octoprint.comm.protocol.gcode.queuing": __plugin_implementation__.queuingGCodeHook,
"octoprint.comm.protocol.gcode.sending": __plugin_implementation__.sendingGCodeHook,
"octoprint.comm.protocol.gcode.queuing": __plugin_implementation__.sendingGCodeHook,
# "octoprint.comm.protocol.gcode.sending": __plugin_implementation__.sendingGCodeHook,
"octoprint.comm.protocol.gcode.sent": __plugin_implementation__.sentGCodeHook
# "octoprint.filemanager.preprocessor": __plugin_implementation__.createFilePreProcessor
}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
plugin_name = "DisplayLayerProgress"

# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
plugin_version = "1.20.0"
plugin_version = "1.20.1dev"

# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
# module
Expand Down

0 comments on commit 1682bc9

Please sign in to comment.