From bccf2b5d9ff93bbbb3699bc768ffa257999b2563 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 1 Apr 2015 15:56:02 -0400
Subject: [PATCH] demo prep
---
data/demos/oneBitBot.json | 2 +-
data/users/ben.user | 2 +-
data/users/matt.user | 2 +-
js/cam/MachineOneBit.js | 6 +++---
js/fea/DmaCellOcta.js | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/data/demos/oneBitBot.json b/data/demos/oneBitBot.json
index d7d072d6..0c3a3469 100644
--- a/data/demos/oneBitBot.json
+++ b/data/demos/oneBitBot.json
@@ -1 +1 @@
-{"lattice":{"units":"inches","cells":[[[{"indices":{"x":-2,"y":-2,"z":-1}},null],[{"indices":{"x":-2,"y":-1,"z":-1}},null],[{"indices":{"x":-2,"y":0,"z":-1}},null]],[[{"indices":{"x":-1,"y":-2,"z":-1}},null],[{"indices":{"x":-1,"y":-1,"z":-1}},{"indices":{"x":-1,"y":-1,"z":0}}],[{"indices":{"x":-1,"y":0,"z":-1}},{"indices":{"x":-1,"y":0,"z":0}}]],[[{"indices":{"x":0,"y":-2,"z":-1}},null],[{"indices":{"x":0,"y":-1,"z":-1}},{"indices":{"x":0,"y":-1,"z":0}}],[{"indices":{"x":0,"y":0,"z":-1}},{"indices":{"x":0,"y":0,"z":0}}]]],"cellsMin":{"x":-2,"y":-2,"z":-1},"cellsMax":{"x":0,"y":0,"z":0},"numCells":13,"scale":2.78388,"cellSeparation":{"xy":0,"z":0},"cellType":"octa","connectionType":"edgeRot","partType":"vox"},"assembler":{"camStrategy":"raster","placementOrder":"XYZ","camProcess":"gcode","machineName":"oneBitBot","dataOut":"","needsPostProcessing":false,"editsMadeToProgram":false,"rapidHeight":5.56776,"rapidHeightRelative":true,"safeHeight":0.5,"originPosition":{"x":1.3919,"y":1.3919,"z":0},"stockPosition":{"x":6.4029,"y":1.3919,"z":3.0623},"stockPositionRelative":true,"stockFixed":true,"multipleStockPositions":false,"stockArraySize":{"x":4,"y":4},"stockSeparation":2.78388,"rapidSpeeds":{"xy":3,"z":2},"feedRate":{"xy":0.1,"z":0.1}}}
\ No newline at end of file
+{"lattice":{"units":"inches","cells":[[[{"indices":{"x":-2,"y":-2,"z":-1}},null],[{"indices":{"x":-2,"y":-1,"z":-1}},null],[{"indices":{"x":-2,"y":0,"z":-1}},null]],[[{"indices":{"x":-1,"y":-2,"z":-1}},null],[{"indices":{"x":-1,"y":-1,"z":-1}},{"indices":{"x":-1,"y":-1,"z":0}}],[{"indices":{"x":-1,"y":0,"z":-1}},{"indices":{"x":-1,"y":0,"z":0}}]],[[{"indices":{"x":0,"y":-2,"z":-1}},null],[{"indices":{"x":0,"y":-1,"z":-1}},{"indices":{"x":0,"y":-1,"z":0}}],[{"indices":{"x":0,"y":0,"z":-1}},{"indices":{"x":0,"y":0,"z":0}}]]],"cellsMin":{"x":-2,"y":-2,"z":-1},"cellsMax":{"x":0,"y":0,"z":0},"numCells":13,"scale":2.78388,"cellSeparation":{"xy":0,"z":0},"cellType":"octa","connectionType":"edgeRot","partType":"vox"},"assembler":{"camStrategy":"raster","placementOrder":"XYZ","camProcess":"gcode","machineName":"oneBitBot","dataOut":"","needsPostProcessing":false,"editsMadeToProgram":false,"rapidHeight":5.56776,"rapidHeightRelative":true,"safeHeight":0.5,"originPosition":{"x":1.3919,"y":1.3919,"z":0},"stockPosition":{"x":4.482,"y":0,"z":3.1736},"stockPositionRelative":true,"stockFixed":true,"multipleStockPositions":false,"stockArraySize":{"x":4,"y":4},"stockSeparation":2.78388,"rapidSpeeds":{"xy":3,"z":2},"feedRate":{"xy":0.1,"z":0.1}}}
\ No newline at end of file
diff --git a/data/users/ben.user b/data/users/ben.user
index 29955ed7..90910f1a 100644
--- a/data/users/ben.user
+++ b/data/users/ben.user
@@ -1 +1 @@
-{"lattice":{"units":"inches","scale":2.78388,"cellSeparation":{"xy":0,"z":0},"cellType":"octa","connectionType":"edgeRot"},"assembler":{"camStrategy":"raster","placementOrder":"-X-YZ","camProcess":"shopbot","machineName":"shopbot","rapidHeight":6.9,"safeHeight":0.5,"rapidSpeeds":{"xy":6,"z":4},"feedRate":{"xy":0.1,"z":0.1}}}
\ No newline at end of file
+{"lattice":{"units":"inches","scale":2.78388,"cellSeparation":{"xy":0,"z":0},"cellType":"octa","connectionType":"edgeRot", "partType":"vox"},"assembler":{"camStrategy":"raster","placementOrder":"-X-YZ","camProcess":"shopbot","machineName":"shopbot","rapidHeight":6.9,"safeHeight":0.5,"rapidSpeeds":{"xy":6,"z":4},"feedRate":{"xy":0.1,"z":0.1}}}
\ No newline at end of file
diff --git a/data/users/matt.user b/data/users/matt.user
index 28431292..0fe6b20d 100644
--- a/data/users/matt.user
+++ b/data/users/matt.user
@@ -1 +1 @@
-{"lattice":{"units":"inches","scale":2.78388,"cellSeparation":{"xy":0,"z":0},"cellType":"octa","connectionType":"edgeRot"},"assembler":{"camStrategy":"raster","placementOrder":"XYZ","camProcess":"gcode","machineName":"oneBitBot","rapidHeight":4.5,"rapidHeightRelative":true,"safeHeight":0.5,"stockPositionRelative":true,"multipleStockPositions":false,"stockSeparation":2.78388,"rapidSpeeds":{"xy":6,"z":4},"feedRate":{"xy":0.1,"z":0.1},"simSpeed":"10","simStockNum":0,"stockHeight":0, "stockFixed":true}}
\ No newline at end of file
+{"lattice":{"units":"inches","scale":2.78388,"cellSeparation":{"xy":0,"z":0},"cellType":"octa","connectionType":"edgeRot","partType":"vox"},"assembler":{"camStrategy":"raster","placementOrder":"XYZ","camProcess":"gcode","machineName":"oneBitBot","rapidHeight":4.5,"rapidHeightRelative":true,"safeHeight":0.5,"stockPositionRelative":true,"multipleStockPositions":false,"stockSeparation":2.78388,"rapidSpeeds":{"xy":6,"z":4},"feedRate":{"xy":0.1,"z":0.1},"simSpeed":"10","simStockNum":0,"stockHeight":0, "stockFixed":true}}
\ No newline at end of file
diff --git a/js/cam/MachineOneBit.js b/js/cam/MachineOneBit.js
index 4ca9fc7d..ac364428 100644
--- a/js/cam/MachineOneBit.js
+++ b/js/cam/MachineOneBit.js
@@ -52,15 +52,15 @@ OneBitBot.prototype._buildMeshes = function(callback){
meshPrep(geometryScale(geometry), "basePlate");
});
loader.load("assets/stls/oneBitBot/endEffector.stl", function(geometry){
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(140,150,-135.37));
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(142,142,-125));
meshPrep(geometryScale(geometry), "zAxis");
});
loader.load("assets/stls/oneBitBot/endEffectorPlate.stl", function(geometry){
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(140,150,-0));
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(142,142,-0));
meshPrep(geometryScale(geometry), "zDrive");
});
loader.load("assets/stls/oneBitBot/xAxis.stl", function(geometry){
- geometry.applyMatrix(new THREE.Matrix4().makeTranslation(140,0,-0));
+ geometry.applyMatrix(new THREE.Matrix4().makeTranslation(142,0,-0));
meshPrep(geometryScale(geometry), "xAxis");
});
loader.load("assets/stls/oneBitBot/backYAxis.stl", function(geometry){
diff --git a/js/fea/DmaCellOcta.js b/js/fea/DmaCellOcta.js
index a0a1afc1..8bbea381 100644
--- a/js/fea/DmaCellOcta.js
+++ b/js/fea/DmaCellOcta.js
@@ -166,7 +166,7 @@ DMARotatedEdgeCell.prototype.changePartType = function(type){
} else if (type == "voxLowPoly"){
newParts.push(new DMAEdgeVoxPartLowPoly(0, this));
} else {
- console.warn("part type not recognized");
+ console.warn("part type " + type + " not recognized");
return;
}
if (!this.parts) return newParts;
--
GitLab