diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 21240a2..77ce483 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -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.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 diff --git a/app/js/jog.js b/app/js/jog.js index 3c37faf..b81abc1 100644 --- a/app/js/jog.js +++ b/app/js/jog.js @@ -3,6 +3,7 @@ var continuousJogRunning = false; var jogdist = 10; var safeToUpdateSliders = true; + function mmtoinchrate() { var value = $('#jograte').val(); var convert = ""; @@ -303,65 +304,65 @@ $(document).ready(function() { sendGcode('G0 Z0'); }); - $('.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('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) { ev.preventDefault(); @@ -382,7 +383,13 @@ $(document).ready(function() { socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); continuousJogRunning = true; $('.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) { ev.preventDefault(); @@ -409,7 +416,13 @@ $(document).ready(function() { socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); continuousJogRunning = true; $('.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) { ev.preventDefault(); @@ -438,7 +451,13 @@ $(document).ready(function() { socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); continuousJogRunning = true; $('.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) { ev.preventDefault(); @@ -467,7 +486,13 @@ $(document).ready(function() { socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); continuousJogRunning = true; $('#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) { ev.preventDefault(); @@ -496,7 +521,13 @@ $(document).ready(function() { socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); continuousJogRunning = true; $('.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) { ev.preventDefault(); @@ -525,7 +556,13 @@ $(document).ready(function() { socket.emit('runCommand', "$J=G91 G21 " + direction + distance + " F" + feed + "\n"); continuousJogRunning = true; $('.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) { ev.preventDefault(); diff --git a/app/js/websocket.js b/app/js/websocket.js index a34edd0..5a7886e 100644 --- a/app/js/websocket.js +++ b/app/js/websocket.js @@ -157,10 +157,10 @@ function initSocket() { socket.on("jobComplete", function(data) { - console.log("jobComplete", data) + // console.log("jobComplete", data) if (data.completed) { - console.log("Job Complete", data) + // console.log("Job Complete", data) } if (data.jobCompletedMsg && data.jobCompletedMsg.length > 0) { $("#completeMsgDiv").html(data.jobCompletedMsg); @@ -210,7 +210,7 @@ function initSocket() { seconds = "0" + seconds; } var formattedTime = hours + ':' + minutes + ':' + seconds; - console.log('Remaining time: ', formattedTime) + // console.log('Remaining time: ', formattedTime) // output formattedTime to UI here $('#timeRemaining').html(" / " + formattedTime); } @@ -477,73 +477,73 @@ function initSocket() { }); socket.on('features', function(data) { - console.log('FEATURES', data) + // console.log('FEATURES', data) for (i = 0; i < data.length; i++) { switch (data[i]) { case 'Q': - console.log('SPINDLE_IS_SERVO Enabled') + // console.log('SPINDLE_IS_SERVO Enabled') $('#enServo').removeClass('alert').addClass('success').html('ON') $(".servo-active").show() break; case 'V': // Variable spindle enabled - console.log('Variable spindle enabled') + // console.log('Variable spindle enabled') $('#enVariableSpindle').removeClass('alert').addClass('success').html('ON') break; case 'N': // Line numbers enabled - console.log('Line numbers enabled') + // console.log('Line numbers enabled') $('#enLineNumbers').removeClass('alert').addClass('success').html('ON') break; case 'M': // Mist coolant enabled - console.log('Mist coolant enabled') + // console.log('Mist coolant enabled') $('#menuMisting').show(); $('#enMisting').removeClass('alert').addClass('success').html('ON') break; case 'C': // CoreXY enabled - console.log('CoreXY enabled') + // console.log('CoreXY enabled') $('#enCoreXY').removeClass('alert').addClass('success').html('ON') break; case 'P': // Parking motion enabled - console.log('Parking motion enabled') + // console.log('Parking motion enabled') $('#enParking').removeClass('alert').addClass('success').html('ON') break; 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') break; 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') break; 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') break; 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') break; case '$': // Restore EEPROM $ settings disabled - console.log('Restore EEPROM $ settings disabled') + // console.log('Restore EEPROM $ settings disabled') $('#enEepromSettingsDisable').removeClass('alert').addClass('success').html('ON') break; 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') break; 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') break; 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') break; 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') break; 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') break; } diff --git a/package.json b/package.json index dfc20c1..295c41a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsCONTROL", - "version": "1.0.226", + "version": "1.0.227", "license": "AGPL-3.0", "description": "OpenBuildsCONTROL CNC Machine Interface Software", "author": "github.com/openbuilds ",