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

Added missing Checkbox for debug logging 

setting was already there in the configuration.
-bump for rc5
This commit is contained in:
thelastWallE 2021-04-01 21:23:37 +02:00
parent cc90ca8862
commit 47cf9eace1
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
octoprint_klipper/__init__.py
View File

@ -425,7 +425,6 @@ class KlipperPlugin(
return flask.jsonify(data=data["config"]) return flask.jsonify(data=data["config"])
elif command == "checkConfig": elif command == "checkConfig":
if "config" in data: if "config" in data:
self.log_debug("config in ")
if not self.validate_configfile(data["config"]): if not self.validate_configfile(data["config"]):
self.log_debug("validateConfig ->" + data["config"]) self.log_debug("validateConfig ->" + data["config"])
self._settings.set(["configuration", "old_config"], data["config"]) self._settings.set(["configuration", "old_config"], data["config"])
@ -533,7 +532,9 @@ class KlipperPlugin(
dataToValidated = configparser.RawConfigParser() dataToValidated = configparser.RawConfigParser()
dataToValidated.read_string(dataToBeValidated) dataToValidated.read_string(dataToBeValidated)
except configparser.Error as error: except configparser.Error as error:
error.message = error.message.replace("\n","") error.message = error.message.replace("\\n","")
error.message = error.message.replace("file:","Klipper Configuration", 1)
error.message = error.message.replace("'","", 2)
error.source = "Klipper config" error.source = "Klipper config"
self.log_error( self.log_error(
"Error: Invalid Klipper config file:\n" + "Error: Invalid Klipper config file:\n" +
@ -542,7 +543,7 @@ class KlipperPlugin(
self.send_message("PopUp", "warning", "Invalid Config", self.send_message("PopUp", "warning", "Invalid Config",
"Config got not saved!\n" + "Config got not saved!\n" +
"You can reload your last changes\n" + "You can reload your last changes\n" +
"on the file editor tab.\n\n" + str(error)) "on the 'Klipper Configuration' tab.\n\n" + str(error))
self._parsing_check_response = False self._parsing_check_response = False
return return
else: else:

9
octoprint_klipper/templates/klipper_settings.jinja2
View File

@ -19,12 +19,19 @@
<div class="controls"> <div class="controls">
<input type="checkbox" class="input-block-level" data-bind="checked: settings.settings.plugins.klipper.connection.replace_connection_panel"> <input type="checkbox" class="input-block-level" data-bind="checked: settings.settings.plugins.klipper.connection.replace_connection_panel">
</div> </div>
</div><div class="control-group"> </div>
<div class="control-group">
<label class="control-label">{{ _('Show NavBar Message') }}</label> <label class="control-label">{{ _('Show NavBar Message') }}</label>
<div class="controls"> <div class="controls">
<input type="checkbox" class="input-block-level" data-bind="checked: settings.settings.plugins.klipper.configuration.navbar"> <input type="checkbox" class="input-block-level" data-bind="checked: settings.settings.plugins.klipper.configuration.navbar">
</div> </div>
</div> </div>
<div class="control-group">
<label class="control-label">{{ _('Enable debug logging') }}</label>
<div class="controls">
<input type="checkbox" class="input-block-level" data-bind="checked: settings.settings.plugins.klipper.configuration.debug_logging">
</div>
</div>
<div class="control-group"> <div class="control-group">
<label class="control-label">{{ _('Klipper Config File') }}</label> <label class="control-label">{{ _('Klipper Config File') }}</label>
<div class="controls"> <div class="controls">

2
setup.py
View File

@ -19,7 +19,7 @@ plugin_package = "octoprint_klipper"
plugin_name = "OctoKlipper" plugin_name = "OctoKlipper"
plugin_version = "0.3.4rc4" plugin_version = "0.3.4rc5"
plugin_description = """A plugin for OctoPrint to configure,control and monitor the Klipper 3D printer software.""" plugin_description = """A plugin for OctoPrint to configure,control and monitor the Klipper 3D printer software."""