mirror
/
OpenBuilds-CONTROL
kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Updates for a few bug

pull/110/head
openbuilds-engineer 2018-06-27 21:23:34 +02:00
rodzic 2dd052bcbf
commit 9f714a6608
9 zmienionych plików z 408 dodań i 1744 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

17
app/css/buttons.css
Wyświetl plik

@ -1,18 +1,27 @@
.jogtable td {
padding: 2px;
}
.jogbtn:disabled {
pointer-events:none;
}
.glossydro {
display: block;
text-decoration: none;
background-color: #f5f6f7;
background-color: #f8f8f8;
color: #a7a7a7;
margin: 2px;
width: 140px;
margin-left: 0px;
width: 141px;
height: 34px;
position: relative;
text-align: right;
padding-right: 6px;
padding-left: 6px;
line-height: 30px;
border-radius: 2px;
border: 1px solid #ddd;
/* border-radius: 2px; */
/* border: 1px solid #ddd; */
font-weight:900;
font-size: 18px;
cursor: default;

2
app/css/main.css
Wyświetl plik

@ -65,7 +65,7 @@ body {
}
select{
font-family: FontAwesome, sans-serif;
font-family: 'FontAwesome', sans-serif;
}
.btn-file {

180
app/index.html
Wyświetl plik

@ -100,7 +100,10 @@
<div class="group" style="width: calc(100vw - 40px);">
<button class="ribbon-button" onclick="grblSaveSettings();">
<span class="icon">
<span class="fa-layers fa-fw">
<i class="fas fa-save fg-grayBlue" data-fa-transform="grow-8"></i>
<i id="grblSettingsBadge" class="fas fa-exclamation-circle fg-red" data-fa-transform="shrink-4 right-10 up-10" style="display: none;"></i>
<!-- <span class="fa-layers-text fg-grayBlue" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span> -->
</span>
</span>
<span class="caption">Save<br> to Firmware</span>
@ -145,14 +148,32 @@
<input id="file" type="file" accept=".gcode, .gc, .tap, .nc, .cnc" />
<span class="caption">Open<br>GCODE</span>
</label>
<button id="runBtn" class="ribbon-button grblmode" onclick="if (laststatus.comms.connectionStatus == 4) {socket.emit('resume', true)} else if (laststatus.comms.connectionStatus == 3) {socket.emit('pause', true)} else { socket.emit('runJob', editor.getValue())};">
<span class="icon" id="playpauseresumeicon">
<button id="runBtn" class="ribbon-button" onclick="socket.emit('runJob', editor.getValue());">
<span class="icon">
<i class="fas fa-play"></i>
</span>
<span id="playpauseresumelabel" class="caption">Run<br>Job</span>
<span class="caption">Run<br>Job</span>
</button>
<button id="resumeBtn" class="ribbon-button" onclick="socket.emit('resume', true)">
<span class="icon">
<i class="fas fa-play"></i>
</span>
<span class="caption">Resume<br>Job</span>
</button>
<button id="pauseBtn" class="ribbon-button" onclick="socket.emit('pause', true)">
<span class="icon">
<i class="fas fa-pause"></i>
</span>
<span class="caption">Pause<br>Job</span>
</button>
<button id="stopBtn" class="ribbon-button" onclick="socket.emit('stop', true)">
<span class="icon">
<i class="fas fa-stop"></i>
</span>
<span class="caption">Stop<br>Job</span>
</button>
<div>
<button class="ribbon-button dropdown-toggle grblmode">
<button id="toolBtn" class="ribbon-button dropdown-toggle">
<span class="icon">
<span class="fa-layers fa-fw">
<i class="fas fa-bookmark" data-fa-transform="rotate-180"></i>
@ -162,21 +183,16 @@
<span class="caption">Tool<br>Options</span>
</button>
<ul class="ribbon-dropdown grblmode" data-role="dropdown" data-duration="100">
<!-- <li class="checked"><a href="#">Modification</a></li>
<li class="checked"><a href="#">Type</a></li>
<li class="checked"><a href="#">Size</a></li>
<li class="checked-one"><a href="#">Tags</a></li>
<li class="divider"></li> -->
<li><a class="grblmode" href="#" onclick="sendGcode('M3 S1000')">Tool On (M3 S1000)</a></li>
<li><a class="grblmode" href="#" onclick="sendGcode('M5')">Tool Off (M5)</a></li>
<li class="divider"></li>
<li><a class="grblmode" href="#" onclick="sendGcode('M8 S1000')">Coolant On (M8)</a></li>
<li><a class="grblmode" href="#" onclick="sendGcode('M9 S1000')">Coolant Off (M9)</a></li>
<!-- <li class="divider"></li>
<li><a href="#">Grbl Settings...</a></li> -->
</ul>
</div>
<button class="ribbon-button grblmode" onclick="sendGcode('$H')">
<button id="homeBtn" class="ribbon-button" onclick="sendGcode('$H')">
<span class="icon">
<i class="fas fa-home"></i>
</span>
@ -258,40 +274,53 @@
</td>
</tr>
<tr>
<td>
<a href="#" class="glossybtn grblmode" style="height: 34px; width: 140px; line-height: 30px;" id="setZero" onclick="sendGcode( 'G10 P1 L20 X0 Y0 Z0')">
<td style="padding-top: 2px;">
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 X0 Y0')" style="width: 69px;">
<span class="fa-layers fa-fw">
<i class="fas fa-crosshairs fg-amber" data-fa-transform="left-40"></i>
<span class="fa-layers-text fg-amber" data-fa-transform="down-1 right-10" style="font-weight:900; font-family: Arial; font-size: 12px;">SETZERO</span>
<i class="fas fa-crosshairs fg-grayBlue" data-fa-transform="shrink-2 down-8 left-12"></i>
<span class="fa-layers-text fg-red" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">X</span>
<span class="fa-layers-text fg-green" data-fa-transform="down-9 right-19" style="font-weight:900; font-family: Arial; font-size: 12px;">Y</span>
<span class="fa-layers-text fg-grayBlue" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
</span>
</a>
</button>
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 Z0')" style="width: 68px;">
<span class="fa-layers fa-fw">
<i class="fas fa-crosshairs fg-grayBlue" data-fa-transform="shrink-2 down-8 left-8"></i>
<span class="fa-layers-text fg-blue" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">Z</span>
<span class="fa-layers-text fg-grayBlue" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">setzero</span>
</span>
</button>
</td>
</tr>
<tr>
<td>
<a href="#" class="glossybtn grblmode" style="height: 36px; width: 140px; line-height: 30px;" id="gotozero">
<span class=" fa-layers fa-fw">
<i class="fas fa-chart-line fg-amber" data-fa-transform="left-45"></i>
<span class="fa-layers-text fg-amber" data-fa-transform="down-1 right-15" style="font-weight:900; font-family: Arial; font-size: 12px;">GOTOZERO</span>
<td style="padding-top: 3px;">
<button class="button light jogbtn" style="width: 140px;" id="gotozero">
<span class="fa-layers fa-fw">
<i class="fas fa-chart-line fg-grayBlue" data-fa-transform="shrink-2 down-8 left-12"></i>
<span class="fa-layers-text fg-red" data-fa-transform="down-9 right-8" style="font-weight:900; font-family: Arial; font-size: 12px;">X</span>
<span class="fa-layers-text fg-green" data-fa-transform="down-9 right-19" style="font-weight:900; font-family: Arial; font-size: 12px;">Y</span>
<span class="fa-layers-text fg-blue" data-fa-transform="down-9 right-29" style="font-weight:900; font-family: Arial; font-size: 12px;">Z</span>
<span class="fa-layers-text fg-grayBlue" data-fa-transform="up-8 " style="font-weight:900; font-family: Arial; font-size: 12px;">gotozero</span>
</span>
</a>
</button>
</td>
</tr>
</table>
</div>
<div class="cell">
<table>
<table class="jogtable">
<tr>
<td>
</td>
<td>
<a href="#" class="glossybtn grblmode" id="yP">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-up fg-green" data-fa-transform="grow-4 down-8.5"></i>
<span class="fa-layers-text fg-green" data-fa-transform="up-14" style="font-weight:900">Y+</span>
</span>
</a>
<button class="button light square large jogbtn" id="yP">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-up fg-green" data-fa-transform="shrink-2 down-8.5"></i>
<span class="fa-layers-text fg-green" data-fa-transform="shrink-5 up-8" style="font-weight:600">Y+</span>
</span>
</button>
</td>
<td>
@ -299,78 +328,78 @@
<td>
<a href="#" class="glossybtn grblmode" id="zP">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-up fg-blue" data-fa-transform="grow-2 down-8.5"></i>
<span class="fa-layers-text fg-blue" data-fa-transform="up-14" style="font-weight:900">Z+</span>
</span>
</a>
<button class="button light square large jogbtn" id="zP">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-up fg-blue" data-fa-transform="shrink-2 down-8.5"></i>
<span class="fa-layers-text fg-blue" data-fa-transform="shrink-5 up-8" style="font-weight:600">Z+</span>
</span>
</button>
</td>
</tr>
<tr>
<td>
<a href="#" class="glossybtn grblmode" id="xM">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-left fg-red" data-fa-transform="grow-2 up-10.5"></i>
<span class="fa-layers-text fg-red" data-fa-transform="down-10" style="font-weight:900">X-</span>
</span>
</a>
<button class="button light square large jogbtn" id="xM">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-left fg-red" data-fa-transform="shrink-2 down-8.5"></i>
<span class="fa-layers-text fg-red" data-fa-transform="shrink-5 up-8" style="font-weight:600">X-</span>
</span>
</button>
</td>
<td>
<a href="#" class="glossybtn grblmode" id="yM">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-down fg-green" data-fa-transform="grow-2 up-10.5"></i>
<span class="fa-layers-text fg-green" data-fa-transform="down-10" style="font-weight:900">Y-</span>
</span>
</a>
<button class="button light square large jogbtn" id="yM">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-down fg-green" data-fa-transform="shrink-2 down-8.5"></i>
<span class="fa-layers-text fg-green" data-fa-transform="shrink-5 up-8" style="font-weight:600">Y-</span>
</span>
</button>
</td>
<td>
<a href="#" class="glossybtn grblmode" id="xP">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-right fg-red" data-fa-transform="grow-2 up-10.5"></i>
<span class="fa-layers-text fg-red" data-fa-transform="down-10" style="font-weight:900">X+</span>
</span>
</a>
<button class="button light square large jogbtn" id="xP">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-right fg-red" data-fa-transform="shrink-2 down-8.5"></i>
<span class="fa-layers-text fg-red" data-fa-transform="shrink-5 up-8" style="font-weight:600">X+</span>
</span>
</button>
</td>
<td>
<a href="#" class="glossybtn grblmode" id="zM">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-down fg-blue" data-fa-transform="grow-2 up-10.5"></i>
<span class="fa-layers-text fg-blue" data-fa-transform="down-10" style="font-weight:900">Z-</span>
</span>
</a>
<button class="button light square large jogbtn" id="zM">
<span class="fa-layers fa-fw">
<i class="fas fa-arrow-down fg-blue" data-fa-transform="shrink-2 down-8.5"></i>
<span class="fa-layers-text fg-blue" data-fa-transform="shrink-5 up-8" style="font-weight:600">Z-</span>
</span>
</button>
</td>
</tr>
<tr>
<td>
<a href="#" class="glossybtn grblmode" style="height: 34px; line-height: 30px;" id="dist01">
<span class=" fa-layers fa-fw">
<span id="dist01label" class="fa-layers-text fg-gray jogdist" data-fa-transform="down-1" style="font-family: Arial; font-size: 12px;">0.1mm</span>
</span>
</a>
<button class="button light jogbtn" id="dist01" style="width: 100%;">
<span class=" fa-layers fa-fw">
<span id="dist01label" class="fa-layers-text fg-gray jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">0.1mm</span>
</span>
</button>
</td>
<td>
<a href="#" class="glossybtn grblmode" style="height: 34px; line-height: 30px;" id="dist1">
<button class="button light jogbtn" id="dist1" style="width: 100%;">
<span class=" fa-layers fa-fw">
<span id="dist1label" class="fa-layers-text fg-gray jogdist" data-fa-transform="down-1" style="font-family: Arial; font-size: 12px;">1mm</span>
<span id="dist1label" class="fa-layers-text fg-gray jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">1mm</span>
</span>
</a>
</button>
</td>
<td>
<a href="#" class="glossybtn grblmode" style="height: 34px; line-height: 30px;" id="dist10">
<button class="button light jogbtn" id="dist10" style="width: 100%;">
<span class=" fa-layers fa-fw">
<span id="dist10label" class="fa-layers-text fg-dark jogdist" data-fa-transform="down-1" style="font-family: Arial; font-size: 12px;">10mm</span>
<span id="dist10label" class="fa-layers-text fg-dark jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">10mm</span>
</span>
</a>
</button>
</td>
<td>
<a href="#" class="glossybtn grblmode" style="height: 34px; line-height: 30px;" id="dist100">
<button class="button light jogbtn" id="dist100" style="width: 100%;">
<span class=" fa-layers fa-fw">
<span id="dist100label" class="fa-layers-text fg-gray jogdist" data-fa-transform="down-1" style="font-family: Arial; font-size: 12px;">100mm</span>
<span id="dist100label" class="fa-layers-text fg-gray jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">100mm</span>
</span>
</a>
</button>
</td>
</tr>
<tr>
@ -397,7 +426,7 @@
<div id="editor"></div>
</center>
</div>
<div id="grblPanel">
<div id="grblPanel" style="display: none;">
<div id="grblconfig"></div>
</div>
@ -448,6 +477,7 @@
<script type="text/javascript" src="/lib/lodash.core.js"></script>
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
<script type="text/javascript" src="js/main.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/metroactions.js"></script>

165
app/js/grblsettings.js
Wyświetl plik

@ -36,6 +36,7 @@ var grblSettingCodes = {
};
function grblSettings(data) {
console.log(data)
var template = ``
grblconfig = data.split('\n')
for (i = 0; i < grblconfig.length; i++) {
@ -54,6 +55,7 @@ function grblPopulate() {
$('#grblconfig').show();
$('#grblconfig').empty();
var template = `
<form id="grblSettingsTable">
<table data-role="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">
<thead>
<tr>
@ -65,84 +67,86 @@ function grblPopulate() {
</thead>
<tbody>
<tr><td>$100</td><td>X-axis steps per millimeter</td><td><input type="text" value="` + grblParams['$100'] + `" id="val-` + 100 + `-input"></td></tr>
<tr><td>$110</td><td>X-axis maximum rate, mm/min</td><td><input type="text" value="` + grblParams['$110'] + `" id="val-` + 110 + `-input"></td></tr>
<tr><td>$120</td><td>X-axis acceleration, mm/sec<sup>2</sup></td><td><input type="text" value="` + grblParams['$120'] + `" id="val-` + 120 + `-input"></td></tr>
<tr><td>$130</td><td>X-axis maximum travel, millimeters</td><td><input type="text" value="` + grblParams['$130'] + `" id="val-` + 130 + `-input"></td></tr>
<tr><td>$0</td><td>Step pulse time, microseconds</td><td><input type="text" value="` + grblParams['$0'] + `" id="val-` + 0 + `-input"></td></tr>
<tr><td>$1</td><td>Step idle delay, milliseconds</td><td><input type="text" value="` + grblParams['$1'] + `" id="val-` + 1 + `-input"></td></tr>
<tr><td>$2</td>
<td>Step pulse invert</td>
<td>
<select id="val-` + 2 + `-input" value="` + grblParams['$2'] + `">
<option value="0">X:&#xf10c Y:&#xf10c Z:&#xf10c</option>
<option value="1">X:&#xf111 Y:&#xf10c Z:&#xf10c</option>
<option value="2">X:&#xf10c Y:&#xf111 Z:&#xf10c</option>
<option value="4">X:&#xf10c Y:&#xf10c Z:&#xf111</option>
<option value="3">X:&#xf111 Y:&#xf111 Z:&#xf10c</option>
<option value="5">X:&#xf111 Y:&#xf10c Z:&#xf111</option>
<option value="6">X:&#xf10c Y:&#xf111 Z:&#xf111</option>
<option value="7">X:&#xf111 Y:&#xf111 Z:&#xf111</option>
</select>
</td>
</tr>
<tr><td>$3</td><td>Step direction invert</td><td><select id="val-` + 3 + `-input" value="` + grblParams['$3'] + `">
<option value="0">X:&#xf10c Y:&#xf10c Z:&#xf10c</option>
<option value="1">X:&#xf111 Y:&#xf10c Z:&#xf10c</option>
<option value="2">X:&#xf10c Y:&#xf111 Z:&#xf10c</option>
<option value="4">X:&#xf10c Y:&#xf10c Z:&#xf111</option>
<option value="3">X:&#xf111 Y:&#xf111 Z:&#xf10c</option>
<option value="5">X:&#xf111 Y:&#xf10c Z:&#xf111</option>
<option value="6">X:&#xf10c Y:&#xf111 Z:&#xf111</option>
<option value="7">X:&#xf111 Y:&#xf111 Z:&#xf111</option>
</select></td></tr>
<tr><td>$4</td><td>Invert step enable pin</td><td><select id="val-` + 4 + `-input" value="` + grblParams['$4'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$5</td><td>Invert limit pins</td><td><select id="val-` + 5 + `-input" value="` + grblParams['$5'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$6</td><td>Invert probe pin</td><td><select id="val-` + 6 + `-input" value="` + grblParams['$6'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$10</td><td>Status report options</td><td><select id="val-` + 10 + `-input" value="` + grblParams['$10'] + `">
<option value="0">WPos:&#xf111 MPos:&#xf10c Buf:&#xf10c</option>
<option value="1">WPos:&#xf10c MPos:&#xf111 Buf:&#xf10c</option>
<option value="2">WPos:&#xf111 MPos:&#xf10c Buf:&#xf111</option>
</select></td></tr>
<tr><td>$11</td><td>Junction deviation, millimeters</td><td><input type="text" value="` + grblParams['$11'] + `" id="val-` + 11 + `-input"></td></tr>
<tr><td>$12</td><td>Arc tolerance, millimeters</td><td><input type="text" value="` + grblParams['$12'] + `" id="val-` + 12 + `-input"></td></tr>
<tr><td>$13</td><td>Report in inches</td><td><select id="val-` + 13 + `-input" value="` + grblParams['$13'] + `"><option value="0">&#xf10c Disable</option><option value="1">&#xf111 Enable</option></select></td></tr>
<tr><td>$101</td><td>Y-axis steps per millimeter</td><td><input type="text" value="` + grblParams['$101'] + `" id="val-` + 101 + `-input"></td></tr>
<tr><td>$111</td><td>Y-axis maximum rate, mm/min</td><td><input type="text" value="` + grblParams['$111'] + `" id="val-` + 111 + `-input"></td></tr>
<tr><td>$121</td><td>Y-axis acceleration, mm/sec<sup>2</sup>]</td><td><input type="text" value="` + grblParams['$121'] + `" id="val-` + 121 + `-input"></td></tr>
<tr><td>$131</td><td>Y-axis maximum travel, millimeters</td><td><input type="text" value="` + grblParams['$131'] + `" id="val-` + 131 + `-input"></td></tr>
<tr><td>$20</td><td>Soft limits enable <small>(Enable and Save Homing first before enabling)<small></td><td><select id="val-` + 20 + `-input" value="` + grblParams['$20'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$21</td><td>Hard limits enable</td><td><select id="val-` + 21 + `-input" value="` + grblParams['$21'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$22</td><td>Homing cycle enable</td><td><select id="val-` + 22 + `-input" value="` + grblParams['$22'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$23</td><td>Homing direction invert</td><td><select id="val-` + 23 + `-input" value="` + grblParams['$23'] + `">
<option value="0">X:&#xf10c Y:&#xf10c Z:&#xf10c</option>
<option value="1">X:&#xf111 Y:&#xf10c Z:&#xf10c</option>
<option value="2">X:&#xf10c Y:&#xf111 Z:&#xf10c</option>
<option value="4">X:&#xf10c Y:&#xf10c Z:&#xf111</option>
<option value="3">X:&#xf111 Y:&#xf111 Z:&#xf10c</option>
<option value="5">X:&#xf111 Y:&#xf10c Z:&#xf111</option>
<option value="6">X:&#xf10c Y:&#xf111 Z:&#xf111</option>
<option value="7">X:&#xf111 Y:&#xf111 Z:&#xf111</option>
</select></td></tr>
<tr><td>$24</td><td>Homing locate feed rate, mm/min</td><td><input type="text" value="` + grblParams['$24'] + `" id="val-` + 24 + `-input"></td></tr>
<tr><td>$25</td><td>Homing search seek rate, mm/min</td><td><input type="text" value="` + grblParams['$25'] + `" id="val-` + 25 + `-input"></td></tr>
<tr><td>$26</td><td>Homing switch debounce delay, milliseconds</td><td><input type="text" value="` + grblParams['$26'] + `" id="val-` + 26 + `-input"></td></tr>
<tr><td>$27</td><td>Homing switch pull-off distance, millimeters</td><td><input type="text" value="` + grblParams['$27'] + `" id="val-` + 27 + `-input"></td></tr>
<tr><td>$102</td><td>Z-axis steps per millimeter</td><td><input type="text" value="` + grblParams['$102'] + `" id="val-` + 102 + `-input"></td></tr>
<tr><td>$112</td><td>Z-axis maximum rate, mm/min</td><td><input type="text" value="` + grblParams['$112'] + `" id="val-` + 112 + `-input"></td></tr>
<tr><td>$122</td><td>Z-axis acceleration, mm/sec<sup>2</sup></td><td><input type="text" value="` + grblParams['$122'] + `" id="val-` + 122 + `-input"></td></td></tr>
<tr><td>$132</td><td>Z-axis maximum travel, millimeters</td><td><input type="text" value="` + grblParams['$132'] + `" id="val-` + 132 + `-input"></td></tr>
<tr><td>$30</td><td>Maximum spindle speed, RPM</td><td><input type="text" value="` + grblParams['$30'] + `" id="val-` + 30 + `-input"></td></tr>
<tr><td>$31</td><td>Minimum spindle speed, RPM</td><td><input type="text" value="` + grblParams['$31'] + `" id="val-` + 31 + `-input"></td></tr>
<tr><td>$32</td><td>Laser-mode enable</td><td><select id="val-` + 32 + `-input" value="` + grblParams['$32'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$20</td><td>Soft limits enable <small>(Enable and Save Homing first before enabling)<small></td><td><select id="val-` + 20 + `-input" value="` + grblParams['$20'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$21</td><td>Hard limits enable</td><td><select id="val-` + 21 + `-input" value="` + grblParams['$21'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$22</td><td>Homing cycle enable</td><td><select id="val-` + 22 + `-input" value="` + grblParams['$22'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$23</td><td>Homing direction invert</td><td><select id="val-` + 23 + `-input" value="` + grblParams['$23'] + `">
<option value="0">X:&#xf10c Y:&#xf10c Z:&#xf10c</option>
<option value="1">X:&#xf111 Y:&#xf10c Z:&#xf10c</option>
<option value="2">X:&#xf10c Y:&#xf111 Z:&#xf10c</option>
<option value="4">X:&#xf10c Y:&#xf10c Z:&#xf111</option>
<option value="3">X:&#xf111 Y:&#xf111 Z:&#xf10c</option>
<option value="5">X:&#xf111 Y:&#xf10c Z:&#xf111</option>
<option value="6">X:&#xf10c Y:&#xf111 Z:&#xf111</option>
<option value="7">X:&#xf111 Y:&#xf111 Z:&#xf111</option>
</select></td></tr>
<tr><td>$24</td><td>Homing locate feed rate, mm/min</td><td><input type="text" value="` + grblParams['$24'] + `" id="val-` + 24 + `-input"></td></tr>
<tr><td>$25</td><td>Homing search seek rate, mm/min</td><td><input type="text" value="` + grblParams['$25'] + `" id="val-` + 25 + `-input"></td></tr>
<tr><td>$26</td><td>Homing switch debounce delay, milliseconds</td><td><input type="text" value="` + grblParams['$26'] + `" id="val-` + 26 + `-input"></td></tr>
<tr><td>$27</td><td>Homing switch pull-off distance, millimeters</td><td><input type="text" value="` + grblParams['$27'] + `" id="val-` + 27 + `-input"></td></tr>
<tr><td>$5</td><td>Invert limit pins</td><td><select id="val-` + 5 + `-input" value="` + grblParams['$5'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$6</td><td>Invert probe pin</td><td><select id="val-` + 6 + `-input" value="` + grblParams['$6'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$100</td><td>X-axis steps per millimeter</td><td><input type="text" value="` + grblParams['$100'] + `" id="val-` + 100 + `-input"></td></tr>
<tr><td>$101</td><td>Y-axis steps per millimeter</td><td><input type="text" value="` + grblParams['$101'] + `" id="val-` + 101 + `-input"></td></tr>
<tr><td>$102</td><td>Z-axis steps per millimeter</td><td><input type="text" value="` + grblParams['$102'] + `" id="val-` + 102 + `-input"></td></tr>
<tr><td>$32</td><td>Laser-mode enable</td><td><select id="val-` + 32 + `-input" value="` + grblParams['$32'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$31</td><td>Minimum spindle speed, RPM</td><td><input type="text" value="` + grblParams['$31'] + `" id="val-` + 31 + `-input"></td></tr>
<tr><td>$30</td><td>Maximum spindle speed, RPM</td><td><input type="text" value="` + grblParams['$30'] + `" id="val-` + 30 + `-input"></td></tr>
<tr><td>$110</td><td>X-axis maximum rate, mm/min</td><td><input type="text" value="` + grblParams['$110'] + `" id="val-` + 110 + `-input"></td></tr>
<tr><td>$111</td><td>Y-axis maximum rate, mm/min</td><td><input type="text" value="` + grblParams['$111'] + `" id="val-` + 111 + `-input"></td></tr>
<tr><td>$112</td><td>Z-axis maximum rate, mm/min</td><td><input type="text" value="` + grblParams['$112'] + `" id="val-` + 112 + `-input"></td></tr>
<tr><td>$0</td><td>Step pulse time, microseconds</td><td><input type="text" value="` + grblParams['$0'] + `" id="val-` + 0 + `-input"></td></tr>
<tr><td>$1</td><td>Step idle delay, milliseconds</td><td><input type="text" value="` + grblParams['$1'] + `" id="val-` + 1 + `-input"></td></tr>
<tr><td>$2</td>
<td>Step pulse invert</td>
<td>
<select id="val-` + 2 + `-input" value="` + grblParams['$2'] + `">
<option value="0">X:&#xf10c Y:&#xf10c Z:&#xf10c</option>
<option value="1">X:&#xf111 Y:&#xf10c Z:&#xf10c</option>
<option value="2">X:&#xf10c Y:&#xf111 Z:&#xf10c</option>
<option value="4">X:&#xf10c Y:&#xf10c Z:&#xf111</option>
<option value="3">X:&#xf111 Y:&#xf111 Z:&#xf10c</option>
<option value="5">X:&#xf111 Y:&#xf10c Z:&#xf111</option>
<option value="6">X:&#xf10c Y:&#xf111 Z:&#xf111</option>
<option value="7">X:&#xf111 Y:&#xf111 Z:&#xf111</option>
</select>
</td>
</tr>
<tr><td>$3</td><td>Step direction invert</td><td><select id="val-` + 3 + `-input" value="` + grblParams['$3'] + `">
<option value="0">X:&#xf10c Y:&#xf10c Z:&#xf10c</option>
<option value="1">X:&#xf111 Y:&#xf10c Z:&#xf10c</option>
<option value="2">X:&#xf10c Y:&#xf111 Z:&#xf10c</option>
<option value="4">X:&#xf10c Y:&#xf10c Z:&#xf111</option>
<option value="3">X:&#xf111 Y:&#xf111 Z:&#xf10c</option>
<option value="5">X:&#xf111 Y:&#xf10c Z:&#xf111</option>
<option value="6">X:&#xf10c Y:&#xf111 Z:&#xf111</option>
<option value="7">X:&#xf111 Y:&#xf111 Z:&#xf111</option>
</select></td></tr>
<tr><td>$4</td><td>Invert step enable pin</td><td><select id="val-` + 4 + `-input" value="` + grblParams['$4'] + `"><option value="0">&#xf00d Disable</option><option value="1">&#xf00c Enable</option></select></td></tr>
<tr><td>$120</td><td>X-axis acceleration, mm/sec<sup>2</sup></td><td><input type="text" value="` + grblParams['$120'] + `" id="val-` + 120 + `-input"></td></tr>
<tr><td>$121</td><td>Y-axis acceleration, mm/sec<sup>2</sup>]</td><td><input type="text" value="` + grblParams['$121'] + `" id="val-` + 121 + `-input"></td></tr>
<tr><td>$122</td><td>Z-axis acceleration, mm/sec<sup>2</sup></td><td><input type="text" value="` + grblParams['$122'] + `" id="val-` + 122 + `-input"></td></td></tr>
<tr><td>$130</td><td>X-axis maximum travel, millimeters</td><td><input type="text" value="` + grblParams['$130'] + `" id="val-` + 130 + `-input"></td></tr>
<tr><td>$131</td><td>Y-axis maximum travel, millimeters</td><td><input type="text" value="` + grblParams['$131'] + `" id="val-` + 131 + `-input"></td></tr>
<tr><td>$132</td><td>Z-axis maximum travel, millimeters</td><td><input type="text" value="` + grblParams['$132'] + `" id="val-` + 132 + `-input"></td></tr>
<tr><td>$10</td><td>Status report options</td><td><select id="val-` + 10 + `-input" value="` + grblParams['$10'] + `">
<option value="0">WPos:&#xf111 MPos:&#xf10c Buf:&#xf10c</option>
<option value="1">WPos:&#xf10c MPos:&#xf111 Buf:&#xf10c</option>
<option value="2">WPos:&#xf111 MPos:&#xf10c Buf:&#xf111</option>
</select></td></tr>
<tr><td>$11</td><td>Junction deviation, millimeters</td><td><input type="text" value="` + grblParams['$11'] + `" id="val-` + 11 + `-input"></td></tr>
<tr><td>$12</td><td>Arc tolerance, millimeters</td><td><input type="text" value="` + grblParams['$12'] + `" id="val-` + 12 + `-input"></td></tr>
<tr><td>$13</td><td>Report in inches</td><td><select id="val-` + 13 + `-input" value="` + grblParams['$13'] + `"><option value="0">&#xf10c Disable</option><option value="1">&#xf111 Enable</option></select></td></tr>
</tbody>
</table>
</form>
</div>
</div>`
@ -160,6 +164,26 @@ function grblPopulate() {
$("#val-4-input").val(parseInt(grblParams['$4'])).trigger("change");
$("#val-10-input").val(parseInt(grblParams['$10'])).trigger("change");
}, 100);;
$('#grblSettingsTable').on('keyup paste click', 'input, select', function() {
var hasChanged = false;
for (var key in grblParams) {
if (grblParams.hasOwnProperty(key)) {
var j = key.substring(1)
var newVal = $("#val-" + j + "-input").val();
// Only send values that changed
if (parseFloat(newVal) != parseFloat(grblParams[key])) {
hasChanged = true;
}
}
}
if (hasChanged) {
$('#grblSettingsBadge').fadeIn('slow');
} else {
$('#grblSettingsBadge').fadeOut('slow');
}
});
$('#grblSettingsBadge').hide();
}
function grblSaveSettings() {
@ -176,6 +200,7 @@ function grblSaveSettings() {
}
grblParams = {};
refreshGrblSettings();
$('#grblSettingsBadge').hide();
}
function refreshGrblSettings() {

8
app/js/jog.js
Wyświetl plik

@ -5,18 +5,18 @@ $(document).ready(function() {
$("#frocell").hover(function() {
safeToUpdateSliders = false;
console.log(safeToUpdateSliders)
// console.log(safeToUpdateSliders)
}, function() {
safeToUpdateSliders = true;
console.log(safeToUpdateSliders)
// console.log(safeToUpdateSliders)
});
$("#trocell").hover(function() {
safeToUpdateSliders = false;
console.log(safeToUpdateSliders)
// console.log(safeToUpdateSliders)
}, function() {
safeToUpdateSliders = true;
console.log(safeToUpdateSliders)
// console.log(safeToUpdateSliders)
});
$("#xPos").click(function() {

177
app/js/ui.js 100644
Wyświetl plik

@ -0,0 +1,177 @@
// Toolbar with USB port/connect/disconnect
function setConnectBar(val, status) {
if (val == 0) { // Not Connected Yet
// Status Badge
$('#connectStatus').html("Port: Not Connected");
// Connect/Disconnect Button
$("#disconnectBtn").hide();
$("#connectBtn").show();
if ($('#portUSB').val() != "") {
$("#connectBtn").attr('disabled', false);
} else {
$("#connectBtn").attr('disabled', true);
}
// Port Dropdown
if ($('#portUSB').val() != "") {
$('#portUSB').parent(".select").removeClass('disabled')
} else {
$('#portUSB').parent(".select").addClass('disabled')
}
$('#portUSB').parent(".select").addClass('success')
$('#portUSB').parent(".select").removeClass('alert')
// Set Port Dropdown to Current Value
// Not applicable to Status 0 as its set by populatePortsMenu();
} else if (val == 1 || val == 2) { // Connected, but not Playing yet
// Status Badge
$('#connectStatus').html("Port: Connected");
// Connect/Disconnect Button
$("#connectBtn").hide();
$("#connectBtn").attr('disabled', false);
$("#disconnectBtn").show();
// Port Dropdown
$('#portUSB').parent(".select").addClass('disabled')
$('#portUSB').parent(".select").removeClass('success')
$('#portUSB').parent(".select").addClass('alert')
// Set Port Dropdown to Current Value
$("#portUSB").val(status.comms.interfaces.activePort);
} else if (val == 3) { // Busy Streaming GCODE
// Status Badge
$('#connectStatus').html("Port: Connected");
// Connect/Disconnect Button
$("#connectBtn").hide();
$("#connectBtn").attr('disabled', false);
$("#disconnectBtn").show();
// Port Dropdown
$('#portUSB').parent(".select").addClass('disabled')
$('#portUSB').parent(".select").removeClass('success')
$('#portUSB').parent(".select").addClass('alert')
// Set Port Dropdown to Current Value
$("#portUSB").val(status.comms.interfaces.activePort);
} else if (val == 4) { // Paused
// Status Badge
$('#connectStatus').html("Port: Connected");
// Connect/Disconnect Button
$("#connectBtn").hide();
$("#connectBtn").attr('disabled', false);
$("#disconnectBtn").show();
// Port Dropdown
$('#portUSB').parent(".select").addClass('disabled')
$('#portUSB').parent(".select").removeClass('success')
$('#portUSB').parent(".select").addClass('alert')
// Set Port Dropdown to Current Value
$("#portUSB").val(status.comms.interfaces.activePort);
} else if (val == 5) { // Alarm State
// Status Badge
$('#connectStatus').html("Port: Connected");
// Connect/Disconnect Button
$("#connectBtn").hide();
$("#connectBtn").attr('disabled', false);
$("#disconnectBtn").show();
// Port Dropdown
$('#portUSB').parent(".select").addClass('disabled')
$('#portUSB').parent(".select").removeClass('success')
$('#portUSB').parent(".select").addClass('alert')
// Set Port Dropdown to Current Value
$("#portUSB").val(status.comms.interfaces.activePort);
}
}
// Toolbar with play/pause/stop
function setControlBar(val, status) {
if (val == 0) { // Not Connected Yet
$('#runBtn').hide().attr('disabled', true);
$('#resumeBtn').hide().attr('disabled', true);
$('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').hide().attr('disabled', true);
$('#toolBtn').hide().attr('disabled', true);
$('#homeBtn').hide().attr('disabled', true);
} else if (val == 0 || val == 2) { // Connected, but not Playing yet
$('#runBtn').show().attr('disabled', editor.session.getLength() < 2);
$('#resumeBtn').hide().attr('disabled', true);
$('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').show().attr('disabled', true);
$('#toolBtn').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', false);
} else if (val == 3) { // Busy Streaming GCODE
$('#runBtn').hide().attr('disabled', true);
$('#resumeBtn').hide().attr('disabled', true);
$('#pauseBtn').show().attr('disabled', false);
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', true);
} else if (val == 4) { // Paused
$('#runBtn').hide().attr('disabled', true);
$('#resumeBtn').show().attr('disabled', false);
$('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', false);
$('#homeBtn').show().attr('disabled', true);
} else if (val == 5) { // Alarm State
$('#runBtn').show().attr('disabled', true);
$('#resumeBtn').hide().attr('disabled', true);
$('#pauseBtn').hide().attr('disabled', true);
$('#stopBtn').show().attr('disabled', false);
$('#toolBtn').show().attr('disabled', true);
$('#homeBtn').show().attr('disabled', true);
}
}
function setJogPanel(val, status) {
if (val == 0) { // Not Connected Yet
// Show panel and resize editor
$("#jogcontrols").slideUp("fast");
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)');
editor.resize()
$('.jogbtn').attr('disabled', true);
} else if (val == 0 || val == 2) { // Connected, but not Playing yet
// Show panel and resize editor
$("#jogcontrols").slideDown("fast");
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 405 + 'px)');
editor.resize()
$('.jogbtn').attr('disabled', false);
} else if (val == 3) { // Busy Streaming GCODE
// Show panel and resize editor
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 405 + 'px)');
editor.resize()
$("#jogcontrols").slideDown("fast");
$('.jogbtn').attr('disabled', true);
} else if (val == 4) { // Paused
// Show panel and resize editor
$("#jogcontrols").slideDown("fast");
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 405 + 'px)');
editor.resize()
$('.jogbtn').attr('disabled', true);
} else if (val == 5) { // Alarm State
// Show panel and resize editor
$("#jogcontrols").slideUp("fast");
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)');
editor.resize()
$('.jogbtn').attr('disabled', true);
}
}
function setConsole(val, status) {
if (val == 0) { // Not Connected Yet
if (!$('#command').attr('disabled')) {
$('#command').attr('disabled', true);
}
$("#sendCommand").prop('disabled', true);
} else if (val == 0 || val == 2) { // Connected, but not Playing yet
$("#command").attr('disabled', false);
$("#sendCommand").prop('disabled', false);
} else if (val == 3) { // Busy Streaming GCODE
$("#command").attr('disabled', true);
$("#sendCommand").prop('disabled', true);
} else if (val == 4) { // Paused
$("#command").attr('disabled', true);
$("#sendCommand").prop('disabled', false);
} else if (val == 5) { // Alarm State
$("#command").attr('disabled', false);
$("#sendCommand").prop('disabled', false);
}
}

146
app/js/websocket.js
Wyświetl plik

@ -149,108 +149,17 @@ function initSocket() {
populatePortsMenu();
}
}
// console.log(status.comms.connectionStatus);
if (status.comms.connectionStatus == 0) { // Not Connected Yet
// $("#portUSB").val(status.comms.interfaces.activePort);
$('#connectStatus').html("Port: Not Connected");
$("#disconnectBtn").hide();
$(".grblmode").attr('disabled', true);
$("#playpauseresumelabel").html("Run<br>Job")
$("#playpauseresumeicon").html("<i class='fas fa-play'></i>")
$("#jogcontrols").slideUp("fast");
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)');
editor.resize()
$("#connectBtn").show();
if (!$('#command').attr('disabled')) {
$('#command').attr('disabled', true);
}
$("#sendCommand").prop('disabled', true);
if ($('#portUSB').val() != "") {
$('#portUSB').parent(".select").removeClass('disabled')
$("#connectBtn").attr('disabled', false);
} else {
$('#portUSB').parent(".select").addClass('disabled')
$("#connectBtn").attr('disabled', true);
}
$('#portUSB').parent(".select").addClass('success')
$('#portUSB').parent(".select").removeClass('alert')
// Set the Connection Toolbar option
setConnectBar(status.comms.connectionStatus, status);
setControlBar(status.comms.connectionStatus, status)
setJogPanel(status.comms.connectionStatus, status)
setConsole(status.comms.connectionStatus, status)
if (status.comms.connectionStatus != 5) {
bellstate = false
};
if (status.comms.connectionStatus == 0) {
showGrbl(false)
bellstate = false
} else if (status.comms.connectionStatus == 1 || status.comms.connectionStatus == 2) { // Connected, but not Playing yet
$("#portUSB").val(status.comms.interfaces.activePort);
$('#connectStatus').html("Port: Connected");
$("#connectBtn").hide();
$("#connectBtn").attr('disabled', false);
$("#disconnectBtn").show();
$(".grblmode").attr('disabled', false);
$("#playpauseresumelabel").html("Run<br>Job")
$("#playpauseresumeicon").html("<i class='fas fa-play'></i>")
$("#jogcontrols").slideDown("fast");
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 405 + 'px)');
editor.resize()
if (editor.session.getLength() < 2) {
$("#runBtn").attr('disabled', true);
} else {
$("#runBtn").attr('disabled', false);
}
$("#command").attr('disabled', false);
$("#sendCommand").prop('disabled', false);
$('#portUSB').parent(".select").addClass('disabled')
$('#portUSB').parent(".select").removeClass('success')
$('#portUSB').parent(".select").addClass('alert')
bellstate = false
} else if (status.comms.connectionStatus == 3) { // Busy Streaming GCODE
$("#portUSB").val(status.comms.interfaces.activePort);
$('#connectStatus').html("Port: Connected");
$("#connectBtn").hide();
$("#connectBtn").attr('disabled', false);
$("#disconnectBtn").show();
$(".grblmode").attr('disabled', false);
$("#playpauseresumelabel").html("Pause<br>Job")
$("#playpauseresumeicon").html("<i class='fas fa-pause'></i>")
$("#jogcontrols").slideUp("fast");
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)');
editor.resize()
$("#command").attr('disabled', true);
$("#sendCommand").prop('disabled', true);
$('#portUSB').parent(".select").addClass('disabled')
$('#portUSB').parent(".select").removeClass('success')
$('#portUSB').parent(".select").addClass('alert')
bellstate = false
} else if (status.comms.connectionStatus == 4) { // Paused
$("#portUSB").val(status.comms.interfaces.activePort);
$('#connectStatus').html("Port: Connected");
$("#connectBtn").hide();
$("#connectBtn").attr('disabled', false);
$("#disconnectBtn").show();
$(".grblmode").attr('disabled', false);
$("#playpauseresumelabel").html("Resume<br>Job")
$("#playpauseresumeicon").html("<i class='fas fa-play'></i>")
$("#jogcontrols").slideDown("fast")
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 405 + 'px)');
editor.resize()
$("#command").attr('disabled', false);
$("#sendCommand").prop('disabled', false);
$('#portUSB').parent(".select").addClass('disabled')
$('#portUSB').parent(".select").removeClass('success')
$('#portUSB').parent(".select").addClass('alert')
bellstate = false
} else if (status.comms.connectionStatus == 5) { // Alarm State
$("#portUSB").val(status.comms.interfaces.activePort);
$('#connectStatus').html("Port: Connected");
$("#connectBtn").hide();
$("#connectBtn").attr('disabled', false);
$("#disconnectBtn").show();
$(".grblmode").attr('disabled', true);
$("#jogcontrols").hide();
$("#editor").css('height', 'calc(' + 100 + 'vh - ' + 210 + 'px)');
editor.resize()
$("#command").attr('disabled', false);
$("#sendCommand").prop('disabled', false);
$('#portUSB').parent(".select").addClass('disabled')
$('#portUSB').parent(".select").removeClass('success')
$('#portUSB').parent(".select").addClass('alert')
}
$('#runStatus').html("Controller: " + status.comms.runStatus);
@ -265,51 +174,17 @@ function initSocket() {
$('#zPos').html(status.machine.position.work.z + " mm");
}
// $('#ModernXPos').html(parseFloat(status.machine.position.work.x).toFixed(3));
// $('#ModernYPos').html(parseFloat(status.machine.position.work.y).toFixed(3));
// $('#ModernZPos').html(parseFloat(status.machine.position.work.z).toFixed(3));
// $('#ModernAPos').html(parseFloat(status.machine.position.work.a).toFixed(3));
// $('#oF').html(status.machine.overrides.feedOverride);
// $('#oS').html(status.machine.overrides.spindleOverride);
// $('#T0CurTemp').html(status.machine.temperature.actual.t0.toFixed(1) + " / " + status.machine.temperature.setpoint.t0.toFixed(1));
// $('#T1CurTemp').html(status.machine.temperature.actual.t1.toFixed(1) + " / " + status.machine.temperature.setpoint.t1.toFixed(1));
// $('#B0CurTemp').html(status.machine.temperature.actual.b.toFixed(1) + " / " + status.machine.temperature.setpoint.b.toFixed(1));
// setTemp(status.machine.temperature.actual.t0, status.machine.temperature.actual.t1, status.machine.temperature.actual.b)
if (safeToUpdateSliders) {
$('#fro').data('slider').val(status.machine.overrides.feedOverride)
$('#tro').data('slider').val(status.machine.overrides.spindleOverride)
// $("#FROslider").slider('option', 'value', status.machine.overrides.feedOverride);
// $("#handle").text(status.machine.overrides.feedOverride + "%");
//
// $("#SROslider").slider('option', 'value', status.machine.overrides.spindleOverride);
// $("#handle2").text(status.machine.overrides.spindleOverride + "%");
}
// setTemp(status.machine.temperature.actual.t0, status.machine.temperature.actual.t1, status.machine.temperature.actual.b)
if (simstopped) {
cone.position.x = status.machine.position.work.x;
cone.position.y = status.machine.position.work.y;
cone.position.z = (parseFloat(status.machine.position.work.z) + 20);
}
// console.log(status.machine.drivers.x.stallGuard)
var amplitude = (status.machine.drivers.x.stallGuard.stallGuardReading) / 10.24;
$("#xMotorVU").attr("style", "-webkit-clip-path: inset(0 " + (amplitude) + "% 0 0);")
var amplitude = (status.machine.drivers.y.stallGuard.stallGuardReading) / 10.24;
$("#yMotorVU").attr("style", "-webkit-clip-path: inset(0 " + (amplitude) + "% 0 0);")
var amplitude = (status.machine.drivers.z.stallGuard.stallGuardReading) / 10.24;
$("#zMotorVU").attr("style", "-webkit-clip-path: inset(0 " + (amplitude) + "% 0 0);")
var amplitude = (status.machine.drivers.a.stallGuard.stallGuardReading) / 10.24;
$("#aMotorVU").attr("style", "-webkit-clip-path: inset(0 " + (amplitude) + "% 0 0);")
laststatus = status;
// }
});
$('#sendCommand').on('click', function() {
@ -393,6 +268,7 @@ function populatePortsMenu() {
var select = $("#portUSB").data("select");
select.data(response);
$('#portUSB').parent(".select").removeClass('disabled')
$("#connectBtn").attr('disabled', false);
}
function sendGcode(gcode) {

4
package.json
Wyświetl plik

@ -1,6 +1,6 @@
{
"name": "OpenBuildsMachineDriver",
"version": "1.0.8",
"version": "1.0.10",
"license": "AGPL-3.0",
"description": "Machine Interface Driver for OpenBuilds",
"author": "github.com/openbuilds",
@ -23,7 +23,7 @@
},
"main": "index.js",
"scripts": {
"start": "echo \"Please run 'npm run dist' to create a local installer, or run 'npm run nightlylinux' or 'npm run nightlywindows' to build distributable installers for each platform\" ",
"start": "echo \"Please run 'npm run dist' to create a local installer\" ",
"test": "echo \"Error: no test specified\" && exit 0",
"dist": "build",
"distmac": "build --mac ",

1453
uploads/file (7).gcode
Wyświetl plik

Plik diff jest za duży Load Diff