1 files changed, 27 insertions, 3 deletions

diff --git a/delta.jscad b/delta.jscad
index baa977d..547b51e 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -1,169 +1,193 @@
 var PRINT = {
  layer_height: 0.2,
  extrusion_width: 0.4,
 
  fit_tolerance: .2, slide_tolerance: .4, play_tolerance: .6
 };
 
 var CONFIG = {
- side: {
+ extrusion: {
+  w: 20
+ },
+ base: {
           el: 240,      // side extrusion length
-          tl: 240+2*70,         // triangle side length
+          sl: 240+2*70,         // triangle side length
           gap: 9        // vertical gap between side extrusions
  },
  column: {
           h: 600        // column height
  },
  heatbed: {
           r: 220/2,     // heatbed radius
           sr: 220/2-4.5,// radius of the screwholes circle
           h: 3+1.5      // thickness (including insulation)
  },
  glass: {
           r: 195/2,     // glass radius
           h: 3          // glass thickness
  },
  hotend: {
           h: 62.4,              // full assembly height
           groove: { d:12, h:6 }, // grove diameter and height
   ungroove: { d:16, above:3.7, below: 3+4 }
  },
  effector: {
   h: 6,
           o: 20,// offset to the rod mounts line
   rods_apart: 40,
   cone: { shell: 1, angle: Math.PI/6 },
   rodend: {
            joint_w: 7,// thickness of the joint
    screw_l: 20-1, // 20 with the head
    screw_d: 3
   },
   hotend: { margin: 2 },
   hinge: {
    d: 3, w: 5, margin: 2.5,
    h: 1+(6+3.7)/2, // elevation + grove + top
    e: 1 // elevation
   },
   clamp: {
    shell: 4.6,
    d: 3,
    margin: 2.5,
    split: 0.6
   },
   mswitch: {
    size: [ 19.8, 6, 10 ],
    screw: {
     d: 2, h: 10/2-2,
     s: 1.3, // screw shell
     o: [-9.5/2,9.5/2].map(function(x) {
      return -19.8/2+x;
     })
    },
    switch_x: 2.5
   },
   guide: {
    width: 3, height: 5+1, length: 6
   },
   fanholder: {
    r: 30,
    screw: { d: 3, m: 2.5/*margin*/ },
    w: 3
   }
  },
- nut: { h: 2.3, w: 5.5 }
+ nut: { h: 2.3, w: 5.5 },
+ color: {
+  extrusion: [0.8, 0.8, 0.8, 0.8]
+ }
+};
+
+var CD = {
+ base: (function(){
+  var rv = {};
+  rv.circumscription_r =
+   CONFIG.base.sl/2/Math.cos(Math.PI/6);
+  rv.outer_inscription_r =
+   Math.sqrt(Math.pow(rv.circumscription_r,2)-
+    Math.pow(CONFIG.base.sl/2,2));
+  rv.mid_inscription_r =
+    rv.outer_inscription_r-CONFIG.extrusion.w/2;
+  rv.inner_inscription_r =
+    rv.outer_inscription_r-CONFIG.extrusion.w/2;
+  // TODO: properly calculate
+  rv.column_r = rv.circumscription_r - 48.29;
+  return rv;
+ })()
 };
 
 var U = {
  hypotenuse: function(a,b) {
   return Math.sqrt(Math.pow(a,2)+Math.pow(b,2));
  },
  peek: function(x,m) {
   console.log(x,m);
   return x;
  }
 };
 
 /* {h:,w:} */
 function nut(o) {
  var rv = CSG.cylinder({
   start:[0,0,0],end:[0,0,o.h],
   radius: o.w/2/Math.cos(Math.PI/6),
   resolution: 6
  });
  rv.properties.axis_connector = new CSG.Connector([0,0,0],[0,0,1],[0,1,0]);
  return rv;
 }
 
 var E3DV6 = {
  dimensions: {
   big_d: 22.3,
 
  },
  heatsink: function() {
   var fn = 16;
   var z=0;
   var unite = [ {d:16,h:3.7},{d:12,h:6},{d:16,h:3} ].map(function(x) {
    return CSG.cylinder({
     start: [0,0,z], end: [0,0,z-=x.h],
     radius: x.d/2, resolution: fn
    });
   });
   unite.push(CSG.cylinder({
    start:[0,0,z-=1.5], end:[0,0,z-=1],
    radius: 16/2, resolution: fn
   }));
   for(var i=0;i<11;++i) unite.push(CSG.cylinder({
    start:[0,0,z-=1.5], end:[0,0,z-=1],
    radius: this.dimensions.big_d/2, resolution: fn
   }));
   unite.push(CSG.cylinder({
    start:[0,0,z], end: [0,0,-12.7],
    radiusStart: 10/2, radiusEnd: 8.5/2, /* pretty arbitrary */
    resolution: fn
   }));
   var rv = union(unite);
   rv = rv.subtract([CSG.cylinder({
    start:[0,0,1], end: [0,0,z-1],
    radius: 4.2/2, resolution: fn
   }),CSG.cylinder({
    start:[0,0,1], end: [0,0,-6.7/*somewhat arbitrary*/],
    radius: 8/2, resolution: fn
   }),CSG.cylinder({
    start:[0,0,z-1], end: [0,0,z+14.8],
    radius: 6/2 /*M7*/, resolution: fn
   })]);
   rv.properties.pushfit_connector = new CSG.Connector([0,0,0],[0,0,-1],[1,0,0]);
   rv.properties.heatbreak_connector = new CSG.Connector([0,0,z+14.8],[0,0,-1],[1,0,0]);
   rv.properties.grove_connector = new CSG.Connector([0,0,-3.7-3],[0,0,1],[1,0,0]);
   return rv.setColor([0.8,0.8,0.8,0.9]);
  }
 };
 
 var EFFECTOR = {
  /* {sd: screw diameter, l: cone length, s: screw shell, a: angle from axis} */
  cone: function effector_cone(o) {
   var re = o.sd/2+o.s, rs = re+o.l*Math.tan(o.a||(Math.PI/4));
   var rv = CSG.cylinder({
    start: [0,0,0], end: [0,0,o.l],
    radiusStart: rs, radiusEnd: re,
    resolution: Math.floor(rs*2*2)
   }).subtract(CSG.cylinder({
    start:[0,0,-1], end:[0,0,o.l+1], radius: o.sd,
    //resolution: Math.floor(o.sd*2*2)
   }));
   rv.properties.top_connector = new CSG.Connector([0,0,o.l],[0,0,-1],[1,0,0]);
   rv.properties.bottom_connector = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
   var nuthole = nut(CONFIG.nut);
   rv = rv.subtract(nuthole.connectTo(
    nuthole.properties.axis_connector, rv.properties.bottom_connector,
    false, 0
   ));
   return rv.intersect(CSG.cylinder({start:[0,0,0],end:[0,0,o.l],radius:6/*TODO:calculate*/}));
  },
  platform_bb: function platform_bb() {
   var e = CONFIG.effector;
   var r = U.hypotenuse(e.rods_apart/2,e.o+e.rodend.screw_d/2+e.cone.shell);
   var rv = CSG.sphere({
    center: [0,0,e.h/2], radius: r,
    resolution: r*2*2
   }).intersect(CSG.cube({