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.227 test

pull/153/head
openbuilds-engineer 2020-04-16 15:32:26 +02:00
rodzic 0a7c78c3d7
commit fc224ddc32
4 zmienionych plików z 118 dodań i 80 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.227: Fix behavior of Jog Buttons on TouchScreens
v1.0.224-226 Minor Bugfixes, Updated Mobile Jog v1.0.224-226 Minor Bugfixes, Updated Mobile Jog
v1.0.223: Added keyboard shortcuts to Macros, updated look of buttons to include showing keyboard assignment v1.0.223: Added keyboard shortcuts to Macros, updated look of buttons to include showing keyboard assignment
v1.0.222: Added Keyboard shortcuts for GotoZero, and switching between Incremental/Continuous jogging v1.0.222: Added Keyboard shortcuts for GotoZero, and switching between Incremental/Continuous jogging

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

@ -3,6 +3,7 @@ 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 = "";
@ -303,65 +304,65 @@ $(document).ready(function() {
sendGcode('G0 Z0'); sendGcode('G0 Z0');
}); });
$('.xM').on('click', function(ev) { // $('.xM').on('click', function(ev) {
if (!allowContinuousJog) { // if (!allowContinuousJog) {
var dir = 'X-'; // var dir = 'X-';
var feedrate = $('#jograte').val(); // var feedrate = $('#jograte').val();
jog('X', '-' + jogdist, feedrate); // jog('X', '-' + jogdist, feedrate);
} // }
$('#runNewProbeBtn').addClass("disabled") // $('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled") // $('#confirmNewProbeBtn').removeClass("disabled")
}) // })
//
$('.xP').on('click', function(ev) { // $('.xP').on('click', function(ev) {
if (!allowContinuousJog) { // if (!allowContinuousJog) {
var dir = 'X-'; // var dir = 'X-';
var feedrate = $('#jograte').val(); // var feedrate = $('#jograte').val();
jog('X', jogdist, feedrate); // jog('X', jogdist, feedrate);
} // }
$('#runNewProbeBtn').addClass("disabled") // $('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled") // $('#confirmNewProbeBtn').removeClass("disabled")
}) // })
//
$('.yM').on('click', function(ev) { // $('.yM').on('click', function(ev) {
if (!allowContinuousJog) { // if (!allowContinuousJog) {
var dir = 'X-'; // var dir = 'X-';
var feedrate = $('#jograte').val(); // var feedrate = $('#jograte').val();
jog('Y', '-' + jogdist, feedrate); // jog('Y', '-' + jogdist, feedrate);
} // }
$('#runNewProbeBtn').addClass("disabled") // $('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled") // $('#confirmNewProbeBtn').removeClass("disabled")
}) // })
//
$('.yP').on('click', function(ev) { // $('.yP').on('click', function(ev) {
if (!allowContinuousJog) { // if (!allowContinuousJog) {
var dir = 'X-'; // var dir = 'X-';
var feedrate = $('#jograte').val(); // var feedrate = $('#jograte').val();
jog('Y', jogdist, feedrate); // jog('Y', jogdist, feedrate);
} // }
$('#runNewProbeBtn').addClass("disabled") // $('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled") // $('#confirmNewProbeBtn').removeClass("disabled")
}) // })
//
$('.zM').on('click', function(ev) { // $('.zM').on('click', function(ev) {
if (!allowContinuousJog) { // if (!allowContinuousJog) {
var dir = 'X-'; // var dir = 'X-';
var feedrate = $('#jograte').val(); // var feedrate = $('#jograte').val();
jog('Z', '-' + jogdist, feedrate); // jog('Z', '-' + jogdist, feedrate);
} // }
$('#runNewProbeBtn').addClass("disabled") // $('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled") // $('#confirmNewProbeBtn').removeClass("disabled")
}) // })
//
$('.zP').on('click', function(ev) { // $('.zP').on('click', function(ev) {
if (!allowContinuousJog) { // if (!allowContinuousJog) {
var dir = 'X-'; // var dir = 'X-';
var feedrate = $('#jograte').val(); // var feedrate = $('#jograte').val();
jog('Z', jogdist, feedrate); // jog('Z', jogdist, feedrate);
} // }
$('#runNewProbeBtn').addClass("disabled") // $('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled") // $('#confirmNewProbeBtn').removeClass("disabled")
}) // })
$('.xM').on('touchstart mousedown', function(ev) { $('.xM').on('touchstart mousedown', function(ev) {
ev.preventDefault(); ev.preventDefault();
@ -382,7 +383,13 @@ $(document).ready(function() {
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;
$('.xM').click(); $('.xM').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('X', '-' + jogdist, feedrate);
} }
$('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled")
}); });
$('.xM').on('touchend mouseup', function(ev) { $('.xM').on('touchend mouseup', function(ev) {
ev.preventDefault(); ev.preventDefault();
@ -409,7 +416,13 @@ $(document).ready(function() {
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;
$('.xP').click(); $('.xP').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('X', jogdist, feedrate);
} }
$('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled")
}); });
$('.xP').on('touchend mouseup', function(ev) { $('.xP').on('touchend mouseup', function(ev) {
ev.preventDefault(); ev.preventDefault();
@ -438,7 +451,13 @@ $(document).ready(function() {
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;
$('.yM').click(); $('.yM').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('Y', '-' + jogdist, feedrate);
} }
$('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled")
}); });
$('.yM').on('touchend mouseup', function(ev) { $('.yM').on('touchend mouseup', function(ev) {
ev.preventDefault(); ev.preventDefault();
@ -467,7 +486,13 @@ $(document).ready(function() {
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;
$('#yP').click(); $('#yP').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('Y', jogdist, feedrate);
} }
$('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled")
}); });
$('.yP').on('touchend mouseup', function(ev) { $('.yP').on('touchend mouseup', function(ev) {
ev.preventDefault(); ev.preventDefault();
@ -496,7 +521,13 @@ $(document).ready(function() {
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;
$('.zM').click(); $('.zM').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('Z', '-' + jogdist, feedrate);
} }
$('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled")
}); });
$('.zM').on('touchend mouseup', function(ev) { $('.zM').on('touchend mouseup', function(ev) {
ev.preventDefault(); ev.preventDefault();
@ -525,7 +556,13 @@ $(document).ready(function() {
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;
$('.zP').click(); $('.zP').click();
} else {
var dir = 'X-';
var feedrate = $('#jograte').val();
jog('Z', jogdist, feedrate);
} }
$('#runNewProbeBtn').addClass("disabled")
$('#confirmNewProbeBtn').removeClass("disabled")
}); });
$('.zP').on('touchend mouseup', function(ev) { $('.zP').on('touchend mouseup', function(ev) {
ev.preventDefault(); ev.preventDefault();

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

@ -157,10 +157,10 @@ function initSocket() {
socket.on("jobComplete", function(data) { socket.on("jobComplete", function(data) {
console.log("jobComplete", data) // console.log("jobComplete", data)
if (data.completed) { if (data.completed) {
console.log("Job Complete", data) // console.log("Job Complete", data)
} }
if (data.jobCompletedMsg && data.jobCompletedMsg.length > 0) { if (data.jobCompletedMsg && data.jobCompletedMsg.length > 0) {
$("#completeMsgDiv").html(data.jobCompletedMsg); $("#completeMsgDiv").html(data.jobCompletedMsg);
@ -210,7 +210,7 @@ function initSocket() {
seconds = "0" + seconds; seconds = "0" + seconds;
} }
var formattedTime = hours + ':' + minutes + ':' + seconds; var formattedTime = hours + ':' + minutes + ':' + seconds;
console.log('Remaining time: ', formattedTime) // console.log('Remaining time: ', formattedTime)
// output formattedTime to UI here // output formattedTime to UI here
$('#timeRemaining').html(" / " + formattedTime); $('#timeRemaining').html(" / " + formattedTime);
} }
@ -477,73 +477,73 @@ function initSocket() {
}); });
socket.on('features', function(data) { socket.on('features', function(data) {
console.log('FEATURES', data) // console.log('FEATURES', data)
for (i = 0; i < data.length; i++) { for (i = 0; i < data.length; i++) {
switch (data[i]) { switch (data[i]) {
case 'Q': case 'Q':
console.log('SPINDLE_IS_SERVO Enabled') // console.log('SPINDLE_IS_SERVO Enabled')
$('#enServo').removeClass('alert').addClass('success').html('ON') $('#enServo').removeClass('alert').addClass('success').html('ON')
$(".servo-active").show() $(".servo-active").show()
break; break;
case 'V': // Variable spindle enabled case 'V': // Variable spindle enabled
console.log('Variable spindle enabled') // console.log('Variable spindle enabled')
$('#enVariableSpindle').removeClass('alert').addClass('success').html('ON') $('#enVariableSpindle').removeClass('alert').addClass('success').html('ON')
break; break;
case 'N': // Line numbers enabled case 'N': // Line numbers enabled
console.log('Line numbers enabled') // console.log('Line numbers enabled')
$('#enLineNumbers').removeClass('alert').addClass('success').html('ON') $('#enLineNumbers').removeClass('alert').addClass('success').html('ON')
break; break;
case 'M': // Mist coolant enabled case 'M': // Mist coolant enabled
console.log('Mist coolant enabled') // console.log('Mist coolant enabled')
$('#menuMisting').show(); $('#menuMisting').show();
$('#enMisting').removeClass('alert').addClass('success').html('ON') $('#enMisting').removeClass('alert').addClass('success').html('ON')
break; break;
case 'C': // CoreXY enabled case 'C': // CoreXY enabled
console.log('CoreXY enabled') // console.log('CoreXY enabled')
$('#enCoreXY').removeClass('alert').addClass('success').html('ON') $('#enCoreXY').removeClass('alert').addClass('success').html('ON')
break; break;
case 'P': // Parking motion enabled case 'P': // Parking motion enabled
console.log('Parking motion enabled') // console.log('Parking motion enabled')
$('#enParking').removeClass('alert').addClass('success').html('ON') $('#enParking').removeClass('alert').addClass('success').html('ON')
break; break;
case 'Z': // Homing force origin enabled case 'Z': // Homing force origin enabled
console.log('Homing force origin enabled') // console.log('Homing force origin enabled')
$('#enHomingOrigin').removeClass('alert').addClass('success').html('ON') $('#enHomingOrigin').removeClass('alert').addClass('success').html('ON')
break; break;
case 'H': // Homing single axis enabled case 'H': // Homing single axis enabled
console.log('Homing single axis enabled') // console.log('Homing single axis enabled')
$('#enSingleAxisHome').removeClass('alert').addClass('success').html('ON') $('#enSingleAxisHome').removeClass('alert').addClass('success').html('ON')
break; break;
case 'T': // Two limit switches on axis enabled case 'T': // Two limit switches on axis enabled
console.log('Two limit switches on axis enabled') // console.log('Two limit switches on axis enabled')
$('#enTwoLimits').removeClass('alert').addClass('success').html('ON') $('#enTwoLimits').removeClass('alert').addClass('success').html('ON')
break; break;
case 'A': // Allow feed rate overrides in probe cycles case 'A': // Allow feed rate overrides in probe cycles
console.log('Allow feed rate overrides in probe cycles') // console.log('Allow feed rate overrides in probe cycles')
$('#enFeedOVProbe').removeClass('alert').addClass('success').html('ON') $('#enFeedOVProbe').removeClass('alert').addClass('success').html('ON')
break; break;
case '$': // Restore EEPROM $ settings disabled case '$': // Restore EEPROM $ settings disabled
console.log('Restore EEPROM $ settings disabled') // console.log('Restore EEPROM $ settings disabled')
$('#enEepromSettingsDisable').removeClass('alert').addClass('success').html('ON') $('#enEepromSettingsDisable').removeClass('alert').addClass('success').html('ON')
break; break;
case '#': // Restore EEPROM parameter data disabled case '#': // Restore EEPROM parameter data disabled
console.log('Restore EEPROM parameter data disabled') // console.log('Restore EEPROM parameter data disabled')
$('#enEepromParamsDisable').removeClass('alert').addClass('success').html('ON') $('#enEepromParamsDisable').removeClass('alert').addClass('success').html('ON')
break; break;
case 'I': // Build info write user string disabled case 'I': // Build info write user string disabled
console.log('Build info write user string disabled') // console.log('Build info write user string disabled')
$('#enBuildInfoDisabled').removeClass('alert').addClass('success').html('ON') $('#enBuildInfoDisabled').removeClass('alert').addClass('success').html('ON')
break; break;
case 'E': // Force sync upon EEPROM write disabled case 'E': // Force sync upon EEPROM write disabled
console.log('Force sync upon EEPROM write disabled') // console.log('Force sync upon EEPROM write disabled')
$('#enForceSyncEeprom').removeClass('alert').addClass('success').html('ON') $('#enForceSyncEeprom').removeClass('alert').addClass('success').html('ON')
break; break;
case 'W': // Force sync upon work coordinate offset change disabled case 'W': // Force sync upon work coordinate offset change disabled
console.log('Force sync upon work coordinate offset change disabled') // console.log('Force sync upon work coordinate offset change disabled')
$('#enForceSyncWco').removeClass('alert').addClass('success').html('ON') $('#enForceSyncWco').removeClass('alert').addClass('success').html('ON')
break; break;
case 'L': // Homing init lock sets Grbl into an alarm state upon power up case 'L': // Homing init lock sets Grbl into an alarm state upon power up
console.log('Homing init lock sets Grbl into an alarm state upon power up') // console.log('Homing init lock sets Grbl into an alarm state upon power up')
$('#enHomingInitLock').removeClass('alert').addClass('success').html('ON') $('#enHomingInitLock').removeClass('alert').addClass('success').html('ON')
break; break;
} }

2
package.json
Wyświetl plik

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