X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=adafruit-powerboost-common.scad;h=14a9b975cb826a5d4e698bd2e852cddda1cee598;hb=dfb939f64d208a5d0440273a7f9fd5867c2c30c1;hp=3fe334503c08a0ce85c45dbd153f6c05ac158e65;hpb=8ea4065144f20e9159a8f1519c06e2af16926117;p=reprap-play.git

diff --git a/adafruit-powerboost-common.scad b/adafruit-powerboost-common.scad
index 3fe3345..14a9b97 100644
--- a/adafruit-powerboost-common.scad
+++ b/adafruit-powerboost-common.scad
@@ -5,6 +5,10 @@ include <utils.scad>
 
 psu_sz  = psu_sz_nom + [ 0.11, 0.44 ] + [ 0.25, 0.25 ];
 
+psu_hole_pos = [ 2.05, // from back edge of psu_sz[0]
+		 0.55 * 0.5 * 25.4, // from centreline
+		 ];
+
 psu_th = 1.70 + 0.25;
 psu_th_for_clamp = 1.50;
 
@@ -32,10 +36,18 @@ psu_baffle_gap = 1.0 + 0.5;
 
 psu_y = +psu_sz[1]/2 + psu_usb_protr;
 
+psu_usba_v_apart = 7.0;
+psu_usba_v_from_edge = 4.86;
+psu_usba_v_space_below = 1.5;
+psu_usba_v_space_w = 1.7;
+psu_usba_v_space_l = 3.0;
+
 // ----- calculated -----
 
 psu_z = NutBox_h_base(psu_board_nutbox);
 psu_z_down = psu_z + 0.1;
+psu_fix_sz = NutBox_outer_size(psu_board_nutbox);
+psu_board_nutbox_y = psu_sz[1]/2 + psu_board_nutbox[0]/2;
 
 module PsuBoardRepresentation(){
   linear_extrude(height= psu_th)
@@ -66,6 +78,19 @@ module PsuMountCornerExtrude(mx,my, plus_z=psu_board_support_z){
   }
 }
 
+module PsuUsbAVSpacePlan(){
+  for (x= [-1,+1] * psu_usba_v_apart/2) {
+    translate([x, -psu_usba_v_from_edge ]) {
+      hull(){
+	for (y= [-1,+1] * (psu_usba_v_space_l - psu_usba_v_space_w)) {
+	  translate([0,y])
+	    circle(r= psu_usba_v_space_w);
+	}
+      }
+    }
+  }
+}
+
 module PsuMountPositiveMain(){
   for (mx=[0,1]) {
     for (my=[0,1]) {
@@ -119,9 +144,14 @@ module PsuMountPositive(){
 	circle(r= psu_hole_dia/2);
     }
   }
-  translate([0, psu_sz[1]/2 + psu_board_nutbox[0]/2, 0])
-    rotate([0,0,180])
-    NutBox(psu_board_nutbox, psu_z_down);
+  difference(){
+    translate([0, psu_board_nutbox_y, 0])
+      rotate([0,0,180])
+      NutBox(psu_board_nutbox, psu_z_down);
+    translate([0, psu_sz[1]/2, 0])
+      linextr(-psu_usba_v_space_below, +10)
+      PsuUsbAVSpacePlan();
+  }
 }
 
 module PsuClamp(){ ////toplevel
@@ -129,7 +159,7 @@ module PsuClamp(){ ////toplevel
     linear_extrude(height=psu_clamp_th + psu_th_for_clamp, convexity=5) {
       difference(){
 	hull(){
-	  circle(r = fix_sz/2);
+	  circle(r = psu_fix_sz/2);
 	  translate([ -psu_board_nutbox[0]/2, 0])
 	    square(center=true, [ psu_board_clamp_ovlp*2, psu_clamp_w ]);
 	}
@@ -141,6 +171,10 @@ module PsuClamp(){ ////toplevel
 	mirror([1,0])
 	translate([0,-20]) square(40);
     }
+    linextr(-10,10) {
+      rotate(-90)
+      PsuUsbAVSpacePlan();
+    }
   }
 }
 
@@ -153,15 +187,31 @@ module PsuLedWindowsPlan(){
 
 module PsuMountDemo(ceil = 2.5) { ////toplevel
   translate([0, psu_y, psu_z]) {
-    PsuMountPositive();
+    difference(){
+      PsuMountPositive();
+      linextr(-20, 0.1)
+	PsuLedWindowsPlan();
+    }
     %PsuMountNegative();
+
     color("yellow") translate([0,0, -psu_z - ceil])
       linear_extrude(height=0.4, convexity=10)
       PsuLedWindowsPlan();
+
+    color("blue") translate([0,0, -psu_z - ceil])
+      linear_extrude(height=0.4, convexity=10)
+      PsuLedLegendsPlan();
+
+    translate([0, psu_board_nutbox_y, 10])
+      rotate([180,0,0])
+      rotate([0,0,-90])
+      PsuClamp();
   }
 }
 
 module PsuMountTest(ceil = 2.5) { ////toplevel
+  $fs = 0.1;
+  $fa = 3;
   difference(){
     union(){
       translate([0, psu_y, psu_z])
@@ -170,8 +220,8 @@ module PsuMountTest(ceil = 2.5) { ////toplevel
 	linextr_x_yz(-(psu_sz[0]/2 + 5),
 		     +(psu_sz[0]/2 + 5)){
 	  difference(){
-	    rectfromto([-ceil, -ceil], [psu_sz[1] + 5, psu_z + 10]);
-	    rectfromto([0,0], 400*[1,1]);
+	    rectfromto([0, -ceil], [psu_sz[1] + 10, psu_z + 10]);
+	    rectfromto([ceil,0], 400*[1,1]);
 	  }
 	}
 	translate([0, psu_y, psu_z]) {