Merge branch 'master' of git.services.c3pb.de:fxk8y/CyanLight

pcb/10W/TransportProtection.scad

@@ -7,7 +7,6 @@ $fs = 0.5;
 $fa = 1.0;
 
 
-
 pcb_w      =      40.5;
 pcb_h      =      67.5;
 pcb_r      =         5;  // edge radius
@@ -17,10 +16,11 @@ pcb_sc_off =         5;  // offset of screw holes from edge
 pcb_conn_w =        20;
 pcb_conn_h =         3;
 
-box_str    =         3;  // Material strength
+$str       =         3;  // Material strength
 box_h      = pcb_t + 2;
 
 
+
 module pcb(w=pcb_w, h=pcb_h, r=pcb_r, off=pcb_off) {
 
   _w = w + 2*off;
@@ -45,16 +45,16 @@ module pcb3D(wi, hi, ri, height=1.6, off=pcb_off) {
 }
 
 
-module body(wi, hi, ri, height=pcb_t, off=pcb_off, _str=box_str) {
+module body(wi, hi, ri, height=pcb_t, off=pcb_off) {
 
 
   // clipDisplacementX
-  clDsX = wi/2 + off + _str;
+  clDsX = wi/2 + off + $str;
 
   difference() {
-    pcb3D(wi, hi, ri, height=height, off=_str);
+    pcb3D(wi, hi, ri, height=height, off=$str);
     
-    translate([0, 0, _str]) pcb3D(wi, hi, ri, height=height, off=off);
+    translate([0, 0, $str]) pcb3D(wi, hi, ri, height=height, off=off);
     
     //for (tx=[-clDsX, clDsX]) translate([tx, 0, height/2]) rotate([0, 0, 0]) clipReceptacle();
   }
@@ -112,7 +112,7 @@ module triangularClipReceptacle(w=20, h=3, d=3) {
   
 }
 
-module triangularClip(w=20, h=3, d=3, length=10, _str=3) {
+module triangularClip(w=20, h=3, d=3, length=10) {
   
   h2   =    h / 2;
   l    =   length;
@@ -121,18 +121,18 @@ module triangularClip(w=20, h=3, d=3, length=10, _str=3) {
   _x   =  l * _lx;
   _hlx = h2 * _lx;
   
-  translate([_str - 0.01, 0, h2])  triangularClipReceptacle(w, h, d);
+  translate([$str - 0.01, 0, h2])  triangularClipReceptacle(w, h, d);
 
   translate([0, w/2, 0]) rotate([90, 0, 0]) linear_extrude(w) polygon([
     [   0,       -l],
     [ -_x, h + _hlx],
-    [_str,        h],
-    [_str,        0],
-    [_str,       -l],
+    [$str,        h],
+    [$str,        0],
+    [$str,       -l],
   ]);
   
 }
-triangularClip();
+//triangularClip();
 
 
 module minkowskiDemonstration() {
@@ -152,9 +152,9 @@ module minkowskiDemonstration() {
 }
 
 
-module outerRing(w=pcb_w, h=pcb_h, r=pcb_r, off=pcb_off, _str=box_str) {
+module outerRing(w=pcb_w, h=pcb_h, r=pcb_r, off=pcb_off) {
 
-  s2 = _str/2;
+  s2 = $str/2;
 
   minkowski() {
     difference() {
@@ -169,27 +169,29 @@ module outerRing(w=pcb_w, h=pcb_h, r=pcb_r, off=pcb_off, _str=box_str) {
 
 TpOrChamfer = 3;
 
-module TransportProtection(w=pcb_w, h=pcb_h, r=pcb_r, height=pcb_t, off=pcb_off, _str=box_str, _boxH=box_h) {
+module TransportProtection(w=pcb_w, h=pcb_h, r=pcb_r, height=pcb_t, off=pcb_off, _boxH=box_h) {
 
   _h = _boxH + 2;
 
   difference() {
-    body(w, h, r, _h, off, _str);
+    body(w, h, r, _h, off);
 
-    translate([0, 0, _h-TpOrChamfer]) outerRing(w, h, r, off, _str);
+    translate([0, 0, _h-TpOrChamfer]) outerRing(w, h, r, off);
 
-    translate([0, 0, 5.5]) rotate([0, 180, 0]) outerRing(w, h, r, _str+1, _str);
+    translate([0, 0, 5.5]) rotate([0, 180, 0]) outerRing(w, h, r, $str+1);
 
   }
 
 }
 
 
-/*if ($preview) {
+
+
+if ($preview) {
   
   minkowskiDemonstration();
 
-  translate([0, 0,box_str]) PCBMockUp();
+  translate([0, 0, $str]) PCBMockUp();
 
   TransportProtection();
 
@@ -198,5 +200,5 @@ module TransportProtection(w=pcb_w, h=pcb_h, r=pcb_r, height=pcb_t, off=pcb_off,
   TransportProtection();
   
 }
-*/
+
 

pcb/CyanStripe/CyanStripe.sch

@@ -1280,4 +1280,6 @@ Text GLabel 7400 8500 0    50   Input ~ 0
 LED_W
 Wire Wire Line
 	7500 8500 7400 8500
+Text Notes 7050 6850 0    79   ~ 16
+TODO: C10 should be 0603 !
 $EndSCHEMATC