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

1.0.254

interface
openbuilds-engineer 2020-11-07 00:09:08 +02:00
rodzic 585064a8c8
commit c58169fc8a
5 zmienionych plików z 25 dodań i 75 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.254: Fixed Continous Jog calculation bug
v1.0.253: Fix 3D Viewer Bug with Fusion outputs #157 v1.0.253: Fix 3D Viewer Bug with Fusion outputs #157
v1.0.252: Fix for hold:0 status on jog with soft-limits v1.0.252: Fix for hold:0 status on jog with soft-limits
v1.0.251: Updated LEAD1515 Profile, Improved Stop button, Fixed Custom Z Plate thickness Bug v1.0.251: Updated LEAD1515 Profile, Improved Stop button, Fixed Custom Z Plate thickness Bug

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

@ -3,7 +3,6 @@ var continuousJogRunning = false;
var jogdist = 10; var jogdist = 10;
var safeToUpdateSliders = true; var safeToUpdateSliders = true;
function mmtoinchrate() { function mmtoinchrate() {
var value = $('#jograte').val(); var value = $('#jograte').val();
var convert = ""; var convert = "";
@ -358,69 +357,11 @@ $(document).ready(function() {
}); });
// $('.xM').on('click', function(ev) {
// if (!allowContinuousJog) {
// var dir = 'X-';
// var feedrate = $('#jograte').val();
// jog('X', '-' + jogdist, feedrate);
// }
// $('#runNewProbeBtn').addClass("disabled")
// $('#confirmNewProbeBtn').removeClass("disabled")
// })
//
// $('.xP').on('click', function(ev) {
// if (!allowContinuousJog) {
// var dir = 'X-';
// var feedrate = $('#jograte').val();
// jog('X', jogdist, feedrate);
// }
// $('#runNewProbeBtn').addClass("disabled")
// $('#confirmNewProbeBtn').removeClass("disabled")
// })
//
// $('.yM').on('click', function(ev) {
// if (!allowContinuousJog) {
// var dir = 'X-';
// var feedrate = $('#jograte').val();
// jog('Y', '-' + jogdist, feedrate);
// }
// $('#runNewProbeBtn').addClass("disabled")
// $('#confirmNewProbeBtn').removeClass("disabled")
// })
//
// $('.yP').on('click', function(ev) {
// if (!allowContinuousJog) {
// var dir = 'X-';
// var feedrate = $('#jograte').val();
// jog('Y', jogdist, feedrate);
// }
// $('#runNewProbeBtn').addClass("disabled")
// $('#confirmNewProbeBtn').removeClass("disabled")
// })
//
// $('.zM').on('click', function(ev) {
// if (!allowContinuousJog) {
// var dir = 'X-';
// var feedrate = $('#jograte').val();
// jog('Z', '-' + jogdist, feedrate);
// }
// $('#runNewProbeBtn').addClass("disabled")
// $('#confirmNewProbeBtn').removeClass("disabled")
// })
//
// $('.zP').on('click', function(ev) {
// if (!allowContinuousJog) {
// var dir = 'X-';
// var feedrate = $('#jograte').val();
// jog('Z', jogdist, feedrate);
// }
// $('#runNewProbeBtn').addClass("disabled")
// $('#confirmNewProbeBtn').removeClass("disabled")
// })
$('.xM').on('touchstart mousedown', function(ev) { $('.xM').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog) { // startJog(); if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog();
var direction = "X-"; var direction = "X-";
var distance = 1000; var distance = 1000;
@ -430,12 +371,13 @@ $(document).ready(function() {
var mindistance = parseInt(grblParams.$130) var mindistance = parseInt(grblParams.$130)
var maxdistance = 0; // Grbl all negative coordinates var maxdistance = 0; // Grbl all negative coordinates
// Negative move: // Negative move:
distance = (mindistance + (parseInt(laststatus.machine.position.offset.x) + parseInt(laststatus.machine.position.work.x))) - 1 distance = (mindistance + (parseFloat(laststatus.machine.position.offset.x) + parseFloat(laststatus.machine.position.work.x))) - 5
} }
} }
var feed = $('#jograte').val(); var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true; continuousJogRunning = true;
waitingForStatus = true;
$('.xM').click(); $('.xM').click();
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
@ -454,7 +396,7 @@ $(document).ready(function() {
$('.xP').on('touchstart mousedown', function(ev) { $('.xP').on('touchstart mousedown', function(ev) {
// console.log("xp down") // console.log("xp down")
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog) { // startJog(); if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog();
var direction = "X"; var direction = "X";
var distance = 1000; var distance = 1000;
if (Object.keys(grblParams).length > 0) { if (Object.keys(grblParams).length > 0) {
@ -463,12 +405,13 @@ $(document).ready(function() {
var mindistance = parseInt(grblParams.$130) var mindistance = parseInt(grblParams.$130)
var maxdistance = 0; // Grbl all negative coordinates var maxdistance = 0; // Grbl all negative coordinates
// Positive move: // Positive move:
distance = (maxdistance - (parseInt(laststatus.machine.position.offset.x) + parseInt(laststatus.machine.position.work.x))) - 1 distance = (maxdistance - (parseFloat(laststatus.machine.position.offset.x) + parseFloat(laststatus.machine.position.work.x))) - 5
} }
} }
var feed = $('#jograte').val(); var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true; continuousJogRunning = true;
waitingForStatus = true;
$('.xP').click(); $('.xP').click();
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
@ -487,7 +430,7 @@ $(document).ready(function() {
$('.yM').on('touchstart mousedown', function(ev) { $('.yM').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog) { // startJog(); if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog();
var direction = "Y-"; var direction = "Y-";
var distance = 1000; var distance = 1000;
@ -497,13 +440,14 @@ $(document).ready(function() {
var mindistance = parseInt(grblParams.$131) var mindistance = parseInt(grblParams.$131)
var maxdistance = 0; // Grbl all negative coordinates var maxdistance = 0; // Grbl all negative coordinates
// Negative move: // Negative move:
distance = (mindistance + (parseInt(laststatus.machine.position.offset.y) + parseInt(laststatus.machine.position.work.y))) - 1 distance = (mindistance + (parseFloat(laststatus.machine.position.offset.y) + parseFloat(laststatus.machine.position.work.y))) - 5
} }
} }
var feed = $('#jograte').val(); var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true; continuousJogRunning = true;
waitingForStatus = true;
$('.yM').click(); $('.yM').click();
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
@ -521,7 +465,7 @@ $(document).ready(function() {
$('.yP').on('touchstart mousedown', function(ev) { $('.yP').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog) { // startJog(); if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog();
var direction = "Y"; var direction = "Y";
var distance = 1000; var distance = 1000;
@ -531,13 +475,14 @@ $(document).ready(function() {
var mindistance = parseInt(grblParams.$131) var mindistance = parseInt(grblParams.$131)
var maxdistance = 0; // Grbl all negative coordinates var maxdistance = 0; // Grbl all negative coordinates
// Positive move: // Positive move:
distance = (maxdistance - (parseInt(laststatus.machine.position.offset.y) + parseInt(laststatus.machine.position.work.y))) - 1 distance = (maxdistance - (parseFloat(laststatus.machine.position.offset.y) + parseFloat(laststatus.machine.position.work.y))) - 5
} }
} }
var feed = $('#jograte').val(); var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true; continuousJogRunning = true;
waitingForStatus = true;
$('#yP').click(); $('#yP').click();
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
@ -555,7 +500,7 @@ $(document).ready(function() {
$('.zM').on('touchstart mousedown', function(ev) { $('.zM').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog) { // startJog(); if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog();
var direction = "Z-"; var direction = "Z-";
var distance = 1000; var distance = 1000;
@ -565,13 +510,14 @@ $(document).ready(function() {
var mindistance = parseInt(grblParams.$132) var mindistance = parseInt(grblParams.$132)
var maxdistance = 0; // Grbl all negative coordinates var maxdistance = 0; // Grbl all negative coordinates
// Negative move: // Negative move:
distance = (mindistance + (parseInt(laststatus.machine.position.offset.z) + parseInt(laststatus.machine.position.work.z))) - 1 distance = (mindistance + (parseFloat(laststatus.machine.position.offset.z) + parseFloat(laststatus.machine.position.work.z))) - 5
} }
} }
var feed = $('#jograte').val(); var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true; continuousJogRunning = true;
waitingForStatus = true;
$('.zM').click(); $('.zM').click();
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
@ -589,7 +535,7 @@ $(document).ready(function() {
$('.zP').on('touchstart mousedown', function(ev) { $('.zP').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog) { // startJog(); if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog();
var direction = "Z"; var direction = "Z";
var distance = 1000; var distance = 1000;
@ -599,13 +545,14 @@ $(document).ready(function() {
var mindistance = parseInt(grblParams.$132) var mindistance = parseInt(grblParams.$132)
var maxdistance = 0; // Grbl all negative coordinates var maxdistance = 0; // Grbl all negative coordinates
// Positive move: // Positive move:
distance = (maxdistance - (parseInt(laststatus.machine.position.offset.z) + parseInt(laststatus.machine.position.work.z))) - 1 distance = (maxdistance - (parseFloat(laststatus.machine.position.offset.z) + parseFloat(laststatus.machine.position.work.z))) - 5
} }
} }
var feed = $('#jograte').val(); var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true; continuousJogRunning = true;
waitingForStatus = true;
$('.zP').click(); $('.zP').click();
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();

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

@ -10,6 +10,7 @@ var simstopped = false;
var bellstate = false; var bellstate = false;
var toast = Metro.toast.create; var toast = Metro.toast.create;
var unit = "mm" var unit = "mm"
var waitingForStatus = false;
$(document).ready(function() { $(document).ready(function() {
initSocket(); initSocket();
@ -493,6 +494,7 @@ function initSocket() {
} }
laststatus = status; laststatus = status;
waitingForStatus = false;
}); });
socket.on('features', function(data) { socket.on('features', function(data) {

4
index.js
Wyświetl plik

@ -578,7 +578,7 @@ io.on("connection", function(socket) {
// jogWindow.setOverlayIcon(nativeImage.createFromPath(iconAlarm), 'Alarm'); // jogWindow.setOverlayIcon(nativeImage.createFromPath(iconAlarm), 'Alarm');
// } // }
// } // }
}, 400); }, 100);
@ -979,7 +979,7 @@ io.on("connection", function(socket) {
if (status.comms.connectionStatus > 0) { if (status.comms.connectionStatus > 0) {
addQRealtime("?"); addQRealtime("?");
} }
}, 250); }, 100);
} else if (data.indexOf("LPC176") >= 0) { // LPC1768 or LPC1769 should be Smoothieware } else if (data.indexOf("LPC176") >= 0) { // LPC1768 or LPC1769 should be Smoothieware
status.comms.blocked = false; status.comms.blocked = false;
debug_log("Smoothieware detected"); debug_log("Smoothieware detected");

2
package.json
Wyświetl plik

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