X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=ksafe-base.scad;h=c2e2704557e494b15ffc4097faf3e6a8122b13b7;hp=2e2a18ada5395078a65c416b236f7c6ad4cb2729;hb=3c75c6575c9ec874afd93fe9d2e1c7f28390806f;hpb=8e44d3d71d70e0525d2346b846ebb98db1598dd7

diff --git a/ksafe-base.scad b/ksafe-base.scad
index 2e2a18a..c2e2704 100644
--- a/ksafe-base.scad
+++ b/ksafe-base.scad
@@ -4,9 +4,9 @@
 bolt_above = 8.50 - 0.50;
 bolthole_height = 4.24 + 1.00;
 wall_thick = 4.50;
-bolthole_width = 16.62 + 2.00;
-main_sz = 150.56 + 0.75;
-cnr_rad = 13.5; // approx
+bolthole_width = 16.62 + 1.00;
+main_sz = 149.06 - 0.25;
+cnr_rad = 19.5;
 lidinner_thick_allow = 20.78 + 0.50;
 display_width = 69.81 - 0.50;
 
@@ -44,6 +44,7 @@ dcover_edge_gap_more_width = 2.0; // each side
 // ----- calculated -----
 
 hsz = main_sz/2;
+cut = main_sz + 20;
 
 gppA = [0,0];
 gppB = gppA - [ wall_thick, 0 ];
@@ -69,11 +70,11 @@ cppA = [ cpp2[0], dpp3[1] + dcover_slop_inside ];
 cppK = cppA + [ 0, dcover_mainthick ];
 cppZ = [ -ksafecover_lip, -dcover_commonvertoff ];
 cppD = cppZ + [ 0, -dcover_slop_inside ];
-cppE = cppD + [ 0, -dcover_mainthick ];
 cppC = [ dcover_slop_inside, cppD[1] ];
 cppF = cppC + dcover_mainthick * [1,-1];
 cppB = [ cppC[0], cppA[1] ];
 cppG = [ cppF[0], cppK[1] ];
+cppE = [ cppD[0], cppF[1] - (cppF[0] - cppD[0]) ];
 
 // anchor
 
@@ -288,17 +289,18 @@ module DCoverSupportAllowance(){
 	   dcover_slop_inside * 2 + 0.01 ]);
 }
 
-module KsafeBase(){ ////toplevel
-  cut = main_sz + 20;
+module BoltHoles(){
+  translate([0,0, -(bolt_above + 0.5 * bolthole_height)])
+    cube(center=true, [ cut, bolthole_width, bolthole_height ]);
+}
 
+module KsafeBase(){ ////toplevel
   DCover();
 
   difference(){
     Box();
 
-    // bolt holes
-    translate([0,0, -bolt_above -0.5 * bolthole_height])
-      cube(center=true, [ cut, bolthole_width, bolthole_height ]);
+    BoltHoles();
 
     // string slot
     translate([ -cut,
@@ -342,13 +344,17 @@ module RimTest(){ ////toplevel
 
 module DCoverTest(){ ////toplevel
   intersection(){
-    union(){
-      Box();
-      DCover();
+    difference(){
+      union(){
+	Box();
+	DCover();
+      }
+      DCoverSupportAllowance();
+      BoltHoles();
     }
     translate([0,0,60])
     cube(center=true, [ main_sz*2, main_sz*2,
-			2 * (60 + 3.0) ]);
+			2 * (60 + 10) ]);
   }
 }