3diy
/
OctoprintKlipperPlugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

template: remove navbar status for now.

This commit is contained in:
Martin Muehlhaeuser 2018-01-27 13:54:33 +00:00
parent 8762a2c732
commit 7946cf24e3
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
octoprint_klipper/__init__.py
View File

@ -14,8 +14,6 @@ class KlipperPlugin(
def on_after_startup(self): def on_after_startup(self):
pass pass
#self._logger.info("startup hook ---------- {value} ----------".format(value=self._settings.get(["replace_connection_panel"])) )
#self._settings.set(["appearance"]["components"]["order"]["sidebar"]["test"])
def get_settings_defaults(self): def get_settings_defaults(self):
return dict( return dict(
@ -30,7 +28,7 @@ class KlipperPlugin(
def get_template_configs(self): def get_template_configs(self):
return [ return [
dict(type="navbar", custom_bindings=True), # dict(type="navbar", custom_bindings=True),
dict(type="settings", custom_bindings=True), dict(type="settings", custom_bindings=True),
dict(type="generic", name="Assisted Bed Leveling", template="klipper_leveling_dialog.jinja2", custom_bindings=True), dict(type="generic", name="Assisted Bed Leveling", template="klipper_leveling_dialog.jinja2", custom_bindings=True),
dict(type="generic", name="PID Tuning", template="klipper_pid_tuning_dialog.jinja2", custom_bindings=True), dict(type="generic", name="PID Tuning", template="klipper_pid_tuning_dialog.jinja2", custom_bindings=True),
@ -82,13 +80,6 @@ class KlipperPlugin(
if "!!" in line: if "!!" in line:
self.logError(line.strip('!')) self.logError(line.strip('!'))
return line return line
def on_printer_action(self, comm, line, action, *args, **kwargs):
#if not action == "custom":
# return
self._plugin_manager.send_plugin_message(self._identifier, dict(message=line))
self._plugin_manager.send_plugin_message(self._identifier, dict(message=action))
#self._logger.info("action recieved:".action)
def is_wizard_required(self): def is_wizard_required(self):
return True; return True;
@ -105,6 +96,3 @@ def __plugin_load__():
"octoprint.comm.protocol.action": __plugin_implementation__.on_printer_action "octoprint.comm.protocol.action": __plugin_implementation__.on_printer_action
} }
#__plugin_name__ = "Klipper"
#__plugin_implementation__ = KlipperPlugin()

5
octoprint_klipper/static/js/klipper.js
View File

@ -42,17 +42,12 @@ $(function() {
OctoPrint.control.sendGcode("RESTART") OctoPrint.control.sendGcode("RESTART")
}; };
self.onBeforeBinding = function() {
//self.connectionState.selectedPort("VIRTUAL");
}
self.onAfterBinding = function() { self.onAfterBinding = function() {
self.connectionState.selectedPort(self.settings.settings.plugins.klipper.serialport()); self.connectionState.selectedPort(self.settings.settings.plugins.klipper.serialport());
self.shortStatus("Idle"); self.shortStatus("Idle");
} }
self.onDataUpdaterPluginMessage = function(plugin, message) { self.onDataUpdaterPluginMessage = function(plugin, message) {
//console.log(message);
self.logMessage(message["time"], message["type"], message["message"]); self.logMessage(message["time"], message["type"], message["message"]);
} }