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.255

interface
openbuilds-engineer 2020-11-09 16:47:08 +02:00
rodzic c58169fc8a
commit cc19013943
4 zmienionych plików z 109 dodań i 98 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.255: Fixed an typo in Probe wizard
v1.0.254: Fixed Continous Jog calculation bug 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

2
app/index.html
Wyświetl plik

@ -1452,7 +1452,7 @@
<div id="xyzdatum" class="probe-tab-content"> <div id="xyzdatum" class="probe-tab-content">
<small>Where is the XY Zero Datum / Origin in your CAM setup, relevant to the front-left corner we are <small>Where is the XY Zero Datum / Origin in your CAM setup, relative to the front-left corner we are
probing? </small> probing? </small>
<br> <br>

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

@ -352,8 +352,6 @@ $(document).ready(function() {
sendGcode('G53 G0 Z0'); sendGcode('G53 G0 Z0');
sendGcode('G53 G0 X0 Y0'); sendGcode('G53 G0 X0 Y0');
} }
}); });
@ -361,24 +359,26 @@ $(document).ready(function() {
$('.xM').on('touchstart mousedown', function(ev) { $('.xM').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog(); if (allowContinuousJog) { // startJog();
var direction = "X-"; if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
var distance = 1000; var direction = "X-";
var distance = 1000;
if (Object.keys(grblParams).length > 0) { if (Object.keys(grblParams).length > 0) {
if (parseInt(grblParams.$20) == 1) { if (parseInt(grblParams.$20) == 1) {
// Soft Limits is enabled so lets calculate maximum move distance // Soft Limits is enabled so lets calculate maximum move distance
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 + (parseFloat(laststatus.machine.position.offset.x) + parseFloat(laststatus.machine.position.work.x))) - 5 distance = (mindistance + (parseFloat(laststatus.machine.position.offset.x) + parseFloat(laststatus.machine.position.work.x))) - 5
}
} }
var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true;
waitingForStatus = true;
$('.xM').click();
} }
var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true;
waitingForStatus = true;
$('.xM').click();
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
jog('X', '-' + jogdist, feedrate); jog('X', '-' + jogdist, feedrate);
@ -396,23 +396,25 @@ $(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 && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog(); if (allowContinuousJog) { // startJog();
var direction = "X"; if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
var distance = 1000; var direction = "X";
if (Object.keys(grblParams).length > 0) { var distance = 1000;
if (parseInt(grblParams.$20) == 1) { if (Object.keys(grblParams).length > 0) {
// Soft Limits is enabled so lets calculate maximum move distance if (parseInt(grblParams.$20) == 1) {
var mindistance = parseInt(grblParams.$130) // Soft Limits is enabled so lets calculate maximum move distance
var maxdistance = 0; // Grbl all negative coordinates var mindistance = parseInt(grblParams.$130)
// Positive move: var maxdistance = 0; // Grbl all negative coordinates
distance = (maxdistance - (parseFloat(laststatus.machine.position.offset.x) + parseFloat(laststatus.machine.position.work.x))) - 5 // Positive move:
distance = (maxdistance - (parseFloat(laststatus.machine.position.offset.x) + parseFloat(laststatus.machine.position.work.x))) - 5
}
} }
var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true;
waitingForStatus = true;
$('.xP').click();
} }
var feed = $('#jograte').val();
socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n");
continuousJogRunning = true;
waitingForStatus = true;
$('.xP').click();
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
jog('X', jogdist, feedrate); jog('X', jogdist, feedrate);
@ -430,25 +432,27 @@ $(document).ready(function() {
$('.yM').on('touchstart mousedown', function(ev) { $('.yM').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog(); if (allowContinuousJog) { // startJog();
var direction = "Y-"; if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
var distance = 1000; var direction = "Y-";
var distance = 1000;
if (Object.keys(grblParams).length > 0) { if (Object.keys(grblParams).length > 0) {
if (parseInt(grblParams.$20) == 1) { if (parseInt(grblParams.$20) == 1) {
// Soft Limits is enabled so lets calculate maximum move distance // Soft Limits is enabled so lets calculate maximum move distance
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 + (parseFloat(laststatus.machine.position.offset.y) + parseFloat(laststatus.machine.position.work.y))) - 5 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; waitingForStatus = true;
$('.yM').click(); $('.yM').click();
}
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
jog('Y', '-' + jogdist, feedrate); jog('Y', '-' + jogdist, feedrate);
@ -465,25 +469,27 @@ $(document).ready(function() {
$('.yP').on('touchstart mousedown', function(ev) { $('.yP').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog(); if (allowContinuousJog) { // startJog();
var direction = "Y"; if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
var distance = 1000; var direction = "Y";
var distance = 1000;
if (Object.keys(grblParams).length > 0) { if (Object.keys(grblParams).length > 0) {
if (parseInt(grblParams.$20) == 1) { if (parseInt(grblParams.$20) == 1) {
// Soft Limits is enabled so lets calculate maximum move distance // Soft Limits is enabled so lets calculate maximum move distance
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 - (parseFloat(laststatus.machine.position.offset.y) + parseFloat(laststatus.machine.position.work.y))) - 5 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; waitingForStatus = true;
$('#yP').click(); $('#yP').click();
}
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
jog('Y', jogdist, feedrate); jog('Y', jogdist, feedrate);
@ -500,25 +506,27 @@ $(document).ready(function() {
$('.zM').on('touchstart mousedown', function(ev) { $('.zM').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog(); if (allowContinuousJog) { // startJog();
var direction = "Z-"; if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
var distance = 1000; var direction = "Z-";
var distance = 1000;
if (Object.keys(grblParams).length > 0) { if (Object.keys(grblParams).length > 0) {
if (parseInt(grblParams.$20) == 1) { if (parseInt(grblParams.$20) == 1) {
// Soft Limits is enabled so lets calculate maximum move distance // Soft Limits is enabled so lets calculate maximum move distance
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 + (parseFloat(laststatus.machine.position.offset.z) + parseFloat(laststatus.machine.position.work.z))) - 5 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; waitingForStatus = true;
$('.zM').click(); $('.zM').click();
}
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
jog('Z', '-' + jogdist, feedrate); jog('Z', '-' + jogdist, feedrate);
@ -535,25 +543,27 @@ $(document).ready(function() {
$('.zP').on('touchstart mousedown', function(ev) { $('.zP').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
if (allowContinuousJog && !waitingForStatus && laststatus.comms.runStatus == "Idle") { // startJog(); if (allowContinuousJog) { // startJog();
var direction = "Z"; if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
var distance = 1000; var direction = "Z";
var distance = 1000;
if (Object.keys(grblParams).length > 0) { if (Object.keys(grblParams).length > 0) {
if (parseInt(grblParams.$20) == 1) { if (parseInt(grblParams.$20) == 1) {
// Soft Limits is enabled so lets calculate maximum move distance // Soft Limits is enabled so lets calculate maximum move distance
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 - (parseFloat(laststatus.machine.position.offset.z) + parseFloat(laststatus.machine.position.work.z))) - 5 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; waitingForStatus = true;
$('.zP').click(); $('.zP').click();
}
} else { } else {
var feedrate = $('#jograte').val(); var feedrate = $('#jograte').val();
jog('Z', jogdist, feedrate); jog('Z', jogdist, feedrate);

2
package.json
Wyświetl plik

@ -1,6 +1,6 @@
{ {
"name": "OpenBuildsCONTROL", "name": "OpenBuildsCONTROL",
"version": "1.0.254", "version": "1.0.255",
"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>",