kopia lustrzana https://github.com/OpenBuilds/OpenBuilds-CONTROL
v1.0.255
rodzic
c58169fc8a
commit
cc19013943
|
@ -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
|
||||||
|
|
|
@ -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>
|
||||||
|
|
||||||
|
|
|
@ -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,7 +359,8 @@ $(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();
|
||||||
|
if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
|
||||||
var direction = "X-";
|
var direction = "X-";
|
||||||
var distance = 1000;
|
var distance = 1000;
|
||||||
|
|
||||||
|
@ -379,6 +378,7 @@ $(document).ready(function() {
|
||||||
continuousJogRunning = true;
|
continuousJogRunning = true;
|
||||||
waitingForStatus = true;
|
waitingForStatus = true;
|
||||||
$('.xM').click();
|
$('.xM').click();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
var feedrate = $('#jograte').val();
|
var feedrate = $('#jograte').val();
|
||||||
jog('X', '-' + jogdist, feedrate);
|
jog('X', '-' + jogdist, feedrate);
|
||||||
|
@ -396,7 +396,8 @@ $(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();
|
||||||
|
if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
|
||||||
var direction = "X";
|
var direction = "X";
|
||||||
var distance = 1000;
|
var distance = 1000;
|
||||||
if (Object.keys(grblParams).length > 0) {
|
if (Object.keys(grblParams).length > 0) {
|
||||||
|
@ -413,6 +414,7 @@ $(document).ready(function() {
|
||||||
continuousJogRunning = true;
|
continuousJogRunning = true;
|
||||||
waitingForStatus = true;
|
waitingForStatus = true;
|
||||||
$('.xP').click();
|
$('.xP').click();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
var feedrate = $('#jograte').val();
|
var feedrate = $('#jograte').val();
|
||||||
jog('X', jogdist, feedrate);
|
jog('X', jogdist, feedrate);
|
||||||
|
@ -430,7 +432,8 @@ $(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();
|
||||||
|
if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
|
||||||
var direction = "Y-";
|
var direction = "Y-";
|
||||||
var distance = 1000;
|
var distance = 1000;
|
||||||
|
|
||||||
|
@ -449,6 +452,7 @@ $(document).ready(function() {
|
||||||
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,7 +469,8 @@ $(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();
|
||||||
|
if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
|
||||||
var direction = "Y";
|
var direction = "Y";
|
||||||
var distance = 1000;
|
var distance = 1000;
|
||||||
|
|
||||||
|
@ -484,6 +489,7 @@ $(document).ready(function() {
|
||||||
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,7 +506,8 @@ $(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();
|
||||||
|
if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
|
||||||
var direction = "Z-";
|
var direction = "Z-";
|
||||||
var distance = 1000;
|
var distance = 1000;
|
||||||
|
|
||||||
|
@ -519,6 +526,7 @@ $(document).ready(function() {
|
||||||
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,7 +543,8 @@ $(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();
|
||||||
|
if (!waitingForStatus && laststatus.comms.runStatus == "Idle") {
|
||||||
var direction = "Z";
|
var direction = "Z";
|
||||||
var distance = 1000;
|
var distance = 1000;
|
||||||
|
|
||||||
|
@ -554,6 +563,7 @@ $(document).ready(function() {
|
||||||
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);
|
||||||
|
|
|
@ -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>",
|
||||||
|
|
Ładowanie…
Reference in New Issue