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=dc16c8ed0e7069a83f94ff030a34be622d05eba2;hpb=27fa9995ffb89a06ec4f171e792ac76d3a6e5a46;p=reprap-play.git

diff --git a/adafruit-powerboost-common.scad b/adafruit-powerboost-common.scad
index dc16c8e..14a9b97 100644
--- a/adafruit-powerboost-common.scad
+++ b/adafruit-powerboost-common.scad
@@ -1,6 +1,13 @@
 // -*- C -*-
 
 include <nutbox.scad>
+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;
@@ -17,15 +24,30 @@ psu_clamp_w = 8.0;
 psu_clamp_gap = 0.4;
 
 psu_board_clamp_ovlp = 4.5;
-psu_board_support_wall = 2;
 psu_board_nutbox = nutbox_data_M3;
 
+psu_board_gap = 0.5;
+psu_board_support_wall = 2;
+psu_board_support_ovlp = 4.5;
+psu_board_support_ovlp_ceil = 2;
+psu_board_support_z = 2;
+
+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)
@@ -48,7 +70,7 @@ module AtPsuMountCorner(mx,my){
 	children();
 }
 
-module PsuMountCornerExtrude(mx,my, plus_z=board_support_z){
+module PsuMountCornerExtrude(mx,my, plus_z=psu_board_support_z){
   AtPsuMountCorner(mx,my){
     linear_extrude(height= psu_z_down + plus_z, convexity=10) {
       children();
@@ -56,19 +78,32 @@ module PsuMountCornerExtrude(mx,my, plus_z=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]) {
       PsuMountCornerExtrude(mx,my){
 	rectfromto(-[1,1]*psu_board_support_wall,
-		   +[1,1]*board_support_ovlp);
+		   +[1,1]*psu_board_support_ovlp);
       }
     }
     // mount above at plug end
     PsuMountCornerExtrude(mx,0, psu_th + psu_board_support_wall){
       rectfromto(-[1,1]*psu_board_support_wall,
-		 [board_support_ovlp,
-		  board_support_ovlp_ceil]);
+		 [psu_board_support_ovlp,
+		  psu_board_support_ovlp_ceil]);
     }
   }
   translate([0,0, -psu_z_down])
@@ -80,7 +115,7 @@ module PsuMountNegative(){
   axis = [0, -psu_sz[1]/2, psu_th];
   PsuRepresentation();
   translate(axis)
-    rotate([atan(2 * board_support_z / psu_sz[1]),
+    rotate([atan(2 * psu_board_support_z / psu_sz[1]),
 	    0,0])
     translate(-axis)
     PsuBoardRepresentation();
@@ -105,13 +140,18 @@ module PsuMountPositive(){
     PsuMountCornerExtrude(mx,1){
       translate([psu_sz[0]/2 - psu_hole_pos[1],
 		 psu_hole_pos[0]]
-		+ board_gap * [1,1] )
+		+ psu_board_gap * [1,1] )
 	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
@@ -119,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 ]);
 	}
@@ -131,6 +171,10 @@ module PsuClamp(){ ////toplevel
 	mirror([1,0])
 	translate([0,-20]) square(40);
     }
+    linextr(-10,10) {
+      rotate(-90)
+      PsuUsbAVSpacePlan();
+    }
   }
 }
 
@@ -143,10 +187,51 @@ 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])
+	PsuMountPositive();
+      difference(){
+	linextr_x_yz(-(psu_sz[0]/2 + 5),
+		     +(psu_sz[0]/2 + 5)){
+	  difference(){
+	    rectfromto([0, -ceil], [psu_sz[1] + 10, psu_z + 10]);
+	    rectfromto([ceil,0], 400*[1,1]);
+	  }
+	}
+	translate([0, psu_y, psu_z]) {
+	  PsuMountNegative();
+	}
+      }
+    }
+    translate([0, psu_y, psu_z]) {
+      linextr(-10, 0.1)
+	PsuLedWindowsPlan();
+    }
   }
 }