From b1e59c3e26798fee4f0884cb0a30c4d166947912 Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Fri, 27 Mar 2015 03:04:39 -0400 Subject: [PATCH] god gcode edits --- js/cam/Machine.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/cam/Machine.js b/js/cam/Machine.js index b7ff2440..1a6a9034 100644 --- a/js/cam/Machine.js +++ b/js/cam/Machine.js @@ -317,11 +317,12 @@ God.prototype._moveAxis = function(startingPos, target, axis, speed, callback){ God.prototype._postPickUpStock = function(exporter, stockPosition, rapidHeight, wcs, safeHeight){ var data = ""; + data += exporter.rapidZ(stockPosition.z-wcs.z+safeHeight); data += exporter.moveZ(stockPosition.z-wcs.z); return data; }; -God.prototype._postReleaseStock = function(cellPosicell, exporter, rapidHeight, wcs, safeHeight){ +God.prototype._postReleaseStock = function(cellPosition, cell, exporter, rapidHeight, wcs, safeHeight){ var data = ""; var cellPosition = cell.getPosition(); data += exporter.rapidXY(cellPosition.x-wcs.x, cellPosition.y-wcs.y); -- GitLab