kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
v1.0.166
openbuilds-engineer
rodzic
db77d970b8
commit
84a02b3db9
|
|
@ -1,5 +1,7 @@
|
|||
v1.0.164: BETA fix for odd JS bug that affected 1% of users
|
||||
v1.0.163: Surfacing Wizard, Move Switch for Incr/Conti Jog, Improvements to GCODE Editor and 3D view
|
||||
v1.0.166: Fix for ElectronSecondInstance Behaviour and Updated SSL Certificates
|
||||
v1.0.165: Surfacing Wizard
|
||||
v1.0.164: Fix for odd JS bug that affected users in v1.0.161 and 10.0.162
|
||||
v1.0.163: Move Switch for Incr/Conti Jog, Improvements to GCODE Editor and 3D view
|
||||
v1.0.162: Improved .OBC (OpenBuilds CAM) Handling
|
||||
v1.0.161: Associate .OBC (OpenBuilds CAM files)
|
||||
v1.0.160: Update MiniMill Grbl-defaults Profile to match New Video
|
||||
|
|
|
|||
|
|
@ -942,10 +942,9 @@
|
|||
|
||||
<div class="dialog" data-role="dialog" id="surfacingDialog" data-width="90%" data-actions-align="right" data-overlay-click-close="true">
|
||||
<div class="dialog-title">Flattening / Surfacing Tool</div>
|
||||
<div class="dialog-content" style="height: calc(100% - 100px);">
|
||||
<div class="dialog-content" style="max-height: calc(100vh - 100px);overflow-y: auto; overflow-x: hidden;">
|
||||
<form>
|
||||
<div class="row mb-2">
|
||||
|
||||
<div class="cell-sm-6">
|
||||
<div class="row mb-2">
|
||||
<label class="cell-sm-6">Router Bit Diameter</label>
|
||||
|
|
@ -1007,7 +1006,7 @@
|
|||
</ul></small>
|
||||
<hr>
|
||||
<center>
|
||||
<img src="https://i.ibb.co/Wfks2ry/diameter.png" alt="diameter" border="0" style="max-width: calc(100% - 10px); ">
|
||||
<img src="img/surfacing/diameter.png" alt="diameter" border="0" style="max-width: calc(100% - 10px); ">
|
||||
</center>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -77,6 +77,8 @@ function bindKeys() {
|
|||
if (keyboardShortcuts.xM.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.xM, function(event) {
|
||||
if (allowContinuousJog) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
if (!event.originalEvent.repeat) {
|
||||
var direction = "X-";
|
||||
var feed = $('#jograte').val();
|
||||
|
|
@ -96,6 +98,8 @@ function bindKeys() {
|
|||
if (keyboardShortcuts.xP.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.xP, function(event) {
|
||||
if (allowContinuousJog) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
if (!event.originalEvent.repeat) {
|
||||
var direction = "X";
|
||||
var feed = $('#jograte').val();
|
||||
|
|
@ -116,6 +120,8 @@ function bindKeys() {
|
|||
if (keyboardShortcuts.yM.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.yM, function(event) {
|
||||
if (allowContinuousJog) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
if (!event.originalEvent.repeat) {
|
||||
var direction = "Y-";
|
||||
var feed = $('#jograte').val();
|
||||
|
|
@ -136,6 +142,8 @@ function bindKeys() {
|
|||
if (keyboardShortcuts.yP.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.yP, function(event) {
|
||||
if (allowContinuousJog) {
|
||||
if (event.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
if (!event.originalEvent.repeat) {
|
||||
// startJog();
|
||||
var direction = "Y";
|
||||
|
|
@ -156,6 +164,8 @@ function bindKeys() {
|
|||
if (keyboardShortcuts.zM.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.zM, function(event) {
|
||||
if (allowContinuousJog) {
|
||||
if (event.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
if (!event.originalEvent.repeat) {
|
||||
// startJog();
|
||||
var direction = "Z-";
|
||||
|
|
@ -176,6 +186,8 @@ function bindKeys() {
|
|||
if (keyboardShortcuts.zP.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.zP, function(event) {
|
||||
if (allowContinuousJog) {
|
||||
if (event.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
if (!event.originalEvent.repeat) {
|
||||
// startJog();
|
||||
var direction = "Z";
|
||||
|
|
@ -194,22 +206,28 @@ function bindKeys() {
|
|||
});
|
||||
}
|
||||
if (keyboardShortcuts.stepM.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.stepM, function() {
|
||||
$(document).bind('keydown', keyboardShortcuts.stepM, function(e) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
changeStepSize(-1)
|
||||
});
|
||||
}
|
||||
if (keyboardShortcuts.stepP.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.stepP, function() {
|
||||
$(document).bind('keydown', keyboardShortcuts.stepP, function(e) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
changeStepSize(1)
|
||||
});
|
||||
}
|
||||
if (keyboardShortcuts.estop.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.estop, function() {
|
||||
$(document).bind('keydown', keyboardShortcuts.estop, function(e) {
|
||||
socket.emit('stop', false)
|
||||
});
|
||||
}
|
||||
if (keyboardShortcuts.playpause.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.playpause, function() {
|
||||
$(document).bind('keydown', keyboardShortcuts.playpause, function(e) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
if (laststatus.comms.connectionStatus == 1 || laststatus.comms.connectionStatus == 2) {
|
||||
socket.emit('runJob', editor.getValue());
|
||||
} else if (laststatus.comms.connectionStatus == 3) {
|
||||
|
|
@ -220,21 +238,28 @@ function bindKeys() {
|
|||
});
|
||||
}
|
||||
if (keyboardShortcuts.unlockAlarm.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.unlockAlarm, function() {
|
||||
$(document).bind('keydown', keyboardShortcuts.unlockAlarm, function(e) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
Metro.dialog.close($('.closeAlarmBtn').parent().parent());
|
||||
socket.emit('clearAlarm', 2);
|
||||
});
|
||||
}
|
||||
if (keyboardShortcuts.home.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.home, function() {
|
||||
$(document).bind('keydown', keyboardShortcuts.home, function(e) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
home();
|
||||
});
|
||||
}
|
||||
if (keyboardShortcuts.setzeroxyz.length) {
|
||||
$(document).bind('keydown', keyboardShortcuts.setzeroxyz, function() {
|
||||
$(document).bind('keydown', keyboardShortcuts.setzeroxyz, function(e) {
|
||||
if (e.target.tagName == 'TEXTAREA')
|
||||
return;
|
||||
sendGcode('G10 P1 L20 X0 Y0 Z0')
|
||||
});
|
||||
}
|
||||
|
||||
localStorage.setItem('keyboardShortcuts', JSON.stringify(keyboardShortcuts));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +1,39 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
b3vYPrIAczx8BA==
|
||||
MIIBBgYKKwYBBAHWeQIEAgSB9wSB9ADyAHcAY/Lbzeg7zCzPC3KEJ1drM6SNYXeP
|
||||
vXWmOLHHaFRL2I0AAAFqjTKNvQAABAMASDBGAiEAi8y1IhBWpRN+F1Rw+vkfZ6F9
|
||||
VTr+BvV7feBfDN65B5ICIQCTdYqKb6tEjrgvP1GHnYwdPoltXfbhcDABqCl+9Vjy
|
||||
1gB3AHR+2oMxrTMQkSGcziVPQnDCv/1eQiAIxjc1eeYQe8xWAAABao0yj7MAAAQD
|
||||
AEgwRgIhAI7TPfM0DU4OVcyJh4la5ZQKtEbhalI1hXXjSthJFugZAiEA1fQEFKPz
|
||||
2F9Rc5vT+SmLcIpWJFaL58X9Etyc8X73prswDQYJKoZIhvcNAQELBQADggEBACYW
|
||||
lI0uD5ygguaq0/QO49KSPn+M14TNi0AlEEHWfjqUYkK+WzbEs5Is/KbO/yx131IP
|
||||
FjmVFR4JqFWNi78uZHe9Nf2vzPRqydlksEpy7DieXyvsUG9zueq5QLcTO737JfbK
|
||||
LO+P99LapKtrpwB2JH/j2wVdhGf9Gtqjo0eYdXHef8wbduBcke0avV0NXjkICjyw
|
||||
e0R8rFb53XMRS0zNfvHAvNPp1c4W6Q2ORDQ4KoOA6U1wpS6R3h4Ohz5yBV3WiGL/
|
||||
iOgPFQahi84xfY3sa5rkggM0axHdbjxG/Wu1x9wq/eNIeLmnsKcsJbEJdbK7ooqX
|
||||
l81fUrpS5l6a7cBluqc=
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
-----BEGIN CERTIFICATE REQUEST-----
|
||||
MIIEnjCCAoYCAQAwIzEhMB8GA1UEAxMYbXltYWNoaW5lLm9wZW5idWlsZHMuY29t
|
||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9Si4GodvwvT4VoWX3Tf0
|
||||
GaTMGh5oswIdXp+TUcuZ72uJz+Cr+FvGVWxx/51bLE7MQTIVVN7Z1tSO2eKoQWYa
|
||||
XI/jAzMBTXWwx20Ica6BvE4JAnUL3g6R0Ys+ibmt9YVyC7mtMAN38Pz6kGZ1cuJR
|
||||
xQ1pVAR3lv4mIcgJ/4cRNC4lYb/C9/mr7oHCQQQl7Nh5v0lJO9e8ke+oDdU0DERI
|
||||
sabRJGLTmL8lW4Ine0G3J35+Tq64JN5Z89hExojGdN956/EIzykLKuGAzeIATIjB
|
||||
szfeCEecF0iPZAsnyU8rcOsLzAgoMjqUTL4q7raR2bnAPEVUAkiTFCT090Q1ryMR
|
||||
1vdpSw8dWlAbL1Qsejdq9HwJ0vHJ5BQc745Btc1KAWwDLU8+cjixr5CBkvhv6seW
|
||||
QSsOvbEOUtPjpVgSLuaNTLFPVjYSFKxmcWCORsJBrglcPFVy6Abx28DEqf2izsB9
|
||||
QCj4HOmfqKGPHhExamS9gl4tNSNxBafp9UhT5wl6MizT28NZZQvoIO0LmWkzWLLm
|
||||
+npUHxY+dPdT3WVVtphBcJdgFRVHaqTITDl54hTNp0h6dDrK+0iQjNuum8EG4Dul
|
||||
HwxsbXI95l0xY+xOXQOxhO8rXXviHE1yJtoDuZeKXc3BHSmN+cOxc/Kdrd13Amui
|
||||
H5rO2ckIZt+vDJqOqIyyFLUCAwEAAaA2MDQGCSqGSIb3DQEJDjEnMCUwIwYDVR0R
|
||||
BBwwGoIYbXltYWNoaW5lLm9wZW5idWlsZHMuY29tMA0GCSqGSIb3DQEBCwUAA4IC
|
||||
AQAiLWkXvn8zu9w7hPDopBLS5PrypAap4rHZdBA8PTchl3/cOttLwnKW2vhVtlRk
|
||||
xFtzyfsR8oxn2ZN7neq2zrpFhnUx6WtiUUIJh/6B0yakD3z5pSenqXJlk3e1lA+X
|
||||
3sPIYnRHpUoDjpJSM2t0MtWRvdTGKja+A+oRnf6/syV9qaKGPC83f0MRtarlsKSP
|
||||
9J4ZPdXygTZ+nZI2WvNeTeNzl8ldasfEnBOPMCVNTPwgE7eRJqBaM0CKSN9tPE/0
|
||||
VtpI/T4VDaKN6OwdCu/ctjCYIZDTMHe4byItcconLajz9RSqh53nCJ1kBZsiej6d
|
||||
chqWM7XQaoyvcU/vCsKgSQMUlLLor87RfVUv0p2GSdWLt6HaGMn9HjZ42P71tcqR
|
||||
nhyt4fYSLaq555yWgTIc50nIEVdWMIbyNTn/EDPSI+V+wN0iL14Q+hZIPN35jKZZ
|
||||
qSsHZgGwnXWEEarVEYPEwwDq2shOBdd4eowfWx7Y1zF5k5vt9Dr3CAohO/grxFGd
|
||||
uvDGN4CeDlq5RxW9iPO5c99dr3JSvzGWcqBh7n2ep2ka93wIs4SlCapXlu80N7hG
|
||||
WWVgfrS7Qw5zjCLLjcgg7UnTKdiJ02LAm/GbYn0G/SFumUmEiG2q4E8BoLCJ6l2n
|
||||
z+d8T2t8QBbywDM1owGa/OutoNDPs//XSboEvskY9FtOMw==
|
||||
-----END CERTIFICATE REQUEST-----
|
||||
|
|
@ -1,51 +1,51 @@
|
|||
-----BEGIN RSA PRIVATE KEY-----
|
||||
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
|
||||
-----END RSA PRIVATE KEY-----
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
38
index.js
38
index.js
|
|
@ -2086,6 +2086,7 @@ function isElectron() {
|
|||
|
||||
if (isElectron()) {
|
||||
const gotTheLock = electronApp.requestSingleInstanceLock()
|
||||
var lauchGUI = true;
|
||||
if (!gotTheLock) {
|
||||
console.log("Already running! Check the System Tray")
|
||||
electronApp.exit(0);
|
||||
|
|
@ -2095,31 +2096,36 @@ if (isElectron()) {
|
|||
//Someone tried to run a second instance, we should focus our window.
|
||||
// console.log('SingleInstance')
|
||||
// console.log(commandLine)
|
||||
|
||||
lauchGUI = true;
|
||||
var openFilePath = commandLine[1];
|
||||
if (openFilePath !== "") {
|
||||
|
||||
// console.log(openFilePath);
|
||||
readFile(openFilePath);
|
||||
if (openFilePath !== undefined) {
|
||||
if (openFilePath.endsWith('.obc')) {
|
||||
//
|
||||
lauchGUI = false;
|
||||
} else {
|
||||
if (jogWindow === null) {
|
||||
createJogWindow();
|
||||
jogWindow.show()
|
||||
jogWindow.setAlwaysOnTop(true);
|
||||
jogWindow.focus();
|
||||
jogWindow.setAlwaysOnTop(false);
|
||||
} else {
|
||||
jogWindow.show()
|
||||
jogWindow.setAlwaysOnTop(true);
|
||||
jogWindow.focus();
|
||||
jogWindow.setAlwaysOnTop(false);
|
||||
}
|
||||
lauchGUI = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (lauchGUI) {
|
||||
if (jogWindow === null) {
|
||||
createJogWindow();
|
||||
jogWindow.show()
|
||||
jogWindow.setAlwaysOnTop(true);
|
||||
jogWindow.focus();
|
||||
jogWindow.setAlwaysOnTop(false);
|
||||
} else {
|
||||
jogWindow.show()
|
||||
jogWindow.setAlwaysOnTop(true);
|
||||
jogWindow.focus();
|
||||
jogWindow.setAlwaysOnTop(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
})
|
||||
// Create myWindow, load the rest of the app, etc...
|
||||
app.on('ready', () => {})
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "OpenBuildsCONTROL",
|
||||
"version": "1.0.164",
|
||||
"version": "1.0.166",
|
||||
"license": "AGPL-3.0",
|
||||
"description": "Machine Interface Driver for OpenBuilds",
|
||||
"author": "github.com/openbuilds <webmaster@openbuilds.com>",
|
||||
"devDependencies": {
|
||||
"copyfiles": "^2.1.0",
|
||||
"electron": "^4.0.5",
|
||||
"electron": "^4.2.0",
|
||||
"electron-builder": "^20.39.0",
|
||||
"electron-rebuild": "^1.8.4",
|
||||
"ncp": "^2.0.0"
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"md5": "^2.2.1",
|
||||
"mkdirp": "^0.5.1",
|
||||
"rimraf": "^2.6.3",
|
||||
"serialport": "^7.1.4",
|
||||
"serialport": "^7.1.5",
|
||||
"socket.io": "^2.2.0"
|
||||
},
|
||||
"main": "index.js",
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue