diff --git a/frontend/js/app.js b/frontend/js/app.js index 81f66f25..72e35b60 100644 --- a/frontend/js/app.js +++ b/frontend/js/app.js @@ -416,7 +416,7 @@ $(document).ready(function(){ $("#cancel_btn").tooltip({placement:'bottom', delay: {show:500, hide:100}}); $("#cancel_btn").click(function(e){ var gcode = '!\n' // ! is enter stop state char - $().uxmessage('notice', gcode.replace(/\n/g, '
')); + // $().uxmessage('notice', gcode.replace(/\n/g, '
')); send_gcode(gcode, "Stopping ...", false); var delayedresume = setTimeout(function() { var gcode = '~\nG90\nM81\nG0X0Y0F'+app_settings.max_seek_speed+'\n' // ~ is resume char @@ -429,7 +429,7 @@ $(document).ready(function(){ $("#homing_cycle").tooltip({placement:'bottom', delay: {show:500, hide:100}}); $("#homing_cycle").click(function(e){ var gcode = '!\n' // ! is enter stop state char - $().uxmessage('notice', gcode.replace(/\n/g, '
')); + // $().uxmessage('notice', gcode.replace(/\n/g, '
')); send_gcode(gcode, "Resetting ...", false); var delayedresume = setTimeout(function() { var gcode = '~\nG30\n' // ~ is resume char diff --git a/notes.md b/notes.md index 2c9ca0d6..61f6355f 100644 --- a/notes.md +++ b/notes.md @@ -1,5 +1,24 @@ +CHANGE LOG +----------- +- confgurable work area (for modded lasersaurs) +- out of bounds checks before sending jobs +- visual feedback on color selection +- zoom preview added +- about modal reporting LasaurApp and firmware version +- shortcut keys for tabs, jogging, pause, stop, goToOrigin +- manual numerical entry widget for jogging and offsets +- new internal job data handling (json-based 'lsa' files) +- export for gcode and .lsa files +- passes configurable on stored jobs +- laser job tab optimized for more flexibility +- clear queue button added +- quick import button added +- long line segmentation for snappier pause + + + BBB --- - pin P8:46 connected to avr reset would prevent the BBB from booting @@ -10,8 +29,10 @@ BBB TODO (raster branch) --------------------- +- bbox send always sends global bbox +- status incorrect when lasersaur is switched off/disconnects - gcode import support, and lsa -- pause, not responsive +- z-axis ui buttons - importing progress bar @@ -19,8 +40,6 @@ TODO ----- - login/claim, single user restriction, keep login alive signal - dial in widget -- doc link to reveal library location so people can add more files -- open/save gcode files, show warning and link to supported features - shortcut keys, e.g 1,2,3 for tabs, arrors for direct control