1 files changed, 35 insertions, 1 deletions

diff --git a/delta.jscad b/delta.jscad
index 45e8765..12bdb97 100644
--- a/delta.jscad
+++ b/delta.jscad
@@ -837,97 +837,131 @@ function bedholder(params) {
  rv = rv.intersect(CSG.cylinder({ // cut off excess
   start: [0,0,h0-1], end: [0,0,h0+CONFIG.bedholder.h+1],
   radius: CONFIG.heatbed.r, resolution: 270
  }));
  rv.properties.P = new CSG.Connector([0,-CD.base.mid_inscription_r,h0],[0,0,1],[1,0,0]);
  return rv.setColor(CONFIG.color.parts);
 }
 
 var PARTS = {
  wip: function(params) {
   return duetholder(params);
   return PARTS.alltogethernow(params);
   return base_extrusions();
   return foot();
   return union(base_extrusions(),column_extrusions(),duet().translate([0,-20,0]));
  },
  alltogethernow: function(params) {
   var cols = columns();
   var sides = base_sides();
   var feet = THREEWINDS.map(function(w,i) {
    var rv = foot();
    rv = rv.connectTo(rv.properties.c_column,cols[i].properties.c_bottom,false,0);
    var s = shoe();
    s = s.connectTo(s.properties.c_foot,rv.properties.c_shoe,false,0);
    return rv.union(s);
   });
   var dh = duetholder();
   var dhsw = dh.connectTo(dh.properties.c_h,
    new CSG.Connector([-CONFIG.duet.hole_spacing.x/2,-CD.base.mid_inscription_r,CONFIG.foot.h],[0,0,1],[1,0,0]),
    false,0);
   var d = duet();
   d = d.connectTo(d.properties.holes.c_sw,dhsw.properties.duet.c_sw,false,0);
   var dhse = dh.connectTo(dh.properties.duet.c_se,d.properties.holes.c_se,false,0);
   var dhne = dh.connectTo(dh.properties.duet.c_ne,d.properties.holes.c_ne,false,0);
   var dhnw = dh.connectTo(dh.properties.duet.c_nw,d.properties.holes.c_nw,false,0);
   var rv = union(cols).union(sides.map(union)).union(feet).union([
    d,dhsw,dhse,dhne,dhnw
   ]);
   var p = U.P(platform());
   rv = rv.union(p);
   rv.properties.P = new CSG.Connector([0,0,0],[0,0,1],[1,0,0]);
   return rv;
  },
  duetholder: function(params) {
   return duetholder();
  },
  foot: foot,
  shoe: shoe,
- bedholder: bedholder
+ bedholder: bedholder,
+ platform: function(params) { return U.P(EFFECTOR.effector()) },
+ hinged: function(params) {
+  // TODO: handle print mode
+  var ms = microswitch();
+  var e = EFFECTOR.effector();
+  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);
+  return U.P(hdhd[1]);
+ },
+ // TODO: eliminate common code above and below
+ clamp: function(params) {
+  // TODO: handle print mode
+  var ms = microswitch();
+  var e = EFFECTOR.effector();
+  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);
+  return U.P(hdhd[0]);
+ },
+ fanholder: function(params) {
+  EFFECTOR.effector(); // to set up rmount
+  return U.P(EFFECTOR.fanholder());
+ }
 };
 
 function main(params) {
  var part = params.part && PARTS[params.part];
  if(!part) return U.axes();
  var rv = U.P(part(params));
  if(!params.print) rv = rv.union(U.axes());
  return rv;
 }
 
 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;
 }
 
 function getParameterDefinitions() {
  return [{
   name: 'part',
   type: 'choice',
   values: [
    'platform',
    'hinged',