X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=quacks-ingredients.scad;h=6925a1b8cc34ca3f4b314ad550aafe983959a689;hb=ba7c5b240dcdab5fa3f4e3f7823bb828551471f0;hp=33ba5fb4b28b6b8e7506998793bc4393ccee10df;hpb=80dd0478393a096fd9cc9a7d0883908d77afae82;p=reprap-play.git

diff --git a/quacks-ingredients.scad b/quacks-ingredients.scad
index 33ba5fb..6925a1b 100644
--- a/quacks-ingredients.scad
+++ b/quacks-ingredients.scad
@@ -1,15 +1,30 @@
 // -*- C -*-
 
-token_dia = 21;
-spot_dia = 4.5;
+//
+// git clean -xdff
+// ./quacks-ingredients-update-levels
+// make autoincs
+//
+// make -j8 quacks-stls 2>&1 | tee log
+// OR EG
+// make -j8 quacks-ingredients-L{1,2,3,4,5},Base_Yellow.auto.stl
+//
+// ./quacks-ingredients-make-copy-gcodes Base_Yellow   etc.
+//
+//   Print Q-P-1 in spots, Q-P-2 in main colour, Q-P-3 in spots
+//
+// For colours which only have zero-spot counters, print only Q-P-2
+
+token_dia = 20;
+spot_dia = 4.3;
 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;
 
 $fs=0.1;
@@ -107,7 +122,7 @@ 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);
 }
@@ -124,4 +139,7 @@ module Tests_L() { ////toplevel
   Tests() Token_L();
 }
 
+//// toplevels-from:
+include <quacks-ingredients-counts.scad>
+
 //Demo();