Skip to content

Commit

Permalink
minor
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Hechenberger committed Oct 21, 2013
1 parent ff35992 commit 6d65d59
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
4 changes: 2 additions & 2 deletions frontend/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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, '<br>'));
// $().uxmessage('notice', gcode.replace(/\n/g, '<br>'));
send_gcode(gcode, "Stopping ...", false);
var delayedresume = setTimeout(function() {
var gcode = '~\nG90\nM81\nG0X0Y0F'+app_settings.max_seek_speed+'\n' // ~ is resume char
Expand All @@ -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, '<br>'));
// $().uxmessage('notice', gcode.replace(/\n/g, '<br>'));
send_gcode(gcode, "Resetting ...", false);
var delayedresume = setTimeout(function() {
var gcode = '~\nG30\n' // ~ is resume char
Expand Down
25 changes: 22 additions & 3 deletions notes.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,17 +29,17 @@ 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


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


Expand Down

0 comments on commit 6d65d59

Please sign in to comment.