Some adjustments to the new files

openscad · Jul 26, 2010 · cc49f67 · cc49f67
1 parent 8bb788d
commit cc49f67
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 30 deletions.
diff --git a/materials.scad b/materials.scad
@@ -2,7 +2,7 @@
  * Material colors.
  * 
  * Originally by Hans Häggström, 2010.
- * Licenced under Creative Commons Attribution-Share Alike 3.0.
+ * Dual licenced under Creative Commons Attribution-Share Alike 3.0 and LGPL2 or later
  */
 
 // Material colors
@@ -18,25 +18,26 @@ Aluminum = [0.77, 0.77, 0.8];
 Brass = [0.88, 0.78, 0.5];
 
 // Example, uncomment to view
-/*
-// Wood
-colorTest(Oak, 0, 0);
-colorTest(Pine, 1, 0);
-colorTest(Birch, 2, 0);
+//demo();
 
-// Metals
-colorTest(Iron, 0, 1);
-colorTest(Steel, 1, 1);
-colorTest(Stainless, 2, 1);
-colorTest(Aluminum, 3, 1);
+module nema_demo(){
+    // Wood
+    colorTest(Oak, 0, 0);
+    colorTest(Pine, 1, 0);
+    colorTest(Birch, 2, 0);
 
-// Mixboards
-colorTest(FiberBoard, 0, 2);
+    // Metals
+    colorTest(Iron, 0, 1);
+    colorTest(Steel, 1, 1);
+    colorTest(Stainless, 2, 1);
+    colorTest(Aluminum, 3, 1);
 
-// Paints
-colorTest(BlackPaint, 0, 3);
+    // Mixboards
+    colorTest(FiberBoard, 0, 2);
 
-*/
+    // Paints
+    colorTest(BlackPaint, 0, 3);
+}
 
 module colorTest(col, row=0, c=0) {
   color(col) translate([row * 30,c*30,0]) sphere(r=10);

diff --git a/stepper.scad b/stepper.scad
@@ -2,24 +2,26 @@
  * A nema standard stepper motor module.
  * 
  * Originally by Hans Häggström, 2010.
- * Licenced under Creative Commons Attribution-Share Alike 3.0.
+ * Dual licenced under Creative Commons Attribution-Share Alike 3.0 and LGPL2 or later
  */
 
-<units.scad>
-<materials.scad>
+include <units.scad>
+include <materials.scad>
 
 
 // Demo, uncomment to show:
-/*
-for (size = [NemaShort, NemaMedium, NemaLong]) {  
-  translate([-100,size*100,0]) motor(Nema34, size, dualAxis=true);
-  translate([0,size*100,0])    motor(Nema23, size, dualAxis=true);
-  translate([100,size*100,0])  motor(Nema17, size, dualAxis=true);
-  translate([200,size*100,0])  motor(Nema14, size, dualAxis=true);
-  translate([300,size*100,0])  motor(Nema11, size, dualAxis=true);
-  translate([400,size*100,0])  motor(Nema08, size, dualAxis=true);
+//nema_demo();
+
+module nema_demo(){
+    for (size = [NemaShort, NemaMedium, NemaLong]) {  
+      translate([-100,size*100,0]) motor(Nema34, size, dualAxis=true);
+      translate([0,size*100,0])    motor(Nema23, size, dualAxis=true);
+      translate([100,size*100,0])  motor(Nema17, size, dualAxis=true);
+      translate([200,size*100,0])  motor(Nema14, size, dualAxis=true);
+      translate([300,size*100,0])  motor(Nema11, size, dualAxis=true);
+      translate([400,size*100,0])  motor(Nema08, size, dualAxis=true);
+    }
 }
-*/
 
 
 // Parameters: 

diff --git a/units.scad b/units.scad
@@ -2,7 +2,7 @@
  * Basic units.
  * 
  * Originally by Hans Häggström, 2010.
- * Licenced under Creative Commons Attribution-Share Alike 3.0.
+ * Dual licenced under Creative Commons Attribution-Share Alike 3.0 and LGPL2 or later
  */
 
 
@@ -20,5 +20,5 @@ M8 = 8*mm;
 
 
 // When a small distance is needed to overlap shapes for boolean cutting, etc.
-epsilon = 1*mm;
+epsilon = 0.0001*mm;