From a293e65c26b3484227bd88670151f2e55d0100cc Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 12 Mar 2015 00:20:27 -0400
Subject: [PATCH] thousandth inch res
---
js/cam/Assembler.js | 3 ++-
js/cam/ShopbotExporter.js | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/js/cam/Assembler.js b/js/cam/Assembler.js
index 6c2bbfd0..cbe18822 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 60652cd7..47989ca7 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;
};
--
GitLab