[feat] Basic config editor
This commit is contained in:
Martin Muehlhaeuser
parent
827f1848aa
commit
76c5137e8a
|
|
@ -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,7 +27,7 @@ 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
|
||||
|
||||
|
|
@ -39,7 +40,58 @@ 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
|
||||
|
||||
|
|
@ -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 = ""
|
||||
|
||||
if "!!" in line:
|
||||
msg = line.strip('!')
|
||||
self.updateStatus("error", "Error")
|
||||
self.updateStatus("error", msg)
|
||||
self.logError(msg)
|
||||
|
||||
return line
|
||||
|
||||
#-- Helpers
|
||||
|
||||
def sendMessage(self, type, subtype, payload):
|
||||
self._plugin_manager.send_plugin_message(
|
||||
self._identifier,
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -1,4 +1,12 @@
|
|||
<form class="form-horizontal">
|
||||
<ul class="nav nav-pills" id="klipper-settings">
|
||||
<li><a href="#basic" data-toggle="tab">Basic</a></li>
|
||||
<li><a href="#macros" data-toggle="tab">Macros</a></li>
|
||||
<li><a href="#level" data-toggle="tab">Bed Leveling</a></li>
|
||||
<li><a href="#conf" data-toggle="tab">Klipper Configuration</a></li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="basic">
|
||||
<div class="control-group">
|
||||
<label class="control-label">{{ _('Serial Port') }}</label>
|
||||
<div class="controls">
|
||||
|
|
@ -12,8 +20,13 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<h4>{{ _('Macros') }}<h4>
|
||||
<label class="control-label">{{ _('Klipper Config Path') }}</label>
|
||||
<div class="controls">
|
||||
<input type="text" class="input-block-level" data-bind="value: settings.settings.plugins.klipper.configPath">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane" id="macros">
|
||||
<div class="control-group">
|
||||
<div class="controls">
|
||||
<div class="row-fluid">
|
||||
|
|
@ -48,7 +61,7 @@
|
|||
<div class="controls">
|
||||
<div class="row-fluid">
|
||||
<div class="span8">
|
||||
<textarea rows="4" class="block" data-bind="value: macro">
|
||||
<textarea rows="2" class="block" data-bind="value: macro">
|
||||
</textarea>
|
||||
</div>
|
||||
<div class="span2"></div>
|
||||
|
|
@ -61,10 +74,8 @@
|
|||
<a href='#' data-bind='click: addMacro' class="fa fa-plus-circle"></a> {{ _('Add Macro') }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<h4>{{ _('Assisted Bed Leveling') }}</h4>
|
||||
</div>
|
||||
<div class="tab-pane" id="level">
|
||||
<div class="control-group">
|
||||
<label class="control-label">{{ _('Probe Height') }}</label>
|
||||
<div class="controls">
|
||||
|
|
@ -132,4 +143,11 @@
|
|||
<a href='#' data-bind='click: addProbePoint' class="fa fa-plus-circle"></a> {{ _('Add Point') }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane" id="conf">
|
||||
<div class="control-group">
|
||||
<textarea rows="32" class="block" data-bind="value: settings.settings.plugins.klipper.config"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
Loading…
Reference in New Issue