X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=maglite-holder.scad;h=9aed425a551bf5688ae807ccd50e51cda351a17b;hp=d9395f5c926b9e191c8e8337b2a3b45c2063402b;hb=77c39f4394b1ede3825b88234a0d9832cc6d3b78;hpb=b543ceaee7db9f8be46530c1fe99fb23f910348c

diff --git a/maglite-holder.scad b/maglite-holder.scad
index d9395f5..9aed425 100644
--- a/maglite-holder.scad
+++ b/maglite-holder.scad
@@ -24,16 +24,22 @@ brace = [ 40, 20, 20 ];
 hole_dia = 4 + 0.5;
 hole_slot = 5;
 
-slop = 2; // total, not each side
+movement_extra_angle = 5;
+
+slop = 4; // total, not each side
 
 torch_min_xcoord_fig_cm = -2.7; // coordinates of bottom left of curve
 torch_min_ycoord_fig_cm = -5.9; // & big part in fig file.  mid top is origin
 torch_smm_xcoord_fig_cm = -1.9; // x coord of lhs of narrow part
 
-//$fa=5;
+miniature = 1; // can adjust this to get commitid size right and rescale *Print
+
+$fa=5;
 
 // calculated
 
+include <commitid.scad>
+
 torch_dxf_scale =
   [ (torch_big_dia - torch_lit_dia) /
     (-(torch_min_xcoord_fig_cm - torch_smm_xcoord_fig_cm) * 10 * 2),
@@ -95,9 +101,12 @@ module TorchMovement(){
   translate([0, -torch_out, 0]) {
     translate([0, 0, -torch_recess])
       Torch();
-    rotate([90,0,0])
-      linear_extrude(height= block_out)
-      projection() rotate([-90,0,0]) Torch();
+    for (as=[-1,+1]) {
+      rotate([0,0, as*movement_extra_angle])
+	rotate([90,0,0])
+	linear_extrude(height= block_out)
+	projection() rotate([-90,0,0]) Torch();
+    }
   }
 }
 
@@ -118,6 +127,11 @@ module Bracket(){ ////toplevel
     }
     ScrewHole(holes[0], 90);
     ScrewHole(holes[1], 0);
+    translate([-cid_w/2, 0, above - holes[0] - hole_near])
+      rotate([-90,0,0])
+      scale([miniature, miniature, 1])
+      Commitid_BestCount([cid_w, holes[1]-holes[0] - hole_near*2]
+			 / miniature);
   }
   difference(){
     mirror([0,1,0])
@@ -128,11 +142,13 @@ module Bracket(){ ////toplevel
 }
 
 module BracketPrint(){ ////toplevel
-  rotate([-90,0,0])
+  scale(1/miniature)
+    rotate([-90,0,0])
     Bracket();
 }
 
 module TestTorchPrint(){ ////toplevel
+  scale(1/miniature)
   intersection(){
     translate([0,0, torch_lit_dia / 2 / sqrt(2)])
       rotate([-90,0,0])