Merge branch 'devel' into rc
This commit is contained in:
thelastWallE
commit
1dd5f206ae
|
|
@ -129,7 +129,8 @@ class KlipperPlugin(
|
|||
logpath="/tmp/klippy.log",
|
||||
reload_command="RESTART",
|
||||
navbar=True,
|
||||
parse_check=False
|
||||
parse_check=False,
|
||||
fontsize=9
|
||||
)
|
||||
)
|
||||
|
||||
|
|
@ -374,7 +375,7 @@ class KlipperPlugin(
|
|||
if "FIRMWARE_VERSION" in printerInfo:
|
||||
self.log_info("Firmware version: {}".format(
|
||||
printerInfo["FIRMWARE_VERSION"]))
|
||||
elif "// probe" in line:
|
||||
elif "// probe" in line or "// Failed to verify BLTouch" in line:
|
||||
msg = line.strip('/')
|
||||
self.log_info(msg)
|
||||
write_parsing_response_buffer()
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.plugin-klipper-log {
|
||||
padding: 3px;
|
||||
padding: 0px;
|
||||
overflow-y: scroll;
|
||||
height: 400px;
|
||||
border: 1px solid #eee;
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
margin: 3px auto 0 auto;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 3px;
|
||||
background-color: #eeeeef;
|
||||
background-color: #efefef;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
|
|
@ -57,26 +57,30 @@ ul#klipper-settings {
|
|||
|
||||
#tab_plugin_klipper_main .row-fluid {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: wrap;
|
||||
flex: row wrap;
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
#tab_plugin_klipper_main .span8 {
|
||||
flex-grow: 8;
|
||||
float: left;
|
||||
box-sizing: border-box;
|
||||
@media all and (max-width: 940px) {
|
||||
#tab_plugin_klipper_main .row-fluid {
|
||||
/* On small screens, we are no longer using row direction but column */
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
#tab_plugin_klipper_main #left-side {
|
||||
flex: 3 1;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
#tab_plugin_klipper_main .span8 label {
|
||||
float: left;
|
||||
}
|
||||
|
||||
#tab_plugin_klipper_main .span4 {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 1;
|
||||
/* max-width: 13%; */
|
||||
float: left;
|
||||
box-sizing: border-box;
|
||||
#tab_plugin_klipper_main #right-side {
|
||||
flex: 1 1;
|
||||
max-width: 200px;
|
||||
min-width: 100px;
|
||||
}
|
||||
|
||||
#settings_plugin_klipper {
|
||||
|
|
@ -94,7 +98,7 @@ ul#klipper-settings {
|
|||
}
|
||||
|
||||
#settings_plugin_klipper form .tab-content .tab-pane {
|
||||
height: calc(100% - 35px);
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group {
|
||||
|
|
@ -102,9 +106,23 @@ div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content
|
|||
height: 100%;
|
||||
}
|
||||
|
||||
div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group .editor-controls{
|
||||
margin-bottom: 0px;
|
||||
height: 26px;
|
||||
}
|
||||
|
||||
div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor {
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
height: calc(100% - 28px);
|
||||
width: 100%;
|
||||
padding-top: 2px;
|
||||
}
|
||||
|
||||
div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor div#plugin-klipper-config {
|
||||
position: relative;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group button.btn.btn-small {
|
||||
|
|
|
|||
|
|
@ -107,6 +107,28 @@ $(function() {
|
|||
}
|
||||
}
|
||||
|
||||
self.minusFontsize = function () {
|
||||
self.settings.settings.plugins.klipper.configuration.fontsize(self.settings.settings.plugins.klipper.configuration.fontsize() - 1);
|
||||
if (self.settings.settings.plugins.klipper.configuration.fontsize() < 9) {
|
||||
self.settings.settings.plugins.klipper.configuration.fontsize(9);
|
||||
}
|
||||
if (editor) {
|
||||
editor.setFontSize(self.settings.settings.plugins.klipper.configuration.fontsize());
|
||||
editor.resize();
|
||||
}
|
||||
}
|
||||
|
||||
self.plusFontsize = function () {
|
||||
self.settings.settings.plugins.klipper.configuration.fontsize(self.settings.settings.plugins.klipper.configuration.fontsize() + 1);
|
||||
if (self.settings.settings.plugins.klipper.configuration.fontsize() > 20) {
|
||||
self.settings.settings.plugins.klipper.configuration.fontsize(20);
|
||||
}
|
||||
if (editor) {
|
||||
editor.setFontSize(self.settings.settings.plugins.klipper.configuration.fontsize());
|
||||
editor.resize();
|
||||
}
|
||||
}
|
||||
|
||||
self.loadLastSession = function () {
|
||||
if (self.settings.settings.plugins.klipper.configuration.old_config() != "") {
|
||||
self.klipperViewModel.consoleMessage("info","lastSession:" + self.settings.settings.plugins.klipper.configuration.old_config())
|
||||
|
|
@ -156,6 +178,8 @@ $(function() {
|
|||
obKlipperConfig = config.withSilence();
|
||||
if (editor) {
|
||||
editor.setValue(obKlipperConfig());
|
||||
editor.setFontSize(self.settings.settings.plugins.klipper.configuration.fontsize());
|
||||
editor.resize();
|
||||
editor.clearSelection();
|
||||
}
|
||||
return obKlipperConfig;
|
||||
|
|
@ -166,13 +190,16 @@ $(function() {
|
|||
editor.setTheme("ace/theme/monokai");
|
||||
editor.session.setMode("ace/mode/klipper_config");
|
||||
editor.setOptions({
|
||||
hScrollBarAlwaysVisible: true,
|
||||
vScrollBarAlwaysVisible: true,
|
||||
autoScrollEditorIntoView: true,
|
||||
maxLines: "Infinity"
|
||||
//maxLines: "Infinity"
|
||||
})
|
||||
|
||||
editor.session.on('change', function(delta) {
|
||||
if (obKlipperConfig) {
|
||||
obKlipperConfig.silentUpdate(editor.getValue());
|
||||
editor.resize();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@
|
|||
</div>
|
||||
<div class="control-group">
|
||||
<div class="controls">
|
||||
<a href='#' data-bind='click: addProbePoint' class="fa fa-plus-circle"></a> {{ _('Add Point') }}
|
||||
<a href='#' data-bind="click: addProbePoint" class="fa fa-plus-circle"></a> {{ _('Add Point') }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -206,14 +206,19 @@
|
|||
<script src="plugin/klipper/static/js/lib/ace/ace.min.js" type="text/javascript" charset="utf-8"></script>
|
||||
<script src="plugin/klipper/static/js/lib/ace/theme-monokai.min.js" type="text/javascript" charset="utf-8"></script>
|
||||
<script src="plugin/klipper/static/js/lib/ace/mode-klipper_config.js" type="text/javascript"></script>
|
||||
<button class="btn btn-small" data-bind='click: loadLastSession'
|
||||
<div class="editor-controls">
|
||||
<button class="btn btn-small" data-bind="click: loadLastSession"
|
||||
title="Reloads the last changes">
|
||||
<i class="fas fa-redo"></i> {{ _('Reload last changes') }}
|
||||
</button>
|
||||
<button class="btn btn-small" data-bind='click: reloadFromFile'>
|
||||
<i class="fas fa-upload"></i></a> {{ _('Reload from file') }}
|
||||
<i class="fas fa-upload"></i> {{ _('Reload from file') }}
|
||||
</button>
|
||||
<label class="inline"><input class="inline-checkbox" type="checkbox" data-bind="checked: settings.settings.plugins.klipper.configuration.parse_check"> {{ _('Check parsing on save') }}</label>
|
||||
|
||||
<a href='#' data-bind="click: minusFontsize" class="fas fa-search-minus"></a>
|
||||
<a href='#' data-bind="click: plusFontsize" class="fas fa-search-plus"></a>
|
||||
</div>
|
||||
<div class="conf-editor">
|
||||
<input id="hdnLoadKlipperConfig" type="hidden" data-bind="value: configBound(settings.settings.plugins.klipper.config)" />
|
||||
<div id="plugin-klipper-config"></div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<div class="row-fluid">
|
||||
<div class="span8">
|
||||
<div id="left-side">
|
||||
<label> <i class="icon-tasks"></i> {{ _("Messages") }} </label>
|
||||
<div class="plugin-klipper-log" data-bind="foreach: logMessages">
|
||||
<div class="log-item" data-bind="css: type">
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<i class="fa fa-trash"></i> {{ _("Clear") }}
|
||||
</button>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<div id="right-side">
|
||||
<div class="control-group">
|
||||
<div class="control-group">
|
||||
<div class="controls">
|
||||
|
|
|
|||
Loading…
Reference in New Issue