1 files changed, 27 insertions, 0 deletions

diff --git a/delta.jscad b/delta.jscad
index 043f6f8..b3bb3d3 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -512,96 +512,123 @@ var E2020 = {
    roundradius: [e.roundius,e.roundius,0]
   });
   var fw = [0,90,180,270]; // four winds
   var iy = e.outer/2-e.T.depth;
   var ix = e.T.width/2-(e.outer/2-iy-e.thickness-e.T.thickness);
   rv = rv.union(fw.map(function(w) {
    return CAG.fromPoints([
     [  e.slot_width/2,e.outer/2],
     [  e.slot_width/2,e.outer/2-e.thickness],
     [  e.T.width/2,e.outer/2-e.thickness],
     [  e.T.width/2,e.outer/2-e.thickness-e.T.thickness],
     [  ix, iy ],
     [ -ix, iy ],
     [ -e.T.width/2,e.outer/2-e.thickness-e.T.thickness],
     [ -e.T.width/2,e.outer/2-e.thickness],
     [ -e.slot_width/2,e.outer/2-e.thickness],
     [ -e.slot_width/2,e.outer/2],
    ]).extrude({offset:[0,0,l+thickness]}).rotateZ(w);
   }));
   rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
   return rv;
  }
 };
 
 var THREEWINDS = [0,120,240];
 
 function base_extrusions() {
  var rv = union( THREEWINDS.map(function(w) {
   var e = E2020.extrusion({l:CONFIG.base.el});
   e = e.connectTo(e.properties.c_midway,
    new CSG.Connector([0,-CD.base.mid_inscription_r,CONFIG.extrusion.w/2],[1,0,0],[0,0,1]),
    false, 0);
   return union( [0,CONFIG.extrusion.w+CONFIG.base.gap].map(function(z) {
    return e.translate([0,0,z]);
   }) ).rotateZ(w);
  }) );
  rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
  return rv.setColor(CONFIG.color.extrusion);
 }
 
 function column_extrusions() {
  var rv = union( THREEWINDS.map(function(w) {
   return E2020.extrusion({l:CONFIG.column.h}).translate([0,CD.base.column_r,0]).rotateZ(w);
  }) );
  rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
  return rv.setColor(CONFIG.color.extrusion);
 }
 
+function duet() {
+ var C = CONFIG.duet;
+ var pholes = new CSG.Properties();
+ var hx = C.hole_spacing.x/2;
+ var hy = C.hole_spacing.y/2;
+ var hh = { nw: [1,-1], ne: [1,1], se: [-1,1], sw: [-1,-1] };
+ var holes = [];
+ for(w in hh) {
+  var h = hh[w],_x=h[0]*hx,_y=h[1]*hy;
+  holes.push(CSG.cylinder({start:[_x,_y,-1],end:[_x,_y,C.pcb_size.z+1],radius:3/2}));
+  pholes['c_'+w] = new CSG.Connector([_x,_y,0],[0,0,1],[1,0,0]);
+ }
+ rv = CSG.cube({
+  corner1: [-C.pcb_size.x/2, -C.pcb_size.y/2,            0],
+  corner2: [ C.pcb_size.x/2,  C.pcb_size.y/2, C.pcb_size.z]
+ }).subtract(holes).setColor(CONFIG.color.pcb).union(
+  CSG.cube({
+   corner1: [-C.pcb_size.x/2,-C.hole_spacing.y/2+3,C.pcb_size.z],
+   corner2: [ C.pcb_size.x/2, C.hole_spacing.y/2-3,C.h]
+  }).setColor(CONFIG.color.bulk)
+ );
+ rv.properties.holes = pholes;
+ rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
+ rv.properties.vitamin = true;
+ return rv;
+}
+
 function refaxes(o) {
  if(!o) o = {};
  var l = o.l||20, g = o.g||0.7;
  return union([
   CSG.cylinder({start:[0,0,0],end:[l,0,0]}).setColor([1,0,0,g]),
   CSG.cylinder({start:[0,0,0],end:[0,l,0]}).setColor([0,1,0,g]),
   CSG.cylinder({start:[0,0,0],end:[0,0,l]}).setColor([0,0,1,g])
  ]);
 }
 
 function P(x) {
  return x.connectTo(x.properties.P,new CSG.Connector([0,0,0],[0,0,1],[1,0,0]), false, 0);
 }
 
 function main(params) {
  return refaxes().union(P(base_extrusions()));
 }
 
 function _main(params) {
  var e = EFFECTOR.effector();
  var hs = E3DV6.heatsink();
  hs = hs.connectTo(hs.properties.grove_connector,e.properties.grove_connector,false,0);
  var ms = microswitch();
  var hd = EFFECTOR.hinged({
   microswitch:ms,effector:e
  });
  ms = ms.connectTo(
   ms.properties.screw_connector[0],
   hd.properties.microswitch_screw_connector[0],
   false, 0);
  var hdhd = EFFECTOR.split_hinged(hd);
  var fh = EFFECTOR.fanholder();
  return union({
   platform: e,
   hinged: hdhd[1],
   clamp: hdhd[0],
   fanholder: fh,
   alltogethernow: [e,hdhd[0],hdhd[1], columns(),hs,ms,fh]
  }[params.part||'alltogethernow'])
  var rv = union(
   e,
   hs,
   columns(),
   ///hd,
   hdhd[0], hdhd[1],
   ms);
  return rv;
 }