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

[macro] Improve parameter extraction

This commit is contained in:
Martin Muehlhaeuser 2018-08-25 19:16:03 +00:00
parent 6ee1c81da9
commit 97770e094e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octoprint_klipper/static/js/klipper_param_macro.js
View File

@ -14,7 +14,7 @@ $(function() {
self.macroName = ko.observable(); self.macroName = ko.observable();
var paramObjRegex = /{(.*?)}/g; var paramObjRegex = /{(.*?)}/g;
var keyValueRegex = /(\w*)\s*:\s*([\w°"|]*)/g; var keyValueRegex = /(\w*)\s*:\s*([\w\s°"|]*)/g;
self.process = function(macro) { self.process = function(macro) {
self.macro = macro.macro(); self.macro = macro.macro();
@ -29,9 +29,9 @@ $(function() {
while (res != null) { while (res != null) {
if("options" == res[1]) { if("options" == res[1]) {
obj["options"] = res[2].split("|"); obj["options"] = res[2].trim().split("|");
} else { } else {
obj[res[1]] = res[2]; obj[res[1]] = res[2].trim();
} }
res = keyValueRegex.exec(matches[i]); res = keyValueRegex.exec(matches[i]);
} }

6
octoprint_klipper/templates/klipper_settings.jinja2
View File

@ -95,10 +95,10 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<pre> <pre>
PID_CALIBRATE PID_CALIBRATE
HEATER={label:Heater, default:extruder, options:extruder|extruder1} HEATER={label:Heater, default:extruder, options:extruder|extruder1}
TARGET={label:Temperature, unit:°C, default:190} TARGET={label:Target Temperature, unit:°C, default:190}
WRITE_FILE={label:WriteFile, default:0, options:0|1} WRITE_FILE={label:Write to File, default:0, options:0|1}
</pre> </pre>
</div> </div>
</div> </div>