diff --git a/js/cam/Assembler.js b/js/cam/Assembler.js index 6c2bbfd061d51639a243a0e97a6c2997d8027f4a..cbe188220935202f903ed73baf4d124d8aaf0ca1 100644 --- a/js/cam/Assembler.js +++ b/js/cam/Assembler.js @@ -65,6 +65,7 @@ Assembler = Backbone.Model.extend({ var rapidHeight = this.get("rapidHeight"); var stockHeight = this.get("stockHeight"); data += exporter.moveZ(rapidHeight); + data += "\n"; dmaGlobals.lattice.rasterCells("XYZ", function(cell, x, y, z){ if (!cell) return; @@ -73,7 +74,7 @@ Assembler = Backbone.Model.extend({ data += exporter.moveZ(rapidHeight); var cellPosition = cell.getPosition(); - data += exporter.rapidXY(cellPosition.x, cellPosition.y); + data += exporter.rapidXY(cellPosition.x.toFixed(3), cellPosition.y.toFixed(3)); data += exporter.moveZ(stockHeight); data += exporter.moveZ(rapidHeight); diff --git a/js/cam/ShopbotExporter.js b/js/cam/ShopbotExporter.js index 60652cd788d813ee0dbdc5a8d24c28c4eb893b97..47989ca79bb329b6564b986ba2fee396a0e4e1c7 100644 --- a/js/cam/ShopbotExporter.js +++ b/js/cam/ShopbotExporter.js @@ -58,8 +58,8 @@ ShopbotExporter.prototype.goHome = function(){ }; ShopbotExporter.prototype.makeFooter = function(){ - var data = ""; - data += this.goHome(); + var data = this.moveZ(dmaGlobals.assembler.get("rapidHeight")); + data += this.rapidXY(0,0); return data; };