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

v1.0.180

pull/110/head v1.0.180
openbuilds-engineer 2019-07-17 17:14:18 +02:00
rodzic e8cd811cea
commit a405f9f498
7 zmienionych plików z 188 dodań i 39 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
CHANGELOG.txt
Wyświetl plik

@ -1,3 +1,4 @@
v1.0.180: Fixed bug #87: Don't show Update dialog while running job, Updated connection messages when Smoothieware is detected to alert user to replace it with Grbl-LPC, Increased spacing between buttons in Mobile interface (bug #90), Added Framing pass to Surfacing Wizard (Bug #83), updated 2x Dependencies
v1.0.179: New 3D Viewer backend: Support G2/G3 Arcs
v1.0.178: New 3D Viewer backend with support for Large Gcode Files, massively faster rendering
v1.0.176/7: Rpi Unofficial Support https://github.com/OpenBuilds/OpenBuilds-CONTROL/wiki/Run-on-a-Raspberry-Pi-(No-Compile-Method)

52
app/jog/index.html
Wyświetl plik

@ -102,7 +102,7 @@
</nav>
<table class="drotable mt-2">
<tr>
<td>
<td class="p-2">
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 X0')" style="width: 60px;" data-role="ripple" data-ripple-color="#e21b1b">
<span class="fa-layers fa-fw">
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-12"></i>
@ -111,7 +111,7 @@
</span>
</button>
</td>
<td>
<td class="p-2">
<div class="dro">
<div class="float-left fg-red" data-fa-transform="right-15">
<span class="fa-layers fa-fw">
@ -124,7 +124,7 @@
<input id="xPosInput" class="m-0 p-0 droInput float-right fg-red" />
</div>
</td>
<td>
<td class="p-2">
<div class="pos-relative">
<button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
@ -135,7 +135,7 @@
</td>
</tr>
<tr>
<td>
<td class="p-2">
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 Y0')" style="width: 60px;" data-role="ripple" data-ripple-color="#5de21b">
<span class="fa-layers fa-fw">
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-12"></i>
@ -144,7 +144,7 @@
</span>
</button>
</td>
<td>
<td class="p-2">
<div class="dro">
<div class="float-left fg-green">
<span class="fa-layers fa-fw">
@ -156,7 +156,7 @@
<input id="yPosInput" class="m-0 p-0 droInput float-right fg-green" />
</div>
</td>
<td>
<td class="p-2">
<div class="pos-relative">
<button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
@ -167,7 +167,7 @@
</td>
</tr>
<tr>
<td>
<td class="p-2">
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 Z0')" style="width: 60px;" data-role="ripple" data-ripple-color="#1ba1e2">
<span class="fa-layers fa-fw">
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-12"></i>
@ -176,7 +176,7 @@
</span>
</button>
</td>
<td>
<td class="p-2">
<div class="dro">
<div class="float-left fg-blue">
<span class="fa-layers fa-fw">
@ -188,7 +188,7 @@
<input id="zPosInput" class="m-0 p-0 droInput float-right fg-blue" />
</div>
</td>
<td>
<td class="p-2">
<div class="pos-relative">
<button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
<ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
@ -201,7 +201,7 @@
</td>
</tr>
<tr>
<td>
<td class="p-2">
<button class="button light jogbtn" onclick="sendGcode( 'G10 P1 L20 X0 Y0 Z0')" style="width: 60px;" data-role="ripple">
<span class="fa-layers fa-fw">
<i class="fas fa-crosshairs fg-openbuilds" data-fa-transform="shrink-2 down-8 left-18"></i>
@ -212,7 +212,7 @@
</span>
</button>
</td>
<td>
<td class="p-2">
<div class="pos-relative">
<button class="button light jogbtn" style="width: 161px;" data-role="ripple">
<span class="fa-layers fa-fw">
@ -230,7 +230,7 @@
</ul>
</div>
</td>
<td>
<td class="p-2">
<div class="pos-relative">
<button class="button light jogbtn" style="width: 42px;"></i>
<span class="fa-layers fa-fw">
@ -258,10 +258,10 @@
<center>
<table class="jogtable">
<tr>
<td>
<td class="p-2">
</td>
<td>
<td class="p-2">
<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>
@ -270,11 +270,11 @@
</button>
</td>
<td>
<td class="p-2">
</td>
<td>
<td class="p-2">
<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>
@ -284,7 +284,7 @@
</td>
</tr>
<tr>
<td>
<td class="p-2">
<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>
@ -293,7 +293,7 @@
</button>
</td>
<td>
<td class="p-2">
<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>
@ -302,7 +302,7 @@
</button>
</td>
<td>
<td class="p-2">
<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>
@ -310,7 +310,7 @@
</span>
</button>
</td>
<td>
<td class="p-2">
<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>
@ -320,28 +320,28 @@
</td>
</tr>
<tr>
<td>
<td class="p-2">
<button class="button light jogbtn" id="dist01" style="width: 100%; height: 30px; line-height: 28px;">
<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>
<td class="p-2">
<button class="button light jogbtn" id="dist1" style="width: 100%; height: 30px; line-height: 28px;">
<span class=" fa-layers fa-fw">
<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>
</button>
</td>
<td>
<td class="p-2">
<button class="button light jogbtn" id="dist10" style="width: 100%; height: 30px; line-height: 28px;">
<span class=" fa-layers fa-fw">
<span id="dist10label" class="fa-layers-text fg-openbuilds jogdist" data-fa-transform="" style="font-weight:900; font-family: Arial; font-size: 12px;">10mm</span>
</span>
</button>
</td>
<td>
<td class="p-2">
<button class="button light jogbtn" id="dist100" style="width: 100%; height: 30px; line-height: 28px;">
<span class=" fa-layers fa-fw">
<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>
@ -350,7 +350,7 @@
</td>
</tr>
<tr>
<td colspan="4">
<td colspan="4" class="p-2">
<div style="margin: 2px;">
<div id="jogratemmdiv">
<input id="jograte" type="number" min="100" max="10000" step="500" placeholder="5000" data-role="input" data-prepend="Jog:" data-append="mm/min" data-clear-button="false" value="5000" style="text-align: right;" />
@ -433,4 +433,4 @@
<!-- <script type="text/javascript" src="js/calibrate.js"></script> -->
<script type="text/javascript" src="../js/mobilejog.js"></script>
</html>
</html>

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

@ -96,8 +96,18 @@ function initSocket() {
});
socket.on('updateready', function(data) {
$('#availVersion').html(data)
Metro.dialog.open('#downloadUpdate')
// 0 = not connected
// 1 = Connected, but not Playing yet
// 2 = Connected, but not Playing yet
// 3 = Busy Streaming GCODE
// 4 = Paused
// 5 = Alarm State
// 6 = Firmware Upgrade State
if (laststatus.comms.connectionStatus < 3) {
$('#availVersion').html(data)
Metro.dialog.open('#downloadUpdate')
}
});
socket.on('updateprogress', function(data) {
@ -595,4 +605,4 @@ function friendlyPort(i) {
function escapeHTML(html) {
return document.createElement('div').appendChild(document.createTextNode(html)).parentNode.innerHTML;
}
}

17
app/wizards/surfacing.js
Wyświetl plik

@ -131,7 +131,20 @@ G1 X` +
}
gcode += `G0 Z10\n`;
gcode += `G0 X0 Y0\n`;
// Framing Pass
gcode += `; Framing pass\n`;
gcode += `G0 X` + startpointX + ` Y` + startpointY + `Z10\n`; // position at start point
gcode += `G1 Z-` + data.surfaceDepth + `\n`; // plunge
gcode += `G1 X` + startpointX + ` Y` + endpointY + `Z-` + data.surfaceDepth + `\n`; // Cut side
gcode += `G0 Z10\n`;
gcode += `G0 X` + endpointX + ` Y` + endpointY +`\n`; // position at start point
gcode += `G1 Z-` + data.surfaceDepth + `\n`; // plunge
gcode += `G0 X` + endpointX + ` Y` + startpointY + `Z-` + data.surfaceDepth + `\n`; // Cut side
gcode += `G0 Z10\n`;
gcode += `G0 X0 Y0\n`;
gcode += `M5 S0\n`;
editor.session.setValue(gcode);
@ -141,4 +154,4 @@ G1 X` +
// console.log(gcode);
//
// $("#gcode").html(gcode.replace(/(?:\r\n|\r|\n)/g, "<br>"));
}
}

14
package-lock.json wygenerowano
Wyświetl plik

@ -1,6 +1,6 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.179",
"version": "1.0.180",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -3374,9 +3374,9 @@
}
},
"lodash": {
"version": "4.17.11",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
"version": "4.17.14",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
"integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
},
"lodash.isequal": {
"version": "4.5.0",
@ -4848,9 +4848,9 @@
}
},
"set-value": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.0.tgz",
"integrity": "sha512-tqkg9wJ2TOsxbzIMG5NMAmzjdbDTAD0in7XuUzmFpJE4Ipi2QFBfgC2Z1/gfxcAmWCPsuutiEJyDIMRsrjrMOQ==",
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.1.tgz",
"integrity": "sha512-w6n3GUPYAWQj4ZyHWzD7K2FnFXHx9OTwJYbWg+6nXjG8sCLfs9DGv+KlqglKIIJx+ks7MlFuwFW2RBPb+8V+xg==",
"requires": {
"is-plain-object": "^2.0.4"
}

2
package.json
Wyświetl plik

@ -18,7 +18,7 @@
"express": "^4.16.4",
"formidable": "^1.2.1",
"ip": "^1.1.5",
"lodash": "^4.17.11",
"lodash": "^4.17.13",
"md5": "^2.2.1",
"mkdirp": "^0.5.1",
"rimraf": "^2.6.3",

125
package.json-backup 100644
Wyświetl plik

@ -0,0 +1,125 @@
{
"name": "OpenBuildsCONTROL",
"version": "1.0.180",
"license": "AGPL-3.0",
"description": "Machine Interface Driver for OpenBuilds",
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
"devDependencies": {
"copyfiles": "^2.1.0",
"electron": "^4.2.0",
"electron-builder": "^20.39.0",
"ncp": "^2.0.0"
},
"dependencies": {
"avrgirl-arduino": "^3.0.0",
"detect-rpi": "^1.3.0",
"directory-tree": "^2.2.1",
"electron-updater": "^4.0.6",
"express": "^4.16.4",
"formidable": "^1.2.1",
"ip": "^1.1.5",
"lodash": "^4.17.13",
"md5": "^2.2.1",
"mkdirp": "^0.5.1",
"rimraf": "^2.6.3",
"serialport": "^7.1.5",
"socket.io": "^2.2.0"
},
"main": "index.js",
"scripts": {
"start": "echo \"Please run 'npm run dist' to create a local installer\" ",
"test": "echo \"Error: no test specified\" && exit 0",
"dist": "build --ia32 --x64",
"distpi": "build --linux deb --armv7l",
"postinstall": "electron-builder install-app-deps"
},
"keywords": [
"usb"
],
"repository": "https://github.com/OpenBuilds/OpenBuilds-CONTROL",
"build": {
"icon": "build/icon.icns",
"appId": "openbuilds.projectmakr",
"productName": "OpenBuildsCONTROL",
"asar": true,
"nsis": {
"oneClick": false,
"perMachine": false,
"allowToChangeInstallationDirectory": true,
"allowElevation": true,
"license": "build/licence.txt",
"installerIcon": "build/icon.ico",
"installerSidebar": "build/installerSidebar.bmp",
"artifactName": "${productName}-Setup-${version}.${ext}"
},
"fileAssociations": [
{
"ext": "obc",
"name": "OpenBuilds CAM Workspace",
"description": "OpenBuilds CAM Workspace",
"role": "Viewer"
},
{
"ext": "gcode",
"name": "GCODE File",
"description": "GCODE File",
"role": "Viewer"
},
{
"ext": "gc",
"name": "GCODE File",
"description": "GCODE File",
"role": "Viewer"
},
{
"ext": "tap",
"name": "GCODE File",
"description": "GCODE File",
"role": "Viewer"
},
{
"ext": "nc",
"name": "GCODE File",
"description": "GCODE File",
"role": "Viewer"
},
{
"ext": "cnc",
"name": "GCODE File",
"description": "GCODE File",
"role": "Viewer"
}
],
"files": [
"**/*",
"ssl/**/*",
"firmware/**/*"
],
"extraFiles": [
"ssl"
],
"linux": {
"icon": "build/"
},
"mac": {
"icon": "build/icon.icns",
"category": "public.app-category.graphics-design"
},
"dmg": {
"icon": "build/icon.icns",
"contents": [
{
"x": 410,
"y": 150,
"type": "link",
"path": "/Applications"
},
{
"x": 130,
"y": 150,
"type": "file"
}
]
}
}
}