Added rounded corners to some parts to make them easier to print.

Filled some gaps in the X ends to make them faster to print. D motor bracket lid now one piece again, as PCB now clears it. Calibration object now includes horizontal nut traps. Add c14n_stl.py to canonicalise the STL files. Corrected PLA sample diameter. Removed feed tube connector, works fine without it. Removed tube jig as not required in the kit. Manual updated with new part renders.
bjmckenz · Mar 24, 2013 · 9345a5b · 9345a5b
1 parent dddbaab
commit 9345a5b
Show file tree

Hide file tree

Showing 495 changed files with 3,272,218 additions and 3,208,248 deletions.
diff --git a/c14n_stl.py b/c14n_stl.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+#
+# OpenSCAD produces randomly ordered STL files so source control like GIT can't tell if they have changed or not.
+# This scrip orders each triangle to start with the lowest vertex first (comparing x, then y, then z)
+# It then sorts the triangles to start with the one with the lowest vertices first (comparing first vertex, second, then third)
+# This has no effect on the model but makes the STL consistent. I.e. it makes a canonical form.
+#
+import sys
+
+class Vertex:
+    def __init__(self, x, y, z):
+        self.x, self.y, self.z = x, y, z
+        self.key = (float(x), float(y), float(z))
+
+class Normal:
+    def __init__(self, dx, dy, dz):
+        self.dx, self.dy, self.dz = dx, dy, dz
+
+class Facet:
+    def __init__(self, normal, v1, v2, v3):
+        self.normal = normal
+        if v1.key < v2.key:
+            if v1.key < v3.key:
+                self.vertices = (v1, v2, v3)    #v1 is the smallest
+            else:
+                self.vertices = (v3, v1, v2)    #v3 is the smallest
+        else:
+            if v2.key < v3.key:
+                self.vertices = (v2, v3, v1)    #v2 is the smallest
+            else:
+                self.vertices = (v3, v1, v2)    #v3 is the smallest
+
+    def key(self):
+        return (self.vertices[0].x, self.vertices[0].y, self.vertices[0].z,
+                self.vertices[1].x, self.vertices[1].y, self.vertices[1].z,
+                self.vertices[2].x, self.vertices[2].y, self.vertices[2].z)
+
+class STL:
+    def __init__(self, fname):
+        self.facets = []
+
+        f = open(fname)
+        words = [s.strip() for s in f.read().split()]
+        f.close()
+
+        if words[0] == 'solid' and words[1] == 'OpenSCAD_Model':
+            i = 2
+            while words[i] == 'facet':
+                norm = Normal(words[i + 2],  words[i + 3],  words[i + 4])
+                v1   = Vertex(words[i + 8],  words[i + 9],  words[i + 10])
+                v2   = Vertex(words[i + 12], words[i + 13], words[i + 14])
+                v3   = Vertex(words[i + 16], words[i + 17], words[i + 18])
+                i += 21
+                self.facets.append(Facet(norm, v1, v2, v3))
+
+            self.facets.sort(key = Facet.key)
+        else:
+            print "Not an OpenSCAD ascii STL file"
+            sys.exit(1)
+
+    def write(self, fname):
+        f = open(fname,"wt")
+        print >> f,'solid OpenSCAD_Model'
+        for facet in self.facets:
+            print >> f, '  facet normal %s %s %s' % (facet.normal.dx, facet.normal.dy, facet.normal.dz)
+            print >> f, '    outer loop'
+            for vertex in facet.vertices:
+                print >> f, '      vertex %s %s %s' % (vertex.x, vertex.y, vertex.z)
+            print  >> f, '    endloop'
+            print  >> f, '  endfacet'
+        print >> f, 'endsolid OpenSCAD_Model'
+        f.close()
+
+def canonicalise(fname):
+    stl = STL(fname)
+    stl.write(fname)
+
+if __name__ == '__main__':
+    if len(sys.argv) == 2:
+        canonicalise(sys.argv[1])
+    else:
+        print "usage: c14n_stl file"
+        sys.exit(1)
diff --git a/dibond/bom/bom.txt b/dibond/bom/bom.txt
@@ -76,7 +76,7 @@ Vitamins:
   |  |  |  |  |  |  |  |  |  | 4|  |  |  |  |  |  |  |  |  |  |  |  4 Nyloc nut M8
   |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  |  2 Nitrile O-ring 2.5mm x 1.6mm
   |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Extruder connection PCB
-  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 PLA sample 0.3mm ~20m
+  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 PLA sample 3mm ~20m
   |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 Polypropylene strip 401mm x 18mm x 0.5mm
   |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 Polypropylene strip 457mm x 25mm x 0.5mm
   |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Polypropylene strip 271mm x 33mm x 0.5mm
@@ -136,7 +136,6 @@ Printed:
   |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 d_shell_lid.stl
   |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 dust_filter.stl
  1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 fan_guard.stl
-  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 feed_tube_connector.stl
   |  |  |  |  |10|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 10 fixing_block.stl
   | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 pcb_spacer.stl
   |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 ribbon_clamp_14_33.stl
@@ -149,7 +148,6 @@ Printed:
   |  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 spool_bracket_female.stl
   |  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 spool_bracket_male.stl
   |  |  |  |  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 tube_cap.stl
-  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 tube_jig.stl
   |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 wades_big_gear.stl
   |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 wades_block.stl
   |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 wades_gear_spacer.stl

diff --git a/dibond/bom/frame_assembly.txt b/dibond/bom/frame_assembly.txt
@@ -14,5 +14,4 @@ Printed:
   1 ribbon_clamp_20_44N.stl
   1 ribbon_clamp_26_44N.stl
   4 tube_cap.stl
-  1 tube_jig.stl
 
diff --git a/dibond/bom/spool_holder_assembly.txt b/dibond/bom/spool_holder_assembly.txt
@@ -6,15 +6,14 @@ Vitamins:
   1 Foam sponge 20mm x 20mm x 20mm
   2 Nyloc nut M4
   4 Nyloc nut M8
-  1 PLA sample 0.3mm ~20m
+  1 PLA sample 3mm ~20m
   1 PTFE tubing OD 4.6mm ID 3.84mm x 750mm
   2 Washer M4 x 9mm x 0.8mm
   8 Washer M8 x 17mm x 1.6mm
   4 Washer M8 x 30mm x 1.5mm
 
 Printed:
   1 dust_filter.stl
-  1 feed_tube_connector.stl
   2 spool_bracket_female.stl
   2 spool_bracket_male.stl
 
diff --git a/dibond/manual/Mendel90 Dibond.jpg b/dibond/manual/Mendel90 Dibond.jpg
diff --git a/dibond/manual/Mendel90_Dibond.odt b/dibond/manual/Mendel90_Dibond.odt
diff --git a/dibond/manual/Mendel90_Dibond.pdf b/dibond/manual/Mendel90_Dibond.pdf
diff --git a/dibond/manual/Repetier_Printer_Settings.jpg b/dibond/manual/Repetier_Printer_Settings.jpg
diff --git a/dibond/manual/Skeinforge_Multiply_Settings.jpg b/dibond/manual/Skeinforge_Multiply_Settings.jpg
diff --git a/dibond/manual/Slic3r_Printer_Settings.jpg b/dibond/manual/Slic3r_Printer_Settings.jpg
diff --git a/dibond/manual/extruder_assembled.png b/dibond/manual/extruder_assembled.png
diff --git a/dibond/manual/extruder_assembly.png b/dibond/manual/extruder_assembly.png
diff --git a/dibond/manual/extruder_hot_end_assembly.png b/dibond/manual/extruder_hot_end_assembly.png
diff --git a/dibond/manual/extruder_motor_assembled.png b/dibond/manual/extruder_motor_assembled.png
diff --git a/dibond/manual/extruder_motor_assembly.png b/dibond/manual/extruder_motor_assembly.png
diff --git a/dibond/manual/frame_assembly_front.png b/dibond/manual/frame_assembly_front.png
diff --git a/dibond/manual/front_page.png b/dibond/manual/front_page.png
diff --git a/dibond/manual/spool_holder_assembly.png b/dibond/manual/spool_holder_assembly.png
diff --git a/dibond/manual/x_axis_assembly.png b/dibond/manual/x_axis_assembly.png
diff --git a/dibond/manual/x_idler_assembly.png b/dibond/manual/x_idler_assembly.png
diff --git a/dibond/manual/x_motor_assembled.png b/dibond/manual/x_motor_assembled.png
diff --git a/dibond/manual/x_motor_assembly.png b/dibond/manual/x_motor_assembly.png
diff --git a/dibond/manual/y_axis_assembly.png b/dibond/manual/y_axis_assembly.png
diff --git a/dibond/manual/y_carriage_assembled.png b/dibond/manual/y_carriage_assembled.png
diff --git a/dibond/manual/y_carriage_assembly.png b/dibond/manual/y_carriage_assembly.png
diff --git a/dibond/manual/y_motor_assembled.png b/dibond/manual/y_motor_assembled.png
diff --git a/dibond/manual/y_motor_assembly.png b/dibond/manual/y_motor_assembly.png
diff --git a/dibond/manual/z_axis_assembly.png b/dibond/manual/z_axis_assembly.png
diff --git a/dibond/render/atx_long_bracket.png b/dibond/render/atx_long_bracket.png
diff --git a/dibond/render/atx_short_bracket.png b/dibond/render/atx_short_bracket.png
diff --git a/dibond/render/d_motor_bracket.png b/dibond/render/d_motor_bracket.png
diff --git a/dibond/render/d_motor_bracket_lid.png b/dibond/render/d_motor_bracket_lid.png
diff --git a/dibond/render/d_shell.png b/dibond/render/d_shell.png
diff --git a/dibond/render/d_shell_lid.png b/dibond/render/d_shell_lid.png
diff --git a/dibond/render/dust_filter.png b/dibond/render/dust_filter.png
diff --git a/dibond/render/fan_guard.png b/dibond/render/fan_guard.png
diff --git a/dibond/render/feed_tube_connector.png b/dibond/render/feed_tube_connector.png
diff --git a/dibond/render/fixing_block.png b/dibond/render/fixing_block.png
diff --git a/dibond/render/pcb_spacer.png b/dibond/render/pcb_spacer.png
diff --git a/dibond/render/printed/atx_brackets.png b/dibond/render/printed/atx_brackets.png
diff --git a/dibond/render/printed/bar_clamps.png b/dibond/render/printed/bar_clamps.png
diff --git a/dibond/render/printed/cal.png b/dibond/render/printed/cal.png
diff --git a/dibond/render/printed/d_motor_brackets.png b/dibond/render/printed/d_motor_brackets.png
diff --git a/dibond/render/printed/fixing_blocks.png b/dibond/render/printed/fixing_blocks.png
diff --git a/dibond/render/printed/ribbon_clamps.png b/dibond/render/printed/ribbon_clamps.png
diff --git a/dibond/render/printed/spool_holder_brackets.png b/dibond/render/printed/spool_holder_brackets.png
diff --git a/dibond/render/printed/spool_holder_tall_brackets.png b/dibond/render/printed/spool_holder_tall_brackets.png
diff --git a/dibond/render/printed/wades_extruder.png b/dibond/render/printed/wades_extruder.png
diff --git a/dibond/render/printed/x_carriage_parts.png b/dibond/render/printed/x_carriage_parts.png
diff --git a/dibond/render/printed/y_bearing_mounts.png b/dibond/render/printed/y_bearing_mounts.png
diff --git a/dibond/render/printed/y_belt_anchors.png b/dibond/render/printed/y_belt_anchors.png
diff --git a/dibond/render/printed/z_motor_brackets.png b/dibond/render/printed/z_motor_brackets.png
diff --git a/dibond/render/ribbon_clamp_14_33.png b/dibond/render/ribbon_clamp_14_33.png
diff --git a/dibond/render/ribbon_clamp_14_33NB.png b/dibond/render/ribbon_clamp_14_33NB.png
diff --git a/dibond/render/ribbon_clamp_20_33.png b/dibond/render/ribbon_clamp_20_33.png
diff --git a/dibond/render/ribbon_clamp_20_44N.png b/dibond/render/ribbon_clamp_20_44N.png
diff --git a/dibond/render/ribbon_clamp_26_33.png b/dibond/render/ribbon_clamp_26_33.png
diff --git a/dibond/render/ribbon_clamp_26_33N.png b/dibond/render/ribbon_clamp_26_33N.png
diff --git a/dibond/render/ribbon_clamp_26_44N.png b/dibond/render/ribbon_clamp_26_44N.png
diff --git a/dibond/render/spool_bracket_female.png b/dibond/render/spool_bracket_female.png
diff --git a/dibond/render/spool_bracket_male.png b/dibond/render/spool_bracket_male.png
diff --git a/dibond/render/tube_cap.png b/dibond/render/tube_cap.png
diff --git a/dibond/render/tube_jig.png b/dibond/render/tube_jig.png
diff --git a/dibond/render/wades_big_gear.png b/dibond/render/wades_big_gear.png
diff --git a/dibond/render/wades_block.png b/dibond/render/wades_block.png
diff --git a/dibond/render/wades_gear_spacer.png b/dibond/render/wades_gear_spacer.png
diff --git a/dibond/render/wades_idler_block.png b/dibond/render/wades_idler_block.png
diff --git a/dibond/render/wades_small_gear.png b/dibond/render/wades_small_gear.png
diff --git a/dibond/render/x_belt_clamp.png b/dibond/render/x_belt_clamp.png
diff --git a/dibond/render/x_belt_grip.png b/dibond/render/x_belt_grip.png
diff --git a/dibond/render/x_belt_tensioner.png b/dibond/render/x_belt_tensioner.png
diff --git a/dibond/render/x_carriage.png b/dibond/render/x_carriage.png
diff --git a/dibond/render/x_carriage_fan_bracket.png b/dibond/render/x_carriage_fan_bracket.png
diff --git a/dibond/render/x_carriage_fan_duct.png b/dibond/render/x_carriage_fan_duct.png
diff --git a/dibond/render/x_idler_bracket.png b/dibond/render/x_idler_bracket.png
diff --git a/dibond/render/x_motor_bracket.png b/dibond/render/x_motor_bracket.png
diff --git a/dibond/render/y_bar_clamp.png b/dibond/render/y_bar_clamp.png
diff --git a/dibond/render/y_bar_clamp_switch.png b/dibond/render/y_bar_clamp_switch.png
diff --git a/dibond/render/y_bearing_mount.png b/dibond/render/y_bearing_mount.png
diff --git a/dibond/render/y_belt_anchor.png b/dibond/render/y_belt_anchor.png
diff --git a/dibond/render/y_belt_anchor_toothed.png b/dibond/render/y_belt_anchor_toothed.png
diff --git a/dibond/render/y_belt_clip.png b/dibond/render/y_belt_clip.png
diff --git a/dibond/render/y_belt_clip_toothed.png b/dibond/render/y_belt_clip_toothed.png
diff --git a/dibond/render/y_idler_bracket.png b/dibond/render/y_idler_bracket.png
diff --git a/dibond/render/y_motor_bracket.png b/dibond/render/y_motor_bracket.png
diff --git a/dibond/render/z_bar_clamp.png b/dibond/render/z_bar_clamp.png
diff --git a/dibond/render/z_coupling.png b/dibond/render/z_coupling.png
diff --git a/dibond/render/z_motor_bracket_lhs.png b/dibond/render/z_motor_bracket_lhs.png
diff --git a/dibond/render/z_motor_bracket_rhs.png b/dibond/render/z_motor_bracket_rhs.png
diff --git a/dibond/render/z_screw_pointer.png b/dibond/render/z_screw_pointer.png
diff --git a/dibond/sheets/frame_gantry.pdf b/dibond/sheets/frame_gantry.pdf
diff --git a/dibond/sheets/frame_gantry_and_y_carriage.pdf b/dibond/sheets/frame_gantry_and_y_carriage.pdf
diff --git a/dibond/sheets/frame_left.pdf b/dibond/sheets/frame_left.pdf
diff --git a/dibond/sheets/frame_right.pdf b/dibond/sheets/frame_right.pdf
diff --git a/dibond/sheets/frame_stays.pdf b/dibond/sheets/frame_stays.pdf
diff --git a/dibond/sheets/y_carriage.pdf b/dibond/sheets/y_carriage.pdf
diff --git a/dibond/sheets/y_heatshield.pdf b/dibond/sheets/y_heatshield.pdf