# HG changeset patch
# User mdd
# Date 1536751399 -7200
# Node ID a159ad715fe0515078c68d8bd01bde37a9e7f1a4
# Parent  15eac37578b71a8c52b5fa31e4dd7786053093d7
final assembly with correct oring sizes and tube diameters

diff -r 15eac37578b7 -r a159ad715fe0 FluidSwitch/FluidSwitch_Radial.scad
--- a/FluidSwitch/FluidSwitch_Radial.scad	Wed Sep 12 12:48:28 2018 +0200
+++ b/FluidSwitch/FluidSwitch_Radial.scad	Wed Sep 12 13:23:19 2018 +0200
@@ -2,12 +2,12 @@
 // 1 Inlet, N Outlets
 
 // Variables:
-oring_outer = 5.0;
-oring_inner = 3.0;
+oring_outer = 8.0;
+oring_inner = 4.0;
 
-tube_dia = 2;
+tube_dia = 3;
+hole_inner = 2;
 
-hole_inner = 1.0;
 axis_dia = 5;
 
 // for color mixer we need 3 base colors + black + white +  additional 1 waste and 1 clean water and one output = 8 connectors
@@ -17,8 +17,8 @@
 outlets = 8;
 
 // just fiddle around with the following variables:
-outlet_circle_dia = 13;
-base_dia = 20;
+outlet_circle_dia = 22;
+base_dia = 30;
 
 // roundness faces
 fn = 10;
@@ -31,22 +31,23 @@
 outer_thread_height = 10;
 outer_height = 15;
 thread_pitch = 2;
+inlay_height = outlet_circle_dia / 4 + hole_inner;
+
 
 // START PROGRAM
 use <../libs/Threading/Threading.scad>
 
 valve_lower();
 
-//rotate([180,0,0]) translate([30,0,0])
-//valve_inlay();
+translate([0,0,base_height]) 
+ valve_inlay();
 
-//rotate([180,0,0]) translate([0,0,-60]) 
-//  valve_cap();
+rotate([180,0,0]) translate([0,0,-outer_height - 2]) 
+  valve_cap();
 
 // MODULES
 
 module valve_inlay() union() {
-  inlay_height = 5;
   difference() {  
     translate([0,0,0.0001])
     cylinder(d=base_dia, h = inlay_height);
@@ -55,7 +56,7 @@
     rotate([90,0,0])
     translate([outlet_circle_dia/4,0,0])
     rotate_extrude(convexity=10)
-       translate([outlet_circle_dia/4, 0]) circle(d=oring_inner, $fn=fn);
+       translate([outlet_circle_dia/4, 0]) circle(d=hole_inner, $fn=fn);
       
   //  cylinder(d=oring_inner, h=inlay_height / 2, $fn=fn);
   //  translate([outlet_circle_dia/2,0])
@@ -77,7 +78,8 @@
       cylinder(d=base_outer_dia + 6, h=2, $fn=cap_sides);
     }
     
-    cylinder(d=axis_dia + 2, h=2 + 0.001, $fn=fn);
+    translate([0,0,-0.001])
+    cylinder(d=axis_dia + 2, h=2 + 0.002, $fn=fn);
   }
 }
 
@@ -141,6 +143,6 @@
 
 module oring() {
   rotate_extrude(convexity=10, $fn=fn)
-    translate([oring_inner/2 , 0, 0])
+    translate([oring_inner/2 + oring_dia / 2 , 0, 0])
       circle(d=oring_dia, $fn=fn);
 }
\ No newline at end of file