cdanesi/OctoPrint-CalibrationTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-refactoring js files,

Browse Source 
-implementing 3 decimal observer
-reusing load steps and save steps event
-adding settings for xyzSteps
-subsection macro default spacing = true
This commit is contained in:
sergiuToporjinschi
2022-02-05 13:44:49 +02:00
parent 30ce20a60f
commit d294fa5724
13 changed files with 971 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
octoprint_CalibrationTools/templates/tabs/tab-content.jinja2
+2 -2
View File
@@ -1,8 +1,8 @@
<div class="tab-content">
<div id="calibration_documentation" class="tab-pane active">
<div id="calibration_documentation" class="tab-pane ">
{% include "tabs/tab-doc.jinja2" %}
</div>
<div id="calibration_x-y-z" visible="false" class="tab-pane">
<div id="calibration_x-y-z" visible="false" class="tab-pane active">
{% include "tabs/tab-xyz.jinja2" %}
</div>
<div id="calibration_eSteps" visible="false" class="tab-pane">
octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
+2 -2
View File
@@ -51,7 +51,7 @@
</div>
</div>
{{ snipped.subSection("Test results", true) }}
{{ snipped.subSection("Test results") }}
<div class="row-fluid">
<div class="span6">
@@ -102,7 +102,7 @@
</div>
{{ snipped.subSection("Process description", true) }}
{{ snipped.subSection("Process description") }}
{{ snipped.quote("
This calibration is best done with the extruder detached from the hot end, so no restriction is present on the movement. If it is convenient, you can partially disassemble the printer so the output of the extruder is
open and the filament exits in free air. If this is inconvenient, the process below aims to minimize restrictions by extruding very slowly and with a slightly higher temperature. The results from this should still be
octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
+3 -3
View File
@@ -48,7 +48,7 @@
</div>
</div>
{{ snipped.subSection("Hot-end tuning", true) }}
{{ snipped.subSection("Hot-end tuning") }}
<div class="row-fluid">
<div class="span5">
<label for="fanSpeed" class="pull-right" style="margin-top: 5px;" title="Fan speed">
@@ -95,7 +95,7 @@
</div>
</div>
{{ snipped.subSection("Heated bed tuning", true) }}
{{ snipped.subSection("Heated bed tuning") }}
<div class="row-fluid">
<div class="span5">
<label for="fanSpeed" class="pull-right" style="margin-top: 5px;" title="Fan speed">
@@ -142,7 +142,7 @@
</div>
</div>
{{ snipped.subSection("Note", true) }}
{{ snipped.subSection("Note") }}
{{ snipped.quote("It is recommended to run the tuning with conditions as close to printing as possible. This means filament loaded and the part cooling fan set to your normal speed. It is not essential, but you may
prefer to start this process with the hot end at room temperature.",
"<a href='https://teachingtechyt.github.io/calibration.html#pid' target='_blank'>teachingtechyt.github.io</a>", "text-warning") }}
octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2
+90 -1
View File
@@ -1 +1,90 @@
Something in xyz tab...
{% import "macros.jinja2" as snipped %}
{{ snipped.subSection("Current PID values", true) }}
<div class="row-fluid">
<div class="span3">
<label for="tunningPIDNoCycles" class="pull-right" style="margin-top: 5px;" title="x">
Current values
</label>
</div>
<div class="span9">
<div class="input-prepend input-append">
{{ snipped.linkToMarlin("M092", "Marlin website") }}
<span class="add-on" title="">M92&nbsp;&nbsp;&nbsp;X</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.currentSteps.X, enable: false">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;Y</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.currentSteps.Y, enable: false">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;Z</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.currentSteps.Z, enable: false">
<button class="btn" data-bind="click: $root.loadESteps, enable: $root.loadEStepsActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
title="Loads current value from EEPROM by calling M92">
<i class="fas fa-sync-alt" style="color:false" data-color="false"></i>
</button>
</div>
</div>
</div>
<div class="row-fluid">
<div class="span3">
<label for="tunningPIDNoCycles" class="pull-right" style="margin-top: 5px;" title="x">
GCode cube size
</label>
</div>
<div class="span9">
<div class="input-prepend input-append">
<span class="add-on" title="">X</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.gCodeCubeSize.X">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;Y</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.gCodeCubeSize.Y">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;Z</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.gCodeCubeSize.Z">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;mm</span>
</div>
</div>
</div>
<div class="row-fluid">
<div class="span3">
<label for="tunningPIDNoCycles" class="pull-right" style="margin-top: 5px;" title="x">
Printed cube size
</label>
</div>
<div class="span9">
<div class="input-prepend input-append">
<span class="add-on" title="">X</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.printedCubeSize.X">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;Y</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.printedCubeSize.Y">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;Z</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.printedCubeSize.Z">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;mm</span>
</div>
</div>
</div>
<div class="row-fluid">
<div class="span3">
<label for="tunningPIDNoCycles" class="pull-right" style="margin-top: 5px;" title="x">
New values
</label>
</div>
<div class="span9">
<div class="input-prepend input-append">
{{ snipped.linkToMarlin("M092", "Marlin website") }}
<span class="add-on" title="">M92&nbsp;&nbsp;&nbsp;X</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.newSteps.X">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;Y</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.newSteps.Y">
<span class="add-on" title="">&nbsp;&nbsp;&nbsp;Z</span>
<input type="number" id="" class="input-small" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.newSteps.Z">
{{ snipped.m500Icon() }}
</div>
</div>
</div>
<div class="row-fluid" style="margin-bottom: 5px;">
<div class="span3"></div>
<div class="span9">
<button class="btn btn-success" data-bind="click: $root.saveEStepsXYZ, enable: $root.saveEStepsXYZActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
title="This will save new values to EEPROM (M92 Xx Yx Zx; M500)">
<i class="fas fa-save" style="color:false" data-color="false"></i>&nbsp&nbsp
Save to EEPROM
</button>
</div>
</div>