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

Fix for USB Unplug

pull/110/head
openbuilds-engineer 2018-10-22 16:54:53 +02:00
rodzic ff051f21ec
commit 12f3674abf
3 zmienionych plików z 39 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

33
app/index.html
Wyświetl plik

@ -311,6 +311,14 @@
<input id="xPosInput" class="m-0 p-0 droInput float-right fg-red" />
</div>
</td>
<td>
<div class="pos-relative">
<button class="button light"><i class="fas fa-caret-down fg-grayBlue"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
<li><a href="#" onclick="sendGcode( 'G0 X0')"><span class="fas fa-chart-line fg-grayBlue icon"></span>Goto X Zero (G0 X0)</a></li>
</ul>
</div>
</td>
</tr>
<tr>
@ -328,13 +336,20 @@
<div class="float-left fg-green">
<span class="fa-layers fa-fw">
<span class="fa-layers-text fg-green">Y</span>
<!-- <span class="fa-layers-text fg-green" data-fa-transform="left-20 rotate--90" style="font-family: Arial; font-size: 11px;">work</span> -->
</span>
</div>
<div class="float-right fg-green" id="yPos" data-editable>0.000</div>
<input id="yPosInput" class="m-0 p-0 droInput float-right fg-green" />
</div>
</td>
<td>
<div class="pos-relative">
<button class="button light"><i class="fas fa-caret-down fg-grayBlue"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
<li><a href="#" onclick="sendGcode( 'G0 Y0')"><span class="fas fa-chart-line fg-grayBlue icon"></span>Goto Y Zero (G0 Y0)</a></li>
</ul>
</div>
</td>
</tr>
<tr>
<td>
@ -351,13 +366,22 @@
<div class="float-left fg-blue">
<span class="fa-layers fa-fw">
<span class="fa-layers-text fg-blue">Z</span>
<!-- <span class="fa-layers-text fg-blue" data-fa-transform="left-20 rotate--90" style="font-family: Arial; font-size: 11px;">work</span> -->
</span>
</div>
<div class="float-right fg-blue" id="zPos" data-editable>0.000</div>
<input id="zPosInput" class="m-0 p-0 droInput float-right fg-blue" />
</div>
</td>
<td>
<div class="pos-relative">
<button class="button light"><i class="fas fa-caret-down fg-grayBlue"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
<li><a href="#" onclick="sendGcode( 'G0 Z0')"><span class="fas fa-chart-line fg-grayBlue icon"></span>Goto Z Zero (G0 Z0)</a></li>
<li class="divider"></li>
<li><a href="#" onclick="sendGcode('G38.2 F10 Z-20');"><span class="fas fa-podcast fa-rotate-180 fg-grayBlue icon"></span>Probe Z (G38.2 F10 Z-20)</a></li>
</ul>
</div>
</td>
</tr>
<tr>
<td>
@ -383,6 +407,9 @@
</button>
</td>
<td>
<!-- -->
</td>
</tr>
</table>
@ -744,7 +771,7 @@
<!-- Modal Divs -->
<div style="display: none;">
<div class="dialog" data-overlay-click-close="true" data-role="dialog" id="jogWidgetDialog" data-to-top="true">
<div class="dialog" data-overlay-click-close="true" data-role="dialog" id="jogWidgetDialog">
<div class="dialog-title">Jog Widget</div>
<div class="dialog-content" style="max-height: calc(100vh - 200px);overflow-y: auto; overflow-x: hidden;">
<div class="row">

15
index.js
Wyświetl plik

@ -433,13 +433,13 @@ var PortCheckinterval = setInterval(function() {
var newPorts = _.differenceWith(ports, oldportslist, _.isEqual)
if (newPorts.length > 0) {
console.log("Plugged " + newPorts[0].comName);
if (jogWindow && !jogWindow.isFocused()) {
appIcon.displayBalloon({
icon: nativeImage.createFromPath(iconPath),
title: "Driver Detected a new Port",
content: "OpenBuilds Machine Driver detected a new port: " + newPorts[0].comName
})
}
// if (jogWindow && !jogWindow.isFocused()) {
// appIcon.displayBalloon({
// icon: nativeImage.createFromPath(iconPath),
// title: "Driver Detected a new Port",
// content: "OpenBuilds Machine Driver detected a new port: " + newPorts[0].comName
// })
// }
}
var removedPorts = _.differenceWith(oldportslist, ports, _.isEqual)
if (removedPorts.length > 0) {
@ -866,6 +866,7 @@ io.on("connection", function(socket) {
break;
}
console.log("error;")
sentBuffer.shift();
status.comms.connectionStatus = 5;
} else if (data === ' ') {
// nothing

2
package.json
Wyświetl plik

@ -1,6 +1,6 @@
{
"name": "OpenBuildsMachineDriver",
"version": "1.0.106",
"version": "1.0.107",
"license": "AGPL-3.0",
"description": "Machine Interface Driver for OpenBuilds",
"author": "github.com/openbuilds <webmaster@openbuilds.com>",