diff --git a/octoprint_klipper/__init__.py b/octoprint_klipper/__init__.py index 03589f3..e0fcf03 100644 --- a/octoprint_klipper/__init__.py +++ b/octoprint_klipper/__init__.py @@ -5,6 +5,7 @@ import logging import octoprint.plugin import octoprint.plugin.core from octoprint.util.comm import parse_firmware_line +import flask class KlipperPlugin( octoprint.plugin.StartupPlugin, @@ -16,7 +17,7 @@ class KlipperPlugin( _parsingResponse = False _message = "" - #-- Startupt Plugin + #-- Startup Plugin def on_after_startup(self): klipperPort = self._settings.get(["serialport"]) @@ -26,10 +27,10 @@ class KlipperPlugin( additionalPorts.append(klipperPort) self._settings.global_set(["serial", "additionalPorts"], additionalPorts) self._settings.save() - self._logger.info("Added klipper serial port (%s) to list of additional ports." % klipperPort) + self._logger.info("Added klipper serial port {} to list of additional ports.".format(klipperPort)) #-- Settings Plugin - + def get_settings_defaults(self): return dict( serialport="/tmp/printer", @@ -39,10 +40,61 @@ class KlipperPlugin( probeLift=5, probeSpeedXy=1500, probeSpeedZ=500, - probePoints=[{'x':0, 'y':0}]) - + probePoints=[{'x':0, 'y':0}], + configPath="/home/pi/printer.cfg" + ) + + def on_settings_load(self): + data = octoprint.plugin.SettingsPlugin.on_settings_load(self) + f = open(self._settings.get(["configPath"]), "r") + if f: + data["config"] = f.read() + f.close() + else: + self._logger.info( + "Error: Klipper config file not found at: {}".format(self._settings.get(["configPath"])) + ) + return data + + def on_settings_save(self, data): + if "config" in data: + f = open(self._settings.get(["configPath"]), "w") + if f: + f.write(data["config"]) + f.close() + self._logger.info( + "Write Klipper config to {}".format(self._settings.get(["configPath"])) + ) + # Restart klipply to reload config + self._printer.commands("RESTART") + self.logInfo("Reloading Klipper Configuration.") + else: + self._logger.info( + "Error: Couldn't write Klipper config file: {}".format(self._settings.get(["configPath"])) + ) + data.pop('config', None) # we dont want to write the klipper conf to the octoprint settings + else: + octoprint.plugin.SettingsPlugin.on_settings_save(self, data) + + def get_settings_restricted_paths(self): + return dict( + admin=[ + ["serialport"], + ["configPath"], + ["replace_connection_panel"] + ], + user=[ + ["macros"], + ["probeHeight"], + ["probeLift"], + ["probeSpeedXy"], + ["probeSpeedZ"], + ["probePoints"] + ] + ) + #-- Template Plugin - + def get_template_configs(self): return [ dict(type="navbar", custom_bindings=True), @@ -77,7 +129,7 @@ class KlipperPlugin( self.updateStatus("info", "Connecting ...") elif "Connected" == event: self.updateStatus("info", "Connected to host") - self.logInfo("Connected to host via %s @%sbps" % (payload["port"], payload["baudrate"])) + self.logInfo("Connected to host via {} @{}bps".format(payload["port"], payload["baudrate"])) elif "Disconnected" == event: self.updateStatus("info", "Disconnected from host") elif "Error" == event: @@ -89,29 +141,25 @@ class KlipperPlugin( def on_parse_gcode(self, comm, line, *args, **kwargs): if "FIRMWARE_VERSION" in line: printerInfo = parse_firmware_line(line) - if "FIRMWARE_VERSION" in printerInfo: - self.logInfo("Firmware version: %s" % printerInfo["FIRMWARE_VERSION"]) - + self.logInfo("Firmware version: {}".format(printerInfo["FIRMWARE_VERSION"])) elif "//" in line: - self._parsingResponse = True self._message = self._message + line.strip('/') - + if not self._parsingResponse: + self.updateStatus("info", self._message) + self._parsingResponse = True else: if self._parsingResponse: - self._parsingResponse = False - self.logInfo(self._message) - self._message = "" - + self._parsingResponse = False + self.logInfo(self._message) + self._message = "" if "!!" in line: - msg = line.strip('!') - self.updateStatus("error", "Error") - self.logError(msg) - + msg = line.strip('!') + self.updateStatus("error", msg) + self.logError(msg) return line #-- Helpers - def sendMessage(self, type, subtype, payload): self._plugin_manager.send_plugin_message( self._identifier, diff --git a/octoprint_klipper/static/js/klipper_settings.js b/octoprint_klipper/static/js/klipper_settings.js index 344e19c..9f3cd77 100644 --- a/octoprint_klipper/static/js/klipper_settings.js +++ b/octoprint_klipper/static/js/klipper_settings.js @@ -1,7 +1,9 @@ $(function() { + $('#klipper-settings a:first').tab('show'); function KlipperSettingsViewModel(parameters) { var self = this; self.settings = parameters[0]; + self.klipperConfig = ko.observable(); self.addMacro = function() { self.settings.settings.plugins.klipper.macros.push({ @@ -24,7 +26,6 @@ $(function() { self.moveItemDown(self.settings.settings.plugins.klipper.macros, macro) } - self.addProbePoint = function() { self.settings.settings.plugins.klipper.probePoints.push({x: 0, y:0, z:0}); } @@ -56,6 +57,36 @@ $(function() { list.splice(i-1, 2, rawList[i], rawList[i-1]); } } + + self.loadKlipperConfig = function() { + $.ajax({ + method: "GET", + url: "/api/plugin/klipper", + headers: {'X-Api-Key': '2CE2F6BA87244897B7F3A1BED3B1A3ED'} + }) + .done(function( msg ) { + self.klipperConfig(msg) + }); + } + + self.saveKlipperConfig = function() { + $.ajax({ + method: "POST", + url: "/api/plugin/klipper", + headers: { + "x-api-key": "2CE2F6BA87244897B7F3A1BED3B1A3ED", + "content-type": "application/json", + "cache-control": "no-cache" + }, + data: { + command: "save_config", + text: encodeURI(self.klipperConfig) + } + }) + .done(function( msg ) { + console.log(msg); + }); + } } OCTOPRINT_VIEWMODELS.push({ diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2 index 3d5a44c..9801ebf 100644 --- a/octoprint_klipper/templates/klipper_settings.jinja2 +++ b/octoprint_klipper/templates/klipper_settings.jinja2 @@ -1,4 +1,12 @@
+ +
+
@@ -12,8 +20,13 @@
-

{{ _('Macros') }}

+ +
+ +

+
+
@@ -48,7 +61,7 @@
-
@@ -61,10 +74,8 @@ {{ _('Add Macro') }}
- -
-

{{ _('Assisted Bed Leveling') }}

-
+
+
@@ -129,7 +140,14 @@
- {{ _('Add Point') }} + {{ _('Add Point') }}
+
+
+
+ +
+
+