1 files changed, 3 insertions, 1 deletions

diff --git a/delta.jscad b/delta.jscad
index 83122af..54f1f86 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -5,193 +5,195 @@ var PRINT = {
  fit_tolerance: .2, slide_tolerance: .4, play_tolerance: .6
 };
 
 var CONFIG = {
  extrusion: {
   w: 20, slotdepth: 6
  },
  base: {
           el: 240,      // side extrusion 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
  },
  duet: {
   pcb_size: { x: 124, y: 100, z: 1 },
   hole_spacing: { x: 115, y: 92 },
   h: 30
  },
  foot: {
   d: 20*Math.sqrt(2), h: 30,
   bolt: { d:5, l: 19, hd: 10 },
   margin: 2.5,
   nut: { d: 8.6 /* TODO: */, h: 3.5 },
   shell: 4,
   zscalefactor: 1.6,
   foot: { ho: 2.5, hi: 5 }
  },
  duetholder: {
   bolt: { d: 3, l: 10, head: { d: 5.33, h: 3 } },
   margin: 3,
   s: 2.5
  },
  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 },
  color: {
   extrusion: [0.8, 0.8, 0.8, 0.8],
   pcb: [ 0, 0.3, 0.2, 0.8 ],
   bulk: [ .9, .9, .9, .2 ],
   parts: [ 0, 0.8, 0, 0.9 ],
-  softparts: [ 0, 0, 0.8, 0.9 ]
+  softparts: [ 0, 0, 0.8, 0.9 ],
+  heatbed: [0.8, 0.8, 0.8, 0.8 ],
+  glass: [0.9, 0.9, 0.9, 0.7 ]
  }
 };
 
 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;
   // TODO: properly calculate
   rv.column_r = rv.circumscription_r - 48.29;
   return rv;
  })(),
  duetholder: (function() {
   var rv = {};
   var s = CONFIG.base.sl;
   var l = CONFIG.duet.hole_spacing.x;
   var w = CONFIG.duet.hole_spacing.y;
   var h = s*Math.cos(Math.PI/6);
   var h1 = h*(1-l/s);
   rv.distance = (h1-w)/3; // hole to side
   return rv;
  })()
 };
 console.log(CONFIG); console.log(CD);
 
 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]);
  }