pull/153/head
openbuilds-engineer 2020-04-16 20:17:40 +02:00
rodzic fc224ddc32
commit b9b2ae5b10
5 zmienionych plików z 265 dodań i 261 usunięć

Wyświetl plik

@ -436,7 +436,7 @@
<!-- <script type="text/javascript" src="js/updates.js"></script> -->
<script type="text/javascript" src="../js/ui.js"></script>
<script type="text/javascript" src="../js/websocket.js"></script>
<!-- <script type="text/javascript" src="js/grblsettings.js"></script> -->
<script type="text/javascript" src="../js/grblsettings.js"></script>
<script type="text/javascript" src="../js/metroactions.js"></script>
<script type="text/javascript" src="../js/jog.js"></script>
<!-- <script type="text/javascript" src="../js/probe.js"></script>

Wyświetl plik

@ -75,110 +75,144 @@ function grblSettings(data) {
}
function grblPopulate() {
$('#grblconfig').show();
$('#grblconfig').empty();
var template = `
<form id="grblSettingsTable">
<ul class="step-list">
if (!isJogWidget) {
$('#grblconfig').show();
$('#grblconfig').empty();
var template = `
<form id="grblSettingsTable">
<ul class="step-list">
<li id="installDriversOnSettingspage">
<h6 class="fg-openbuilds">Load Default Settings<br><small>Populate Grbl parameters from machine-type defaults. You can customize values as needed below. Remember to click Save above to apply</small></h6>
<hr class="bg-openbuilds">
<div>
<li id="installDriversOnSettingspage">
<h6 class="fg-openbuilds">Load Default Settings<br><small>Populate Grbl parameters from machine-type defaults. You can customize values as needed below. Remember to click Save above to apply</small></h6>
<hr class="bg-openbuilds">
<div>
<div class="grid">
<div class="row">
<div class="cell-8">
<a style="width: 100%;" class="button dropdown-toggle bd-openbuilds secondary outline" id="context_toggle2"><img src="img/mch/sphinx55.png"/> Select Machine</a>
<ul class="ribbon-dropdown" data-role="dropdown" data-duration="100">
<li><a href="#" onclick="selectMachine('custom');"><img src="img/mch/custom.png" width="16px"/> Custom Machine</a></li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('acro55');"><a href="#"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro 55</a></li>
<li onclick="selectMachine('acro510');"><a href="#"><img src="img/mch/acro510.png" width="16px"/> OpenBuilds Acro 510</a></li>
<li onclick="selectMachine('acro1010');"><a href="#"><img src="img/mch/acro1010.png" width="16px"/> OpenBuilds Acro 1010</a></li>
<li onclick="selectMachine('acro1510');"><a href="#"><img src="img/mch/acro1510.png" width="16px"/> OpenBuilds Acro 1510</a></li>
<li onclick="selectMachine('acro1515');"><a href="#"><img src="img/mch/acro1515.png" width="16px"/> OpenBuilds Acro 1515</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro with Servo Pen Attachment</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('acro55pen');"><a href="#"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro 55 with Servo Pen Attachment</a></li>
<li onclick="selectMachine('acro510pen');"><a href="#"><img src="img/mch/acro510.png" width="16px"/> OpenBuilds Acro 510 with Servo Pen Attachment</a></li>
<li onclick="selectMachine('acro1010pen');"><a href="#"><img src="img/mch/acro1010.png" width="16px"/> OpenBuilds Acro 1010 with Servo Pen Attachment</a></li>
<li onclick="selectMachine('acro1510pen');"><a href="#"><img src="img/mch/acro1510.png" width="16px"/> OpenBuilds Acro 1510 with Servo Pen Attachment</a></li>
<li onclick="selectMachine('acro1515pen');"><a href="#"><img src="img/mch/acro1515.png" width="16px"/> OpenBuilds Acro 1515 with Servo Pen Attachment</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/cbeam.png" width="16px"/> OpenBuilds C-Beam Machine</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('cbeam');"><a href="#"><img src="img/mch/cbeam.png" width="16px"/> OpenBuilds C-Beam Machine</a></li>
<li onclick="selectMachine('cbeamxl');"><a href="#"><img src="img/mch/cbeamxl.png" width="16px"/> OpenBuilds C-Beam XL</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/leadmachine1010.png" width="16px"/> OpenBuilds LEAD Machine</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('leadmachine1010');"><a href="#"><img src="img/mch/leadmachine1010.png" width="16px"/>OpenBuilds LEAD 1010</a></li>
<li onclick="selectMachine('leadmachine1010laser');"><a href="#"><img src="img/mch/leadmachine1010.png" width="16px"/>OpenBuilds LEAD 1010 with Laser Module</a></li>
</ul>
</li>
<li><a href="#" onclick="selectMachine('minimill');"><img src="img/mch/minimill.png" width="16px"/> OpenBuilds MiniMill</a></li>
<div class="grid">
<div class="row">
<div class="cell-8">
<a style="width: 100%;" class="button dropdown-toggle bd-openbuilds secondary outline" id="context_toggle2"><img src="img/mch/sphinx55.png"/> Select Machine</a>
<ul class="ribbon-dropdown" data-role="dropdown" data-duration="100">
<li><a href="#" onclick="selectMachine('custom');"><img src="img/mch/custom.png" width="16px"/> Custom Machine</a></li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('acro55');"><a href="#"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro 55</a></li>
<li onclick="selectMachine('acro510');"><a href="#"><img src="img/mch/acro510.png" width="16px"/> OpenBuilds Acro 510</a></li>
<li onclick="selectMachine('acro1010');"><a href="#"><img src="img/mch/acro1010.png" width="16px"/> OpenBuilds Acro 1010</a></li>
<li onclick="selectMachine('acro1510');"><a href="#"><img src="img/mch/acro1510.png" width="16px"/> OpenBuilds Acro 1510</a></li>
<li onclick="selectMachine('acro1515');"><a href="#"><img src="img/mch/acro1515.png" width="16px"/> OpenBuilds Acro 1515</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro with Servo Pen Attachment</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('acro55pen');"><a href="#"><img src="img/mch/acro55.png" width="16px"/> OpenBuilds Acro 55 with Servo Pen Attachment</a></li>
<li onclick="selectMachine('acro510pen');"><a href="#"><img src="img/mch/acro510.png" width="16px"/> OpenBuilds Acro 510 with Servo Pen Attachment</a></li>
<li onclick="selectMachine('acro1010pen');"><a href="#"><img src="img/mch/acro1010.png" width="16px"/> OpenBuilds Acro 1010 with Servo Pen Attachment</a></li>
<li onclick="selectMachine('acro1510pen');"><a href="#"><img src="img/mch/acro1510.png" width="16px"/> OpenBuilds Acro 1510 with Servo Pen Attachment</a></li>
<li onclick="selectMachine('acro1515pen');"><a href="#"><img src="img/mch/acro1515.png" width="16px"/> OpenBuilds Acro 1515 with Servo Pen Attachment</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/cbeam.png" width="16px"/> OpenBuilds C-Beam Machine</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('cbeam');"><a href="#"><img src="img/mch/cbeam.png" width="16px"/> OpenBuilds C-Beam Machine</a></li>
<li onclick="selectMachine('cbeamxl');"><a href="#"><img src="img/mch/cbeamxl.png" width="16px"/> OpenBuilds C-Beam XL</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/leadmachine1010.png" width="16px"/> OpenBuilds LEAD Machine</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('leadmachine1010');"><a href="#"><img src="img/mch/leadmachine1010.png" width="16px"/>OpenBuilds LEAD 1010</a></li>
<li onclick="selectMachine('leadmachine1010laser');"><a href="#"><img src="img/mch/leadmachine1010.png" width="16px"/>OpenBuilds LEAD 1010 with Laser Module</a></li>
</ul>
</li>
<li><a href="#" onclick="selectMachine('minimill');"><img src="img/mch/minimill.png" width="16px"/> OpenBuilds MiniMill</a></li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/sphinx55.png" width="16px"/> OpenBuilds Sphinx</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('sphinx55');"><a href="#"><img src="img/mch/sphinx55.png" width="16px"/> OpenBuilds Sphinx 55</a></li>
<li onclick="selectMachine('sphinx1050');"><a href="#"><img src="img/mch/sphinx1050.png" width="16px"/> OpenBuilds Sphinx 1050</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/workbee1010.png" width="16px"/> OpenBuilds WorkBee</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('workbee1010');"><a href="#"><img src="img/mch/workbee1010.png" width="16px"/> OpenBuilds WorkBee 1010</a></li>
<li onclick="selectMachine('workbee1050');"><a href="#"><img src="img/mch/workbee1050.png" width="16px"/> OpenBuilds WorkBee 1050</a></li>
<li onclick="selectMachine('workbee1510');"><a href="#"><img src="img/mch/workbee1510.png" width="16px"/> OpenBuilds WorkBee 1510</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/sphinx55.png" width="16px"/> OpenBuilds Sphinx</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('sphinx55');"><a href="#"><img src="img/mch/sphinx55.png" width="16px"/> OpenBuilds Sphinx 55</a></li>
<li onclick="selectMachine('sphinx1050');"><a href="#"><img src="img/mch/sphinx1050.png" width="16px"/> OpenBuilds Sphinx 1050</a></li>
</ul>
</li>
<li>
<a href="#" class="dropdown-toggle"><img src="img/mch/workbee1010.png" width="16px"/> OpenBuilds WorkBee</a>
<ul class="ribbon-dropdown" data-role="dropdown">
<li onclick="selectMachine('workbee1010');"><a href="#"><img src="img/mch/workbee1010.png" width="16px"/> OpenBuilds WorkBee 1010</a></li>
<li onclick="selectMachine('workbee1050');"><a href="#"><img src="img/mch/workbee1050.png" width="16px"/> OpenBuilds WorkBee 1050</a></li>
<li onclick="selectMachine('workbee1510');"><a href="#"><img src="img/mch/workbee1510.png" width="16px"/> OpenBuilds WorkBee 1510</a></li>
</ul>
</li>
</ul>
</ul>
</div>
<div class="cell-4">
<input id="limitsinstalled" data-cls-caption="fg-openbuilds" data-cls-check="bd-openbuilds openbuilds-switch" data-cls-switch="openbuilds-switch" type="checkbox" data-role="switch" data-caption="Limit&nbsp;Switches&nbsp;Installed">
</div>
<div class="cell-4">
<input id="limitsinstalled" data-cls-caption="fg-openbuilds" data-cls-check="bd-openbuilds openbuilds-switch" data-cls-switch="openbuilds-switch" type="checkbox" data-role="switch" data-caption="Limit&nbsp;Switches&nbsp;Installed">
</div>
</div>
</div>
</div>
</div>
</li>
</li>
<li id="installDriversOnSettingspage">
<h6 class="fg-openbuilds">Advanced Settings<br><small>Customise your Grbl settings below</small></h6>
<hr class="bg-openbuilds">
<div>
<li id="installDriversOnSettingspage">
<h6 class="fg-openbuilds">Advanced Settings<br><small>Customise your Grbl settings below</small></h6>
<hr class="bg-openbuilds">
<div>
<div style="overflow-y: scroll; height: calc(100vh - 450px); max-height: calc(100vh - 450px); ">
<table class="table compact striped row-hover row-border" data-show-rows-steps="false" data-rows="200" data-show-pagination="false" data-show-table-info="false" data-show-search="false">
<thead>
<tr>
<th>Key</th>
<th>Parameter</th>
<th style="width: 250px; min-width: 240px !important;">Value</th>
<th style="width: 110px; min-width: 110px !important;">Utility</th>
<div style="overflow-y: scroll; height: calc(100vh - 450px); max-height: calc(100vh - 450px); ">
<table class="table compact striped row-hover row-border" data-show-rows-steps="false" data-rows="200" data-show-pagination="false" data-show-table-info="false" data-show-search="false">
<thead>
<tr>
<th>Key</th>
<th>Parameter</th>
<th style="width: 250px; min-width: 240px !important;">Value</th>
<th style="width: 110px; min-width: 110px !important;">Utility</th>
</tr>
</thead>
<tbody>
<tr title="` + grblConfigDesc['$0'] + `"><td>$0</td><td>Step pulse time, microseconds</td><td><input data-role="input" data-clear-button="false" data-append="&micro;s" type="text" value="` + grblParams['$0'] + `" id="val-` + 0 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$1'] + `"><td>$1</td><td>Step idle delay, milliseconds</td><td><input data-role="input" data-clear-button="false" data-append="ms" type="text" value="` + grblParams['$1'] + `" id="val-` + 1 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$2'] + `"><td>$2</td>
<td>Step pulse invert</td>
<td>
<select id="val-` + 2 + `-input" value="` + grblParams['$2'] + `">
<option value="0">[0] X:&#9898; Y:&#9898; Z:&#9898;</option>
<option value="1">[1] X:&#9899; Y:&#9898; Z:&#9898;</option>
<option value="2">[2] X:&#9898; Y:&#9899; Z:&#9898;</option>
<option value="3">[3] X:&#9899; Y:&#9899; Z:&#9898;</option>
<option value="4">[4] X:&#9898; Y:&#9898; Z:&#9899;</option>
<option value="5">[5] X:&#9899; Y:&#9898; Z:&#9899;</option>
<option value="6">[6] X:&#9898; Y:&#9899; Z:&#9899;</option>
<option value="7">[7] X:&#9899; Y:&#9899; Z:&#9899;</option>
</select>
</td>
<td></td>
</tr>
</thead>
<tr title="` + grblConfigDesc['$3'] + `"><td>$3</td><td>Step direction invert</td><td><input readonly type="hidden" id="val-` + 3 + `-input" value="` + grblParams['$3'] + `">
<input data-cls-caption="fg-openbuilds" id="xdirinvert" class="secondary" type="checkbox" data-role="switch" data-caption="Invert X Direction"><br>
<input data-cls-caption="fg-openbuilds" id="ydirinvert" class="secondary" type="checkbox" data-role="switch" data-caption="Invert Y Direction"><br>
<input data-cls-caption="fg-openbuilds" id="zdirinvert" class="secondary" type="checkbox" data-role="switch" data-caption="Invert Z Direction">
</td><td></td></tr>
<tr title="` + grblConfigDesc['$4'] + `"><td>$4</td><td>Invert step enable pin</td><td><select id="val-` + 4 + `-input" value="` + grblParams['$4'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$5'] + `"><td>$5</td><td>Invert limit pins</td><td><select id="val-` + 5 + `-input" value="` + grblParams['$5'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$6'] + `"><td>$6</td><td>Invert probe pin</td><td><select id="val-` + 6 + `-input" value="` + grblParams['$6'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$10'] + `"><td>$10</td><td>Status report options</td><td><select id="val-` + 10 + `-input" value="` + grblParams['$10'] + `">
<option value="0">[0] WPos:&#9899; MPos:&#9898; Buf:&#9898;</option>
<option value="1">[1] WPos:&#9898; MPos:&#9899; Buf:&#9898;</option>
<option value="2">[2] WPos:&#9899; MPos:&#9898; Buf:&#9899;</option>
</select></td><td></td></tr>
<tr title="` + grblConfigDesc['$11'] + `"><td>$11</td><td>Junction deviation, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$11'] + `" id="val-` + 11 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$12'] + `"><td>$12</td><td>Arc tolerance, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$12'] + `" id="val-` + 12 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$13'] + `"><td>$13</td><td>Report in inches</td><td><select id="val-` + 13 + `-input" value="` + grblParams['$13'] + `"><option value="0">&#9898; Disable</option><option value="1">&#9899; Enable</option></select></td><td></td></tr>
<tbody>
<tr title="` + grblConfigDesc['$0'] + `"><td>$0</td><td>Step pulse time, microseconds</td><td><input data-role="input" data-clear-button="false" data-append="&micro;s" type="text" value="` + grblParams['$0'] + `" id="val-` + 0 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$1'] + `"><td>$1</td><td>Step idle delay, milliseconds</td><td><input data-role="input" data-clear-button="false" data-append="ms" type="text" value="` + grblParams['$1'] + `" id="val-` + 1 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$2'] + `"><td>$2</td>
<td>Step pulse invert</td>
<td>
<select id="val-` + 2 + `-input" value="` + grblParams['$2'] + `">
<tr title="` + grblConfigDesc['$20'] + `"><td>$20</td><td>Soft limits enable <br><small>(Enable and Save Homing first before enabling)<small></td><td><select id="val-` + 20 + `-input" value="` + grblParams['$20'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$21'] + `"><td>$21</td><td>Hard limits enable</td><td><select id="val-` + 21 + `-input" value="` + grblParams['$21'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$22'] + `"><td>$22</td><td>Homing cycle enable</td><td><select id="val-` + 22 + `-input" value="` + grblParams['$22'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$23'] + `"><td>$23</td><td>Homing direction invert</td><td><select id="val-` + 23 + `-input" value="` + grblParams['$23'] + `">
<option value="0">[0] X:&#9898; Y:&#9898; Z:&#9898;</option>
<option value="1">[1] X:&#9899; Y:&#9898; Z:&#9898;</option>
<option value="2">[2] X:&#9898; Y:&#9899; Z:&#9898;</option>
@ -187,173 +221,142 @@ function grblPopulate() {
<option value="5">[5] X:&#9899; Y:&#9898; Z:&#9899;</option>
<option value="6">[6] X:&#9898; Y:&#9899; Z:&#9899;</option>
<option value="7">[7] X:&#9899; Y:&#9899; Z:&#9899;</option>
</select>
</td>
<td></td>
</tr>
<tr title="` + grblConfigDesc['$3'] + `"><td>$3</td><td>Step direction invert</td><td><input readonly type="hidden" id="val-` + 3 + `-input" value="` + grblParams['$3'] + `">
<input data-cls-caption="fg-openbuilds" id="xdirinvert" class="secondary" type="checkbox" data-role="switch" data-caption="Invert X Direction"><br>
<input data-cls-caption="fg-openbuilds" id="ydirinvert" class="secondary" type="checkbox" data-role="switch" data-caption="Invert Y Direction"><br>
<input data-cls-caption="fg-openbuilds" id="zdirinvert" class="secondary" type="checkbox" data-role="switch" data-caption="Invert Z Direction">
</td><td></td></tr>
<tr title="` + grblConfigDesc['$4'] + `"><td>$4</td><td>Invert step enable pin</td><td><select id="val-` + 4 + `-input" value="` + grblParams['$4'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$5'] + `"><td>$5</td><td>Invert limit pins</td><td><select id="val-` + 5 + `-input" value="` + grblParams['$5'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$6'] + `"><td>$6</td><td>Invert probe pin</td><td><select id="val-` + 6 + `-input" value="` + grblParams['$6'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$10'] + `"><td>$10</td><td>Status report options</td><td><select id="val-` + 10 + `-input" value="` + grblParams['$10'] + `">
<option value="0">[0] WPos:&#9899; MPos:&#9898; Buf:&#9898;</option>
<option value="1">[1] WPos:&#9898; MPos:&#9899; Buf:&#9898;</option>
<option value="2">[2] WPos:&#9899; MPos:&#9898; Buf:&#9899;</option>
</select></td><td></td></tr>
<tr title="` + grblConfigDesc['$11'] + `"><td>$11</td><td>Junction deviation, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$11'] + `" id="val-` + 11 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$12'] + `"><td>$12</td><td>Arc tolerance, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$12'] + `" id="val-` + 12 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$13'] + `"><td>$13</td><td>Report in inches</td><td><select id="val-` + 13 + `-input" value="` + grblParams['$13'] + `"><option value="0">&#9898; Disable</option><option value="1">&#9899; Enable</option></select></td><td></td></tr>
</select></td><td></td></tr>
<tr title="` + grblConfigDesc['$24'] + `"><td>$24</td><td>Homing locate feed rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$24'] + `" id="val-` + 24 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$25'] + `"><td>$25</td><td>Homing search seek rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$25'] + `" id="val-` + 25 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$26'] + `"><td>$26</td><td>Homing switch debounce delay, milliseconds</td><td><input data-role="input" data-clear-button="false" data-append="ms" type="text" value="` + grblParams['$26'] + `" id="val-` + 26 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$27'] + `"><td>$27</td><td>Homing switch pull-off distance, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$27'] + `" id="val-` + 27 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$20'] + `"><td>$20</td><td>Soft limits enable <br><small>(Enable and Save Homing first before enabling)<small></td><td><select id="val-` + 20 + `-input" value="` + grblParams['$20'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$21'] + `"><td>$21</td><td>Hard limits enable</td><td><select id="val-` + 21 + `-input" value="` + grblParams['$21'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$22'] + `"><td>$22</td><td>Homing cycle enable</td><td><select id="val-` + 22 + `-input" value="` + grblParams['$22'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$23'] + `"><td>$23</td><td>Homing direction invert</td><td><select id="val-` + 23 + `-input" value="` + grblParams['$23'] + `">
<option value="0">[0] X:&#9898; Y:&#9898; Z:&#9898;</option>
<option value="1">[1] X:&#9899; Y:&#9898; Z:&#9898;</option>
<option value="2">[2] X:&#9898; Y:&#9899; Z:&#9898;</option>
<option value="3">[3] X:&#9899; Y:&#9899; Z:&#9898;</option>
<option value="4">[4] X:&#9898; Y:&#9898; Z:&#9899;</option>
<option value="5">[5] X:&#9899; Y:&#9898; Z:&#9899;</option>
<option value="6">[6] X:&#9898; Y:&#9899; Z:&#9899;</option>
<option value="7">[7] X:&#9899; Y:&#9899; Z:&#9899;</option>
</select></td><td></td></tr>
<tr title="` + grblConfigDesc['$24'] + `"><td>$24</td><td>Homing locate feed rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$24'] + `" id="val-` + 24 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$25'] + `"><td>$25</td><td>Homing search seek rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$25'] + `" id="val-` + 25 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$26'] + `"><td>$26</td><td>Homing switch debounce delay, milliseconds</td><td><input data-role="input" data-clear-button="false" data-append="ms" type="text" value="` + grblParams['$26'] + `" id="val-` + 26 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$27'] + `"><td>$27</td><td>Homing switch pull-off distance, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$27'] + `" id="val-` + 27 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$30'] + `"><td>$30</td><td>Maximum spindle speed, RPM</td><td><input data-role="input" data-clear-button="false" data-append="RPM" type="text" value="` + grblParams['$30'] + `" id="val-` + 30 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$31'] + `"><td>$31</td><td>Minimum spindle speed, RPM</td><td><input data-role="input" data-clear-button="false" data-append="RPM" type="text" value="` + grblParams['$31'] + `" id="val-` + 31 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$32'] + `"><td>$32</td><td>Laser-mode enable</td><td><select id="val-` + 32 + `-input" value="` + grblParams['$32'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$30'] + `"><td>$30</td><td>Maximum spindle speed, RPM</td><td><input data-role="input" data-clear-button="false" data-append="RPM" type="text" value="` + grblParams['$30'] + `" id="val-` + 30 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$31'] + `"><td>$31</td><td>Minimum spindle speed, RPM</td><td><input data-role="input" data-clear-button="false" data-append="RPM" type="text" value="` + grblParams['$31'] + `" id="val-` + 31 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$32'] + `"><td>$32</td><td>Laser-mode enable</td><td><select id="val-` + 32 + `-input" value="` + grblParams['$32'] + `"><option value="0">&#x2717; Disable</option><option value="1">&#x2713; Enable</option></select></td><td></td></tr>
<tr title="` + grblConfigDesc['$100'] + `">
<td>$100</td>
<td>X-axis steps per millimeter</td>
<td><input data-role="input" data-clear-button="false" data-append="steps/mm" type="text" value="` + grblParams['$100'] + `" id="val-` + 100 + `-input"></td>
<td>
<button title="Calculate X-Axis Steps per mm" class="button " type="button" onclick="xstepspermm()">
<span class="fa-layers fa-fw">
<i class="fas fa-calculator" data-fa-transform="shrink-2"></i>
<span class="fa-layers-text" data-fa-transform="up-16" style="font-weight:600; font-family: Arial; font-size: 10px;">Calc</span>
<span class="fa-layers-text" data-fa-transform="down-19" style="font-weight:600; font-family: Arial; font-size: 10px;">Steps</span>
</span>
</button>
</td>
</tr>
<tr title="` + grblConfigDesc['$100'] + `">
<td>$100</td>
<td>X-axis steps per millimeter</td>
<td><input data-role="input" data-clear-button="false" data-append="steps/mm" type="text" value="` + grblParams['$100'] + `" id="val-` + 100 + `-input"></td>
<td>
<button title="Calculate X-Axis Steps per mm" class="button " type="button" onclick="xstepspermm()">
<tr title="` + grblConfigDesc['$101'] + `">
<td>$101</td>
<td>Y-axis steps per millimeter</td>
<td><input data-role="input" data-clear-button="false" data-append="steps/mm" type="text" value="` + grblParams['$101'] + `" id="val-` + 101 + `-input"></td>
<td>
<button title="Calculate Y-Axis Steps per mm" class="button" type="button" onclick="ystepspermm()">
<span class="fa-layers fa-fw">
<i class="fas fa-calculator" data-fa-transform="shrink-2"></i>
<span class="fa-layers-text" data-fa-transform="up-16" style="font-weight:600; font-family: Arial; font-size: 10px;">Calc</span>
<span class="fa-layers-text" data-fa-transform="down-19" style="font-weight:600; font-family: Arial; font-size: 10px;">Steps</span>
</span>
</button>
</td>
</tr>
<i class="fas fa-calculator" data-fa-transform="shrink-2"></i>
<span class="fa-layers-text" data-fa-transform="up-16" style="font-weight:600; font-family: Arial; font-size: 10px;">Calc</span>
<span class="fa-layers-text" data-fa-transform="down-19" style="font-weight:600; font-family: Arial; font-size: 10px;">Steps</span>
</span>
</button>
</td>
</tr>
<tr title="` + grblConfigDesc['$101'] + `">
<td>$101</td>
<td>Y-axis steps per millimeter</td>
<td><input data-role="input" data-clear-button="false" data-append="steps/mm" type="text" value="` + grblParams['$101'] + `" id="val-` + 101 + `-input"></td>
<td>
<button title="Calculate Y-Axis Steps per mm" class="button" type="button" onclick="ystepspermm()">
<span class="fa-layers fa-fw">
<i class="fas fa-calculator" data-fa-transform="shrink-2"></i>
<span class="fa-layers-text" data-fa-transform="up-16" style="font-weight:600; font-family: Arial; font-size: 10px;">Calc</span>
<span class="fa-layers-text" data-fa-transform="down-19" style="font-weight:600; font-family: Arial; font-size: 10px;">Steps</span>
</span>
</button>
</td>
</tr>
<tr title="` + grblConfigDesc['$102'] + `">
<td>$102</td>
<td>Z-axis steps per millimeter</td>
<td><input data-role="input" data-clear-button="false" data-append="steps/mm" type="text" value="` + grblParams['$102'] + `" id="val-` + 102 + `-input"></td>
<td>
<button title="Calculate Z-Axis Steps per mm" class="button" type="button" onclick="zstepspermm()">
<span class="fa-layers fa-fw">
<i class="fas fa-calculator" data-fa-transform="shrink-2"></i>
<span class="fa-layers-text" data-fa-transform="up-16" style="font-weight:600; font-family: Arial; font-size: 10px;">Calc</span>
<span class="fa-layers-text" data-fa-transform="down-19" style="font-weight:600; font-family: Arial; font-size: 10px;">Steps</span>
</span>
</button>
</td>
</tr>
<tr title="` + grblConfigDesc['$102'] + `">
<td>$102</td>
<td>Z-axis steps per millimeter</td>
<td><input data-role="input" data-clear-button="false" data-append="steps/mm" type="text" value="` + grblParams['$102'] + `" id="val-` + 102 + `-input"></td>
<td>
<button title="Calculate Z-Axis Steps per mm" class="button" type="button" onclick="zstepspermm()">
<span class="fa-layers fa-fw">
<i class="fas fa-calculator" data-fa-transform="shrink-2"></i>
<span class="fa-layers-text" data-fa-transform="up-16" style="font-weight:600; font-family: Arial; font-size: 10px;">Calc</span>
<span class="fa-layers-text" data-fa-transform="down-19" style="font-weight:600; font-family: Arial; font-size: 10px;">Steps</span>
</span>
</button>
</td>
</tr>
<tr title="` + grblConfigDesc['$110'] + `"><td>$110</td><td>X-axis maximum rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$110'] + `" id="val-` + 110 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$111'] + `"><td>$111</td><td>Y-axis maximum rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$111'] + `" id="val-` + 111 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$112'] + `"><td>$112</td><td>Z-axis maximum rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$112'] + `" id="val-` + 112 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$110'] + `"><td>$110</td><td>X-axis maximum rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$110'] + `" id="val-` + 110 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$111'] + `"><td>$111</td><td>Y-axis maximum rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$111'] + `" id="val-` + 111 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$112'] + `"><td>$112</td><td>Z-axis maximum rate, mm/min</td><td><input data-role="input" data-clear-button="false" data-append="mm/min" type="text" value="` + grblParams['$112'] + `" id="val-` + 112 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$120'] + `"><td>$120</td><td>X-axis acceleration, mm/sec<sup>2</sup></td><td><input data-role="input" data-clear-button="false" data-append="mm/sec&sup2" type="text" value="` + grblParams['$120'] + `" id="val-` + 120 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$121'] + `"><td>$121</td><td>Y-axis acceleration, mm/sec<sup>2</sup></td><td><input data-role="input" data-clear-button="false" data-append="mm/sec&sup2" type="text" value="` + grblParams['$121'] + `" id="val-` + 121 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$122'] + `"><td>$122</td><td>Z-axis acceleration, mm/sec<sup>2</sup></td><td><input data-role="input" data-clear-button="false" data-append="mm/sec&sup2" type="text" value="` + grblParams['$122'] + `" id="val-` + 122 + `-input"></td></td><td></td></tr>
<tr title="` + grblConfigDesc['$120'] + `"><td>$120</td><td>X-axis acceleration, mm/sec<sup>2</sup></td><td><input data-role="input" data-clear-button="false" data-append="mm/sec&sup2" type="text" value="` + grblParams['$120'] + `" id="val-` + 120 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$121'] + `"><td>$121</td><td>Y-axis acceleration, mm/sec<sup>2</sup></td><td><input data-role="input" data-clear-button="false" data-append="mm/sec&sup2" type="text" value="` + grblParams['$121'] + `" id="val-` + 121 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$122'] + `"><td>$122</td><td>Z-axis acceleration, mm/sec<sup>2</sup></td><td><input data-role="input" data-clear-button="false" data-append="mm/sec&sup2" type="text" value="` + grblParams['$122'] + `" id="val-` + 122 + `-input"></td></td><td></td></tr>
<tr title="` + grblConfigDesc['$130'] + `"><td>$130</td><td>X-axis maximum travel, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$130'] + `" id="val-` + 130 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$131'] + `"><td>$131</td><td>Y-axis maximum travel, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$131'] + `" id="val-` + 131 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$132'] + `"><td>$132</td><td>Z-axis maximum travel, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$132'] + `" id="val-` + 132 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$130'] + `"><td>$130</td><td>X-axis maximum travel, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$130'] + `" id="val-` + 130 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$131'] + `"><td>$131</td><td>Y-axis maximum travel, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$131'] + `" id="val-` + 131 + `-input"></td><td></td></tr>
<tr title="` + grblConfigDesc['$132'] + `"><td>$132</td><td>Z-axis maximum travel, millimeters</td><td><input data-role="input" data-clear-button="false" data-append="mm" type="text" value="` + grblParams['$132'] + `" id="val-` + 132 + `-input"></td><td></td></tr>
</tbody>
</table>
</tbody>
</table>
</div>
</div>
</li>
</ul>
</form>
</div>
</li>
</ul>
</form>
</div>
</div>`
$('#grblconfig').append(template)
</div>`
$('#grblconfig').append(template)
setTimeout(function() {
$("#val-32-input").val(parseInt(grblParams['$32'])).trigger("change");
$("#val-20-input").val(parseInt(grblParams['$20'])).trigger("change");
$("#val-21-input").val(parseInt(grblParams['$21'])).trigger("change");
$("#val-22-input").val(parseInt(grblParams['$22'])).trigger("change");
$("#val-23-input").val(parseInt(grblParams['$23'])).trigger("change");
$("#val-5-input").val(parseInt(grblParams['$5'])).trigger("change");
$("#val-6-input").val(parseInt(grblParams['$6'])).trigger("change");
$("#val-2-input").val(parseInt(grblParams['$2'])).trigger("change");
$("#val-3-input").val(parseInt(grblParams['$3'])).trigger("change");
$("#val-4-input").val(parseInt(grblParams['$4'])).trigger("change");
$("#val-10-input").val(parseInt(grblParams['$10'])).trigger("change");
}, 100);;
setTimeout(function() {
$("#val-32-input").val(parseInt(grblParams['$32'])).trigger("change");
$("#val-20-input").val(parseInt(grblParams['$20'])).trigger("change");
$("#val-21-input").val(parseInt(grblParams['$21'])).trigger("change");
$("#val-22-input").val(parseInt(grblParams['$22'])).trigger("change");
$("#val-23-input").val(parseInt(grblParams['$23'])).trigger("change");
$("#val-5-input").val(parseInt(grblParams['$5'])).trigger("change");
$("#val-6-input").val(parseInt(grblParams['$6'])).trigger("change");
$("#val-2-input").val(parseInt(grblParams['$2'])).trigger("change");
$("#val-3-input").val(parseInt(grblParams['$3'])).trigger("change");
$("#val-4-input").val(parseInt(grblParams['$4'])).trigger("change");
$("#val-10-input").val(parseInt(grblParams['$10'])).trigger("change");
}, 100);;
$('#grblSettingsTable').on('keyup paste click change', 'input, select', function() {
checkifchanged()
});
// Event Handlers for Switch Checkboxes
setTimeout(function() {
$('#limitsinstalled:checkbox').change(function() {
enableLimits();
$('#grblSettingsTable').on('keyup paste click change', 'input, select', function() {
checkifchanged()
});
$('#xdirinvert:checkbox').change(function() {
changeDirInvert();
});
$('#ydirinvert:checkbox').change(function() {
changeDirInvert();
});
$('#zdirinvert:checkbox').change(function() {
changeDirInvert();
});
// Event Handlers for Switch Checkboxes
setTimeout(function() {
$('#limitsinstalled:checkbox').change(function() {
enableLimits();
});
// populare Direction Invert Checkboxes
displayDirInvert()
$('#xdirinvert:checkbox').change(function() {
changeDirInvert();
});
$('#ydirinvert:checkbox').change(function() {
changeDirInvert();
});
$('#zdirinvert:checkbox').change(function() {
changeDirInvert();
});
}, 100)
// populare Direction Invert Checkboxes
displayDirInvert()
}, 100)
$('#grblSettingsBadge').hide();
$('#grblSettingsBadge').hide();
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#limitsinstalled:checkbox').prop('checked', true);
$('#gotozeroMPos').removeClass('disabled')
$('#homeBtn').attr('disabled', false)
} else {
$('#limitsinstalled:checkbox').prop('checked', false);
$('#gotozeroMPos').addClass('disabled')
$('#homeBtn').attr('disabled', true)
if (grblParams['$21'] == 1 && grblParams['$22'] == 1) {
$('#limitsinstalled:checkbox').prop('checked', true);
$('#gotozeroMPos').removeClass('disabled')
$('#homeBtn').attr('disabled', false)
} else {
$('#limitsinstalled:checkbox').prop('checked', false);
$('#gotozeroMPos').addClass('disabled')
$('#homeBtn').attr('disabled', true)
}
setTimeout(function() {
setMachineButton(laststatus.machine.name)
}, 500)
}
setTimeout(function() {
setMachineButton(laststatus.machine.name)
}, 500)
}
function checkifchanged() {

Wyświetl plik

@ -384,7 +384,6 @@ $(document).ready(function() {
continuousJogRunning = true;
$('.xM').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('X', '-' + jogdist, feedrate);
}
@ -399,6 +398,7 @@ $(document).ready(function() {
});
$('.xP').on('touchstart mousedown', function(ev) {
console.log(ev)
ev.preventDefault();
if (allowContinuousJog) { // startJog();
var direction = "X";
@ -417,7 +417,6 @@ $(document).ready(function() {
continuousJogRunning = true;
$('.xP').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('X', jogdist, feedrate);
}
@ -452,7 +451,6 @@ $(document).ready(function() {
continuousJogRunning = true;
$('.yM').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('Y', '-' + jogdist, feedrate);
}
@ -487,7 +485,6 @@ $(document).ready(function() {
continuousJogRunning = true;
$('#yP').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('Y', jogdist, feedrate);
}
@ -522,7 +519,6 @@ $(document).ready(function() {
continuousJogRunning = true;
$('.zM').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('Z', '-' + jogdist, feedrate);
}
@ -557,7 +553,6 @@ $(document).ready(function() {
continuousJogRunning = true;
$('.zP').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('Z', jogdist, feedrate);
}

Wyświetl plik

@ -1,25 +1,31 @@
var isJogWidget = true;
$(document).ready(function() {
Metro.dialog.create({
title: "Fullscreen View",
content: "<div>Would you like to view Jog in Fullscreen mode?</div>",
actions: [{
caption: "Yes",
cls: "js-dialog-close success",
onclick: function() {
openFullscreen()
var iOS = !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform);
if (!iOS) {
Metro.dialog.create({
title: "Fullscreen View",
content: "<div>Would you like to view Jog in Fullscreen mode?</div>",
actions: [{
caption: "Yes",
cls: "js-dialog-close success",
onclick: function() {
openFullscreen()
}
},
{
caption: "Cancel",
cls: "js-dialog-close",
onclick: function() {
//
}
}
},
{
caption: "Cancel",
cls: "js-dialog-close",
onclick: function() {
//
}
}
]
});
]
});
}
});
var elem = document.documentElement;

Wyświetl plik

@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.227",
"version": "1.0.228",
"license": "AGPL-3.0",
"description": "OpenBuildsCONTROL CNC Machine Interface Software",
"author": "github.com/openbuilds <webmaster@openbuilds.com>",