diff options
| -rw-r--r-- | GCodes.ino | 22 | ||||
| -rw-r--r-- | SD-image/www/reprap.htm | 5 | ||||
| -rw-r--r-- | SD-image/www/reprap.htm~ | 5 |
3 files changed, 20 insertions, 12 deletions
@@ -255,22 +255,22 @@ boolean GCodes::DoHome() { // Treat more or less like any other move // Do one axis at a time, starting with X. - - if(!AllMovesAreFinishedAndMoveBufferIsLoaded()) - return false; - + if(homeX) { if(homeXQueued) { - if(!reprap.GetMove()->AllMovesAreFinished()) + if(!Pop()) return false; - reprap.GetMove()->ResumeMoving(); homeX = false; homeXQueued = false; return NoHome(); } else { + // Push() has the side effect of finishing all queued moves and loading moveBuffer correctly + + if(!Push()) + return false; moveBuffer[X_AXIS] = -2.0*platform->AxisLength(X_AXIS); moveBuffer[DRIVES] = platform->HomeFeedRate(X_AXIS)/60.0; homeXQueued = true; @@ -284,14 +284,15 @@ boolean GCodes::DoHome() { if(homeYQueued) { - if(!reprap.GetMove()->AllMovesAreFinished()) + if(!Pop()) return false; - reprap.GetMove()->ResumeMoving(); homeY = false; homeYQueued = false; return NoHome(); } else { + if(!Push()) + return false; moveBuffer[Y_AXIS] = -2.0*platform->AxisLength(Y_AXIS); moveBuffer[DRIVES] = platform->HomeFeedRate(Y_AXIS)/60.0; homeYQueued = true; @@ -305,14 +306,15 @@ boolean GCodes::DoHome() { if(homeZQueued) { - if(!reprap.GetMove()->AllMovesAreFinished()) + if(!Pop()) return false; - reprap.GetMove()->ResumeMoving(); homeZ = false; homeZQueued = false; return NoHome(); } else { + if(!Push()) + return false; moveBuffer[Z_AXIS] = -2.0*platform->AxisLength(Z_AXIS); moveBuffer[DRIVES] = platform->HomeFeedRate(Z_AXIS)/60.0; homeZQueued = true; diff --git a/SD-image/www/reprap.htm b/SD-image/www/reprap.htm index 964fa844..13008f49 100644 --- a/SD-image/www/reprap.htm +++ b/SD-image/www/reprap.htm @@ -296,7 +296,10 @@ function viewModel() self.sendJog = function(axis, d, data, event) { - $.get('/rr_gcode', {gcode: "G91\nG1 " + axis + d + "\nG90\nM83"}, self.dummy); + var feed = " F2000"; + if(axis == 'Z') + feed = " F200"; + $.get('/rr_gcode', {gcode: "M120\nG91\nG1 " + axis + d + feed + "\nM121"}, self.dummy); }; self.actionOnFile = function(file) diff --git a/SD-image/www/reprap.htm~ b/SD-image/www/reprap.htm~ index 964fa844..13008f49 100644 --- a/SD-image/www/reprap.htm~ +++ b/SD-image/www/reprap.htm~ @@ -296,7 +296,10 @@ function viewModel() self.sendJog = function(axis, d, data, event) { - $.get('/rr_gcode', {gcode: "G91\nG1 " + axis + d + "\nG90\nM83"}, self.dummy); + var feed = " F2000"; + if(axis == 'Z') + feed = " F200"; + $.get('/rr_gcode', {gcode: "M120\nG91\nG1 " + axis + d + feed + "\nM121"}, self.dummy); }; self.actionOnFile = function(file) |