3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-16 11:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

webhooks: Require a subscription to receive gcode output

Browse source 
Add a new "gcode/subscribe_output" webhook endpoint to subscribe to
gcode output.  Only client connections that subscribe to the gcode
output will receive that output.

This also moves all the gcode webhooks from gcode.py to webhooks.py
and arranges for gcode.py to be initialized prior to webhooks.py.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-08-11 21:21:41 -04:00
parent 568393c941
commit 16a53e6918
3 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

21
klippy/gcode.py
View file

@ -78,16 +78,6 @@ class GCodeParser:
self._handle_disconnect)
printer.register_event_handler("extruder:activate_extruder",
self._handle_activate_extruder)
# Register webhooks
webhooks = self.printer.lookup_object('webhooks')
webhooks.register_endpoint(
"gcode/help", self._handle_remote_help)
webhooks.register_endpoint(
"gcode/script", self._handle_remote_script)
webhooks.register_endpoint(
"gcode/restart", self._handle_remote_restart)
webhooks.register_endpoint(
"gcode/firmware_restart", self._handle_remote_firmware_restart)
# Command handling
self.is_printer_ready = False
self.mutex = printer.get_reactor().mutex()
@ -158,6 +148,8 @@ class GCodeParser:
"mux command %s %s %s already registered (%s)" % (
cmd, key, value, prev_values))
prev_values[value] = func
def get_command_help(self):
return dict(self.gcode_help)
def register_output_handler(self, cb):
self.output_callbacks.append(cb)
def set_move_transform(self, transform, force=False):
@ -617,15 +609,6 @@ class GCodeParser:
if cmd in self.gcode_help:
cmdhelp.append("%-10s: %s" % (cmd, self.gcode_help[cmd]))
gcmd.respond_info("\n".join(cmdhelp), log=False)
# Webhooks
def _handle_remote_help(self, web_request):
web_request.send(dict(self.gcode_help))
def _handle_remote_restart(self, web_request):
self.run_script('restart')
def _handle_remote_firmware_restart(self, web_request):
self.run_script('firmware_restart')
def _handle_remote_script(self, web_request):
self.run_script(web_request.get('script'))
# Support reading gcode from a pseudo-tty interface
class GCodeIO: