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=6fc7977de1399af065e14c652ae57917a605b74e;hb=b827aa24397af374e46f228e15b9f0584e970c95;hpb=913a28f5a8559ae38efb14faec2b630f91d713a9

diff --git a/maglite-holder.scad b/maglite-holder.scad
index 6fc7977..9aed425 100644
--- a/maglite-holder.scad
+++ b/maglite-holder.scad
@@ -13,7 +13,7 @@ torch_clear_below = 10;
 stem_width = 20;
 stem_thick = 8;
 
-torch_recess = 14;
+torch_recess = 11;
 arm_width = 10;
 block_thick = 15;
 
@@ -24,12 +24,29 @@ 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
+
+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),
+    torch_big_len / (-torch_min_ycoord_fig_cm * 10) ];
+
+echo(torch_dxf_scale);
+
 above = torch_big_len + torch_clear + torch_clear_below;
 
 holes = [ 172, 265 ];
@@ -48,7 +65,10 @@ module TorchOrig(){
   mirror([0,0,1]){
     hull(){
       rotate_extrude()
+	translate([-torch_lit_dia/2, 0])
+	scale(torch_dxf_scale)
 	translate(dxf_off)
+	translate([-torch_smm_xcoord_fig_cm * 10, 0])
 	import(file="maglite-holder-torch-curve.dxf",
 	       convexity=10, center=true);
     }
@@ -78,17 +98,22 @@ module ScrewHole(y, rot) {
 }    
 
 module TorchMovement(){
-  // xxx needs torch increasing for slop
   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();
+    }
   }
 }
 
-module Bracket(){
+module Bracket(){ ////toplevel
+  cid_w = stem_width * .75;
+  hole_near = hole_slot + hole_dia;
+
   difference(){
     mirror([0,1,0]) {
       translate([-stem_width/2, 0, -stem_len])
@@ -102,6 +127,11 @@ module Bracket(){
     }
     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])
@@ -111,10 +141,33 @@ module Bracket(){
   }
 }
 
-module Demo(){
-    %TorchOrig();
-  Bracket();
+module BracketPrint(){ ////toplevel
+  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])
+      Torch();
+    translate([-100, -torch_tot_len*2, 0])
+      cube([200, torch_tot_len*4, 200]);
+  }
 }
 
-Demo();
+module Demo(){ ////toplevel
+  color("red")
+    translate([0, -torch_out, 0])
+    TorchOrig();
+  color("blue")
+    translate([0, -torch_out, above])
+    cylinder(r=torch_big_dia/2, h=1);
+  Bracket();
+}
 
+//Demo();
+//BracketPrint();
+//TestTorchPrint();