- Settings split on heater index
-General impl of hookRegistered functions -registerRegexMsg recevies a compiled regex -single regex for all pid types of respond
This commit is contained in:
sergiuToporjinschi
@@ -61,7 +61,7 @@
|
||||
</div>
|
||||
<div class="span6">
|
||||
<div class="input-append">
|
||||
<input type="number" id="eSteps" title="Current value for number of steps/mm for E axe in EEPROM" class="input-small" step="0.01" data-bind="value: $root.steps.E, enable:false">
|
||||
<input type="number" id="eSteps" title="Current value for number of steps/mm for E axe in EEPROM" class="input-small" step="0.01" data-bind="value: $root.steps.E(), enable:false">
|
||||
<span class="add-on" title="Current value for number of steps/mm for E axe in EEPROM">steps/mm</span>
|
||||
<button class="btn" data-bind="click: $root.loadESteps, enable: $root.loadEStepsActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
|
||||
title="Loads current value of steps/mm from EEPROM by calling M92">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% import "macros.jinja2" as snipped %}
|
||||
|
||||
{{ snipped.subSection("Hot-end tuning", true) }}
|
||||
{{ snipped.subSection("Current PID values", true) }}
|
||||
<div class="row-fluid">
|
||||
<div class="span5">
|
||||
<label for="hotEndPid" class="pull-right" style="margin-top: 5px;" title="Current hot-end PID">
|
||||
@@ -15,9 +15,6 @@
|
||||
<span class="add-on numberDisplay" title="Integral gain" data-bind="text: $root.pidCurrentValues.hotEnd.I()"></span>
|
||||
<span class="add-on" title="Derivative">D</span>
|
||||
<span class="add-on numberDisplay" title="Derivative" data-bind="text: $root.pidCurrentValues.hotEnd.D()"></span>
|
||||
<button class="btn" data-bind="click: $root.getCurrentValues, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())" title="Load current PIDs">
|
||||
<i class="fas fa-sync-alt" style="color:false" data-color="false"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -38,7 +35,67 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
<div class="span5">
|
||||
</div>
|
||||
<div class="span7">
|
||||
<div class="input-prepend input-append" id="bedPid">
|
||||
<button class="btn" data-bind="click: $root.getCurrentValues, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())" title="Load current PIDs">
|
||||
<i class="fas fa-sync-alt" style="color:false" data-color="false"></i>  
|
||||
Get current values
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{ snipped.subSection("Hot-end tuning", true) }}
|
||||
<div class="row-fluid">
|
||||
<div class="span5">
|
||||
<label for="fanSpeed" class="pull-right" style="margin-top: 5px;" title="Fan speed">
|
||||
Turn fan to max
|
||||
</label>
|
||||
</div>
|
||||
<div class="span7">
|
||||
<div class="input-prepend input-append">
|
||||
{{ snipped.linkToMarlin("M106", "Marlin website") }}
|
||||
<span class="add-on" title="Command for turning the fan to 100%">M106 S</span>
|
||||
<input type="number" id="fanSpeed" title="Command for turning the fan to 100%" class="input-mini" step="1" min="0" max="255" data-bind="value: $root.pid.hotEnd.fanSpeed">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
<div class="span5">
|
||||
<label for="tunningPIDNoCycles" class="pull-right" style="margin-top: 5px;" title="x">
|
||||
Tuning PID
|
||||
</label>
|
||||
</div>
|
||||
<div class="span7">
|
||||
<div class="input-prepend input-append">
|
||||
{{ snipped.linkToMarlin("M303", "Marlin website") }}
|
||||
<span class="add-on" title="Command for triggering tool PID tunning">M303 C</span>
|
||||
<input type="number" id="tunningPIDNoCycles" class="input-mini" step="1" min="0" title="Tool number 0 for first hot end" data-bind="value: $root.pid.hotEnd.noCycles">
|
||||
<span class="add-on" title=""> E</span>
|
||||
<input type="number" id="tunningPIDHotEnd" class="input-mini" step="1" min="0" title="Hotend index 0 for first hot end" data-bind="value: $root.pid.hotEnd.hotEndIndex">
|
||||
<span class="add-on" title=""> S</span>
|
||||
<input type="number" id="tunningPIDHotEndTemp" class="input-mini" step="1" min="100" max="280" title="Target temperature" data-bind="value: $root.pid.hotEnd.targetTemp">
|
||||
<span class="add-on" title=""> U1</span>
|
||||
{{ snipped.m500Icon() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row-fluid" style="margin-bottom: 5px;">
|
||||
<div class="span5"></div>
|
||||
<div class="span7">
|
||||
<button class="btn btn-success" data-bind="click: $root.startPidHotEnd, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
|
||||
title="This will trigger PID auto tuning (M106 Sx; M303 Ex Sx U1; M500)">
|
||||
<i class="fas fa-play" style="color:false" data-color="false"></i>  
|
||||
Start hot-end PID tunning
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{ snipped.subSection("Heated bed tuning", true) }}
|
||||
<div class="row-fluid">
|
||||
<div class="span5">
|
||||
<label for="fanSpeed" class="pull-right" style="margin-top: 5px;" title="Fan speed">
|
||||
@@ -62,12 +119,12 @@
|
||||
<div class="span7">
|
||||
<div class="input-prepend input-append">
|
||||
{{ snipped.linkToMarlin("M303", "Marlin website") }}
|
||||
<span class="add-on" title="Command for triggering tool PID tunning">M303 C</span>
|
||||
<input type="number" id="tunningPIDNoCycles" class="input-mini" step="1" min="0" title="Tool number 0 for first hot end" data-bind="value: $root.pid.noCycles">
|
||||
<span class="add-on" title="Command for triggering bed PID tunning">M304 C</span>
|
||||
<input type="number" id="tunningPIDNoCycles" class="input-mini" step="1" min="0" title="Number of cycles to run in tuning" data-bind="value: $root.pid.bed.noCycles">
|
||||
<span class="add-on" title=""> E</span>
|
||||
<input type="number" id="tunningPIDTool" class="input-mini" step="1" min="0" title="Hotend index 0 for first hot end" data-bind="value: $root.pid.hotEndIndex">
|
||||
<input type="number" id="tunningPIDBed" class="input-mini" step="1" min="0" title="Bed index" data-bind="value: $root.pid.bed.index, enable: false">
|
||||
<span class="add-on" title=""> S</span>
|
||||
<input type="number" id="tunningPIDToolTemp" class="input-mini" step="1" min="100" max="280" title="Target temperature" data-bind="value: $root.pid.targetTemp">
|
||||
<input type="number" id="tunningPIDBedTemp" class="input-mini" step="1" min="20" max="80" title="Target temperature" data-bind="value: $root.pid.bed.targetTemp">
|
||||
<span class="add-on" title=""> U1</span>
|
||||
{{ snipped.m500Icon() }}
|
||||
</div>
|
||||
@@ -77,17 +134,14 @@
|
||||
<div class="row-fluid" style="margin-bottom: 5px;">
|
||||
<div class="span5"></div>
|
||||
<div class="span7">
|
||||
<button class="btn btn-success" data-bind="click: $root.startPidHotEnd, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
|
||||
title="This will trigger PID auto tuning (M106 Sx; M303 Ex Sx U1; M500)">
|
||||
<button class="btn btn-success" data-bind="click: $root.startPidBed, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
|
||||
title="This will trigger PID auto tuning (M304 E-1 Sx U1; M500)">
|
||||
<i class="fas fa-play" style="color:false" data-color="false"></i>  
|
||||
Start PID tunning
|
||||
Start bed PID tunning
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{ snipped.subSection("Heated bed tuning", true) }}
|
||||
|
||||
|
||||
{{ snipped.subSection("Note", true) }}
|
||||
{{ 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.",
|
||||
|
||||
Reference in New Issue
Block a user