From 5539359e3a7a4437e043854865fc254209d1cb86 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Tue, 31 Oct 2017 22:22:38 +0000
Subject: material mixer: embedded pushfits support

---
diff --git a/mixer-embedded.scad b/mixer-embedded.scad
new file mode 100644
index 0000000..397572f
--- a/dev/null
+++ b/mixer-embedded.scad
@@ -0,0 +1,10 @@
+extrusion_width=.4;
+
+use <mixer.scad>;
+
+the_mixer(
+ pushfit_type="embedded",
+ pushfit_d = 12,
+ pushfit_h = 7,
+ interpushfit = extrusion_width
+);
diff --git a/mixer-threaded.scad b/mixer-threaded.scad
new file mode 100644
index 0000000..ff3c0aa
--- a/dev/null
+++ b/mixer-threaded.scad
@@ -0,0 +1,3 @@
+use <mixer.scad>;
+
+the_mixer();
diff --git a/mixer.scad b/mixer.scad
index 3200023..7b2e5d4 100644
--- a/mixer.scad
+++ b/mixer.scad
@@ -1,4 +1,4 @@
-layer_height=0.2; extrusion_width=0.4;
+layer_height=0.2; extrusion_width=0.45;
 epsilon=0.01;
 $fs=0.125;
 
@@ -15,12 +15,15 @@ module pushfit_thread(h=10) {
 
 module the_mixer(
  pushfit_d = 10, pushfit_h = 10,
+ pushfit_type = "threaded", // threaded|embedded
+ pushfit_ring_h = 4.7, // height of embedded pushfit ring
+ pushfit_insert_d = 8, // diameter of pushfit insert legs hole
  liner_d = 4, liner_id = 2,
  filament_d = 1.75,
  join_angle = 30,
 
- interpushfit = 2*extrusion_width, // space between two pushfit's threads
- pushfit_s = 2, // shell around pushfit threads
+ interpushfit = 2*extrusion_width, // space between two pushfit holes
+ pushfit_s = 2, // shell around pushfit holes
  output_l = 4, // length of output after before pushfit
  outer_r = 3, // outer radius
 
@@ -35,12 +38,22 @@ module the_mixer(
    cylinder(d1=ld+epsilon,d2=liner_id-epsilon,h=inh+2*epsilon);
   }
  }
+ module pushfit() {
+  if(pushfit_type=="threaded") {
+   pushfit_thread(h=pushfit_h);
+  }else if(pushfit_type=="embedded") {
+   translate([0,0,pushfit_h-pushfit_ring_h])
+   cylinder(d=pushfit_d,h=pushfit_ring_h,$fn=pushfit_d*PI*2);
+   cylinder(d=pushfit_insert_d,h=pushfit_h,$fn=pushfit_insert_d*PI*2);
+  }
+ }
  
  ld = liner_d+liner_d_tolerance;
  linero = ld/2/tan(join_angle/2); // liner offset
  pfrx = interpushfit/2/cos(join_angle/2); // radial margin
  pfR = pushfit_d/2+pfrx;      // radius of pushfit with margin
- pfo = pfR/tan(join_angle/2); // pushfit thread ofset
+ pfoo = pushfit_type=="threaded" ? 0 : (pushfit_h-pushfit_ring_h); // offset of pushfit offset
+ pfo = pfR/tan(join_angle/2)-pfoo; // pushfit thread ofset
 
  h = pushfit_d+pushfit_s*2;
  difference() {
@@ -59,13 +72,13 @@ module the_mixer(
    liner(l=pfo-linero+1,in="bottom");
    //cylinder(d=ld,h=pfo-linero+1,$fn=ld*PI*4);
    translate([0,pfo,0]) rotate([-90,0,0])
-   pushfit_thread(h=pushfit_h);
+   pushfit();
   }
   rotate([90,0,0]) {
    liner(l=output_l+1,in="top");
    //cylinder(d=ld,h=output_l+1,$fn=ld*PI*4);
    translate([0,0,output_l])
-   pushfit_thread(h=pushfit_h);
+   pushfit();
   }
   hull() {
    for(s=[-1,1]) rotate([0,0,s*join_angle/2]) {
@@ -79,10 +92,19 @@ module the_mixer(
  }
 }
 
-if(false) {
+module this() {
+ the_mixer(
+  pushfit_type="embedded",
+  pushfit_d = 12,
+  pushfit_h = 7,
+  interpushfit = extrusion_width
+ );
+}
+
+if(!false) {
  difference() {
-  the_mixer();
+  this();
   cylinder(d=100,h=100);
  }
 }else
- the_mixer();
+ this();
--
cgit v0.9.0.2