X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=quacks-ingredients.scad;h=912da965762ba840b1a5db66deaf90577f59c447;hb=67327694838a91da0c601e8f6f8dc8d0605f8ca2;hp=50b38e0f0368befb283d07e3ce156e9eaa34bfc2;hpb=ac060e6b3285be4975fb4859c6ad61d5e86227f3;p=reprap-play.git

diff --git a/quacks-ingredients.scad b/quacks-ingredients.scad
index 50b38e0..912da96 100644
--- a/quacks-ingredients.scad
+++ b/quacks-ingredients.scad
@@ -1,23 +1,29 @@
 // -*- C -*-
 
-token_dia = 21;
+token_dia = 20;
 spot_dia = 4.5;
 spot_gap = spot_dia / 3.0;
 
-thick = 1.5;
+thick = 3.0;
 
-multicolour_gap = 0.15; // each side
+multicolour_gap = 0.075; // each side
 initial_layer_thick = 0.400;
 initial_layer_width = 0.750;
-final_layer_thick = 0.250;
+final_layer_thick = 0.500;
 multicolour_post = 4;
 
-$spots_absent = false;
-$spots_plusgap = false;
-
 $fs=0.1;
 $fa=1;
 
+// calculated
+
+token_pitch = token_dia + 3;
+
+// autoadjusted
+
+$spots_absent = false;
+$spots_plusgap = false;
+
 module Spots_Extrude_Lower(){
   d = $spots_plusgap ? 1 : 0;
   translate([0,0,-d])
@@ -101,14 +107,14 @@ module Frame(phase, base_sz) {
     }
   }
   // Priming tower
-  translate([-base_sz[0]/2, (3-phase)*(multicolour_post + multicolour_gap)])
+  translate([-base_sz[0]/2, (2.8-phase)*(multicolour_post*1.7)])
     linear_extrude(height= zs[phase-1])
     square(multicolour_post);
 }
 
 module Tests(){
   for ($nspots = [1,2,3,4]) {
-    translate(($nspots - 2) * (token_dia + 3) * [1,0])
+    translate(($nspots - 2) * token_pitch * [1,0])
       children();
   }
 }
@@ -118,4 +124,7 @@ module Tests_L() { ////toplevel
   Tests() Token_L();
 }
 
+//// toplevels-from:
+include <quacks-ingredients-counts.scad>
+
 //Demo();