Various updates

server_rack/Fan Mount/LICENSE.txt

@@ -0,0 +1 @@
+This thing was created by Thingiverse user doommeister, and is licensed under GNU - GPL

server_rack/Fan Mount/README.txt

@@ -0,0 +1,4 @@
+Fan Mount/Duct - OpenSCAD Library by doommeister on Thingiverse: https://www.thingiverse.com/thing:18273
+
+Summary:
+An openSCAD library to make a mounting surround or duct for a DC fan of specified size and length. Use in you own openSCAD fan mount designs or specify a longer length to draw a section of ducting or a make-up piece.Dimensions of DC fan included are 25mm, 30mm, 40mm, 45mm, 60mm, 80mm, and 120mm. Of course you can define your own too.**V2 adds cutter  option

server_rack/Fan Mount/files/fan_holder_v2.scad

@@ -0,0 +1,156 @@
+/*
+OPENSCAD Library file by the DoomMeister
+Mounting surround for small DC fans (25 - 120mm)
+
+Data taken from various places around the internet.
+http://www.qwikflow.com/dc_fans.html
+
+//Released under the terms of the GNU GPL v3.0
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//uncomment this for example
+//fan_mount(size=60,thick=3);
+
+module fan_mount(size=40,thick = 4)
+{
+if(size == 25)
+	{
+	_fan_mount(
+			fan_size = 25,
+			fan_mounting_pitch = 20,
+			fan_m_hole_dia = 3,
+			holder_thickness = thick
+		 );
+	}
+if(size == 30)
+	{
+	_fan_mount(
+			fan_size = 30,
+			fan_mounting_pitch = 24,
+			fan_m_hole_dia = 3,
+			holder_thickness = thick
+		 );
+	}
+
+if(size == 40)
+	{
+	_fan_mount(
+			fan_size = 40,
+			fan_mounting_pitch = 32,
+			fan_m_hole_dia = 3.5,
+			holder_thickness = thick
+		 );
+	}
+if(size == 45)
+	{
+	_fan_mount(
+			fan_size = 45,
+			fan_mounting_pitch = 37,
+			fan_m_hole_dia = 4.3,
+			holder_thickness = thick
+		 );
+	}
+if(size == 60)
+	{
+	_fan_mount(
+			fan_size = 60,
+			fan_mounting_pitch = 50,
+			fan_m_hole_dia = 4.4,
+			holder_thickness = thick
+		 );
+	}
+if(size == 80)
+	{
+	_fan_mount(
+			fan_size = 80,
+			fan_mounting_pitch = 71.5,
+			fan_m_hole_dia = 4.4,
+			holder_thickness = thick
+		 );
+	}
+
+if(size == 120)
+	{
+	_fan_mount(
+			fan_size = 120,
+			fan_mounting_pitch = 105,
+			fan_m_hole_dia = 4.4,
+			holder_thickness = thick
+		 );
+	}
+}
+
+
+//inner module
+module _fan_mount(
+			fan_size, //nominsl size of fan
+			fan_mounting_pitch, //pitch between mounting holes
+			fan_m_hole_dia, //mounting hole diameter
+			holder_thickness //user defined thickness
+		 )
+{
+
+offset1 = (fan_size-(fan_mounting_pitch + fan_m_hole_dia))/2;
+offset2 = (fan_size-(fan_mounting_pitch))/2;
+offset3 = offset2 + fan_mounting_pitch;
+thickness = (fan_size-fan_mounting_pitch)/2;	
+			
+			//difference()
+			//{
+			linear_extrude(height = holder_thickness)
+			union()
+			{	
+			difference()
+			{
+				translate([fan_m_hole_dia/2,fan_m_hole_dia/2,0])
+				minkowski()
+				{	
+					square([fan_size - fan_m_hole_dia,fan_size - fan_m_hole_dia]);
+					circle(r= fan_m_hole_dia/2, $fn=20);
+				}
+			
+					translate([offset1,offset1,0])
+					square([fan_mounting_pitch + fan_m_hole_dia,fan_mounting_pitch + fan_m_hole_dia]);
+				}
+				translate([offset2,offset2,0])
+				rotate([0,0,0])_corner_hole();
+				translate([offset3,offset2,0])
+				rotate([0,0,90])_corner_hole();
+				translate([offset2,offset3,0])
+				rotate([0,0,90])_corner_hole();
+				translate([offset3,offset3,0])
+				rotate([0,0,0])_corner_hole();
+			}
+
+module _corner_hole()
+{
+				difference(){
+					union(){
+							difference(){
+							square([fan_m_hole_dia + thickness,fan_m_hole_dia + thickness],center=true);
+							square([(fan_m_hole_dia + thickness)/2,(fan_m_hole_dia + thickness)/2],center=false);
+							translate([-(fan_m_hole_dia + thickness)/2,-(fan_m_hole_dia + thickness)/2])
+							square([(fan_m_hole_dia + thickness)/2,(fan_m_hole_dia + thickness)/2],center=false);
+							}
+					circle(r=(fan_m_hole_dia + thickness)/2, $fn=20);
+					}
+					circle(r=(fan_m_hole_dia)/2, $fn=20);
+				}
+}
+
+
+echo(offset1,offset2,thickness);
+}
+

server_rack/honeycomb_wall v1.1.scad

@@ -0,0 +1,131 @@
+include <BOSL2/std.scad>
+include <BOSL2/screws.scad>
+
+// OpenSCAD Parameterized Honeycomb Storage Wall
+// Inspired by: https://www.printables.com/model/152592-honeycomb-storage-wall
+// v1.0 - Initial version
+// v1.1 - Updates
+//        + Added tiny chamfer that was in the STEP file but not the diagram
+//        + Added solid section modifier
+//        + Added cutout modifier
+//        + Added mirror modifier
+//        + Added V-slot modifier
+//        + Added mounting screws
+
+
+/* [Size of the wall] */
+
+// Number of hexagons to make in the X axis
+numx=10;
+
+// Number of hexagons to make in the Y axis
+numy=10;
+
+// Mirror along the X axis which can help odd-numbered segments fit together
+odd = false;
+
+/* [Wall Modifiers: Solid section]  */
+
+// Solid section for extra modifiers
+solid_section = false;
+
+solid_start=7;
+solid_end=9;
+
+/* [Wall Modifiers: cutout]  */
+
+// Cutout so you can route larger cables through the wall or make room for a power outlet
+cutout = false;
+
+cutout_wall = 3;
+cutout_x = 46;
+cutout_y = 75;
+cutout_x_offset = 53;
+cutout_y_offset = 0;
+
+/* [Wall Modifiers: vslot]  */
+
+// Vslot modifier so you can use nuts intended for 2020 extrusion in the front (only really useful with a solid section)
+vslot = false;
+
+vslot_length = 260;
+vslot_x = 0;
+
+/* [Wall Modifiers: mounting screw holes]  */
+
+// Mounting screw hole modifier - Screws that will go through the front of the panel so you can bolt into a wall (only really useful with a solid section)
+mounting_screw = false;
+
+// Mounting screw hole size
+mounting_screw_spec = "M4"; // [M3, M4, #6, #8]
+
+// Mounting screw head shape
+mounting_screw_head = "flat"; // [none, flat, socket, button, pan]
+
+mounting_screw_spacing = 50;
+
+mounting_screw_distance = 180;
+
+mounting_screw_x = 0;
+
+/* [Shape of the hexes - you probably don't want to mess with these]  */
+// thickness of the thinner wall
+wall=1.8; //[:0.01]
+
+// Height of the hexagon
+height=20;
+
+// Calculates the long diagonal (the diameter of a circle inscribed on the hexagon) from the short diagonal (the height of the hexagon)
+function ld_from_sd(short_diameter) =
+    (2/sqrt(3)*short_diameter);
+    
+// Calculates the edge length (length of one side) from the short diagonal (the height of the hexagon)
+function a_from_sd(short_diameter) =
+    (short_diameter/sqrt(3));
+
+module cell(height, wall) {
+    union() {
+        tube(od=ld_from_sd(height+wall*2), id1=ld_from_sd(height)+0.5, id2=ld_from_sd(height), h=0.5, $fn=6, anchor=BOTTOM);
+        up(0.5) tube(od=ld_from_sd(height+wall*2), id=2/sqrt(3)*height, h=4.5, $fn=6, anchor=BOTTOM);
+        up(5) tube(od=ld_from_sd(height+wall*2), id1=ld_from_sd(height),id2=ld_from_sd(height+wall), h=1, $fn=6, anchor=BOTTOM);
+        up(6) tube(od=ld_from_sd(height+wall*2), id=ld_from_sd(height+wall), h=2, $fn=6, anchor=BOTTOM);
+    }
+}
+
+module section(numx, numy) {
+    grid_copies(n=[numx,numy], spacing=sqrt(3)/2 * (height+wall*4), stagger=true) {
+        if (solid_section && $col > solid_start && $col <= solid_end) {
+            zrot(30) cyl(d=2/sqrt(3)*(height+wall*2),h=8, anchor=BOTTOM,$fn=6);
+        } else {
+            zrot(30) cell(height, wall);
+        }
+    }
+}
+
+module section_unioned_with_cutout(numx,numy) {
+    if (cutout) {
+        union() {
+            difference() {
+                section(numx,numy);
+                translate([cutout_x_offset,cutout_y_offset,0]) cuboid([cutout_x,cutout_y,30]);
+            }
+            translate([cutout_x_offset,cutout_y_offset,0]) rect_tube(size=[cutout_x,cutout_y], h=8, wall=cutout_wall);
+        }
+    } else {
+        section(numx,numy);
+    }
+}
+
+difference() {
+    if (odd) {
+        section_unioned_with_cutout(numx*2,numy);
+    } else {
+        mirror([1,0,0]) section_unioned_with_cutout(numx*2,numy);
+    }
+    if (vslot) {
+        xrot(-90) right(vslot_x) fwd(9.9) down(vslot_length/2) linear_extrude(vslot_length) polygon([[-3,10],[-3,8.5],[-6,8.5],[-6,7],[-2.5,3.4],[2.5,3.4],[6,7],[6,8.5],[3,8.5],[3,10]]);
+    }
+    if (mounting_screw) {
+        right(mounting_screw_x) ycopies(spacing=mounting_screw_spacing, l=mounting_screw_distance) screw_hole(mounting_screw_spec,head=mounting_screw_head,anchor=TOP,l=20,orient=BOTTOM);
+    }
+}

server_rack/honeycomb_wall.scad

@@ -0,0 +1,31 @@
+include <BOSL2/std.scad>
+
+// OpenSCAD Paramaterized Honeycomb Storage Wall
+// Inspired by: https://www.printables.com/model/152592-honeycomb-storage-wall
+
+/* [Size of the wall] */
+
+// Number of hexagons to make in the X axis
+numx=10;
+
+// Number of hexagons to make in the Y axis
+numy=10;
+
+/* [Shape of the hexes - you probably don't want to mess with these]  */
+// thickness of the thinner wall
+wall=1.8; //[:0.01]
+
+// Height of the hexagon
+height=20;
+
+module cell(height, wall) {
+    union() {
+        tube(od=2/sqrt(3)*(height+wall*2), id=2/sqrt(3)*height, h=5, $fn=6, anchor=BOTTOM);
+        up(5) tube(od=2/sqrt(3)*(height+wall*2), id1=2/sqrt(3)*height,id2=2/sqrt(3)*(height+wall), h=1, $fn=6, anchor=BOTTOM);
+        up(6) tube(od=2/sqrt(3)*(height+wall*2), id=2/sqrt(3)*(height+wall), h=2, $fn=6, anchor=BOTTOM);
+    }
+}
+
+union() {
+    grid2d(n=[numx*2,numy], spacing=sqrt(3)/2 * (height+wall*4), stagger=true) zrot(30) cell(height, wall);
+}

server_rack/scad/fan_cover_mount.scad

@@ -0,0 +1,29 @@
+$fn=60;
+
+include <BOSL2/std.scad>;
+include <honeycomb.scad>;
+include <nutsnbolts/cyl_head_bolt.scad>;
+include <fan_holder_v2.scad>
+
+base_length=100;
+base_width=108;
+base_height=30;
+fan_size=60;
+
+// fan_mount
+color("blue", alpha=0.9) /*rotate([0,-90,0])*/ {
+    difference() {
+        union() {
+            rect_tube(size1=[base_length,base_width+5], size2=[fan_size,fan_size], wall=2.5, h=base_height, rounding1=10, rounding2=3);
+            translate([6.5,base_width/2+1.25,0]) cuboid([40,2.5,13], rounding=5, edges=[BOT+LEFT,BOT+RIGHT], anchor=TOP+RIGHT);
+            translate([6.5,-base_width/2-1.25,0]) cuboid([40,2.5,13], rounding=5, edges=[BOT+LEFT,BOT+RIGHT], anchor=TOP+RIGHT);
+            translate([-30,-30,27]) fan_mount(size=fan_size,thick=3);
+        }
+    // cut
+    translate([base_length/2-5,0,0]) cuboid([20,60,15], rounding=10, edges=[FRONT+TOP,BACK+TOP], anchor=BOT);
+    // hdds_holes
+    translate([1.5,0,-8.75]) ycyl(d=3.5, l=120);
+    translate([-28.5,0,-8.75]) ycyl(d=3.5, l=120);
+    }
+}
+

server_rack/scad/pcie_riser_mount.scad

@@ -1,7 +1,9 @@
 $fn=60;
 
-include <BOSL2/std.scad>
+include <BOSL2/std.scad>;
+include <honeycomb.scad>;
 include <nutsnbolts/cyl_head_bolt.scad>;
+include <fan_holder_v2.scad>
 
 base_length=100;
 base_width=20;
@@ -14,7 +16,7 @@ module screw() {
 }
 
 module pcie_mount() {
-    difference() {
+    color("cyan") difference() {
         union() {
             // Base
             cuboid([base_length,base_width,base_height], rounding=2, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=TOP);
@@ -35,25 +37,49 @@ module pcie_mount() {
 }
 
 module riser() {
-    difference() {
-        union() {
-            cuboid([67.45,1.65,14.25], rounding=1, edges=[TOP+RIGHT,TOP+LEFT,BOT+RIGHT,BOT+LEFT], anchor=TOP);
-            cuboid([39,7.125,10.55], rounding=.5, anchor=BOT);
-            translate([0,0,-7.5]) cuboid([42,7,7.5], rounding=1, edges=[TOP+RIGHT,TOP+LEFT,BOT+RIGHT,BOT+LEFT], anchor=TOP);
-            }
-        translate([29,0,-7.25]) ycyl(l=5, d=3.25);
-        translate([-29,0,-7.25]) ycyl(l=5, d=3.25);
+    color("grey") {
+        difference() {
+            union() {
+                cuboid([67.45,1.65,14.25], rounding=1, edges=[TOP+RIGHT,TOP+LEFT,BOT+RIGHT,BOT+LEFT], anchor=TOP);
+                cuboid([39,7.125,10.55], rounding=.5, anchor=BOT);
+                translate([0,0,-7.5]) cuboid([42,7,7.5], rounding=1, edges=[TOP+RIGHT,TOP+LEFT,BOT+RIGHT,BOT+LEFT], anchor=TOP);
+                }
+            translate([29,0,-7.25]) ycyl(l=5, d=3.25);
+            translate([-29,0,-7.25]) ycyl(l=5, d=3.25);
     }
-}
-
-color("grey") translate([-63.2,0.825,2]) difference() {
+    translate([-63.2,11,2]) difference() {
         cuboid([12.75,18.25,80], rounding=2, anchor=BOT+BACK+RIGHT);
         translate([-1,2,-1]) cuboid([15,25,80], rounding=2, anchor=BOT+BACK+RIGHT); 
+    }
+    }
 }
 
-!color("cyan") translate([0,-8,0]) {
+translate([0,65.5,-40]) {
     pcie_mount();
-    
-    }
+    translate([0,1,0]) riser();
+}
 
-color("grey") translate([0,-7,0]) riser();
+// 2_bays_stand
+color("blue", alpha=0.9) {
+    difference() {
+        rotate([0,90,0]) translate([0,0,-75]) rect_tube(150, 110, 105, rounding=10);
+        translate([0,0,45]) cuboid([130,120,50], rounding=5, edges=[BOT+LEFT,BOT+RIGHT]);
+        translate([0,0,-54]) cuboid([130,120,20], rounding=5, edges=[TOP+LEFT,TOP+RIGHT]);
+        // holes
+        translate([0,0,-5]) cuboid([125,120,4], rounding=2, edges=[TOP+LEFT,TOP+RIGHT,BOT+LEFT,BOT+RIGHT]);
+        translate([0,0,-35]) cuboid([125,120,4], rounding=2, edges=[TOP+LEFT,TOP+RIGHT,BOT+LEFT,BOT+RIGHT]);
+    }
+    translate([-75,-55,17]) linear_extrude(2.5) {
+	honeycomb(150, 110, 15, 4, whole_only=true);
+    }
+    translate([0,51,-13]) cuboid([150,5,2], rounding=3, edges=[FRONT+LEFT,FRONT+RIGHT]);
+    translate([0,51,-43]) cuboid([150,5,2], rounding=3, edges=[FRONT+LEFT,FRONT+RIGHT]);
+    translate([0,-51,-13]) cuboid([150,5,2], rounding=3, edges=[BACK+LEFT,BACK+RIGHT]);
+    translate([0,-51,-43]) cuboid([150,5,2], rounding=3, edges=[BACK+LEFT,BACK+RIGHT]);
+}
+
+// fan_mount
+rotate([0,-90,0]) {
+    translate([0,0,75]) rect_tube(size1=[110,110], size2=[60,60], wall=2.5, h=30, rounding1=10, rounding2=3);
+    translate([-30,-30,103]) fan_mount(size=60,thick=3);
+}

server_rack/scad/zimablade_mount.scad

@@ -0,0 +1,92 @@
+$fn=60;
+
+include <BOSL2/std.scad>;
+include <honeycomb.scad>;
+include <nutsnbolts/cyl_head_bolt.scad>;
+include <fan_holder_v2.scad>
+
+base_length=100;
+base_width=20;
+base_height=15;
+
+module screw() {
+    nutcatch_parallel("M3", clh=0.1);
+	translate([0,0,23]) hole_through(name="M3", l=16, cld=0.1, h=10, hcld=0.4);
+	*nutcatch_sidecut("M3", l=20, clk=0.1, clh=0.1, clsl=0.1);
+}
+
+module pcie_mount() {
+    color("cyan") difference() {
+        union() {
+            // Base
+            cuboid([base_length,base_width,base_height], rounding=2, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=TOP);
+            translate([0,-10,-5]) cuboid([80,4,50], rounding=40, edges=[TOP+RIGHT,TOP+LEFT,], anchor=BOT+FRONT);
+            // Front support
+            *translate([-65,0,0]) cuboid([10,20,80.5], rounding=2, edges=[FWD+LEFT,BACK+LEFT, TOP+RIGHT], anchor=BOT+RIGHT);
+        }
+        // riser_screwholes
+        translate([29,-8,-7.25]) rotate([0,-90,-90]) screw();
+        translate([-29,-8,-7.25]) rotate([0,-90,-90]) screw();
+        // cage_screwholes
+        translate([0,-20,35]) rotate([0,-90,-90]) screw();
+        translate([0,-20,5]) rotate([0,-90,-90]) screw();
+        // riser_nest
+        cuboid([68,2,base_height], rounding=-1, edges=[TOP+RIGHT,TOP+LEFT,TOP+BACK,TOP+FRONT], anchor=TOP+FRONT);
+        translate([0,-3,0]) cuboid([44,14,base_height], rounding=-1, edges=[TOP+RIGHT,TOP+LEFT,TOP+FRONT], anchor=TOP+FRONT);
+    }
+}
+
+module riser() {
+    color("grey") {
+        difference() {
+            union() {
+                cuboid([67.45,1.65,14.25], rounding=1, edges=[TOP+RIGHT,TOP+LEFT,BOT+RIGHT,BOT+LEFT], anchor=TOP);
+                cuboid([39,7.125,10.55], rounding=.5, anchor=BOT);
+                translate([0,0,-7.5]) cuboid([42,7,7.5], rounding=1, edges=[TOP+RIGHT,TOP+LEFT,BOT+RIGHT,BOT+LEFT], anchor=TOP);
+                }
+            translate([29,0,-7.25]) ycyl(l=5, d=3.25);
+            translate([-29,0,-7.25]) ycyl(l=5, d=3.25);
+    }
+    translate([-63.2,11,2]) difference() {
+        cuboid([12.75,18.25,80], rounding=2, anchor=BOT+BACK+RIGHT);
+        translate([-1,2,-1]) cuboid([15,25,80], rounding=2, anchor=BOT+BACK+RIGHT); 
+    }
+    }
+}
+
+translate([0,65.5,-27.5]) {
+    pcie_mount();
+    translate([0,1,0]) riser();
+}
+
+
+!color("blue", alpha=0.9) {
+    // 2_hdds_stand
+    difference() {
+        rotate([0,90,0]) translate([0,0,-75]) rect_tube(150, 110, 105, rounding=10);
+        translate([0,0,45]) cuboid([130,120,50], rounding=5, edges=[BOT+LEFT,BOT+RIGHT]);
+        translate([0,0,-54]) cuboid([130,120,20], rounding=5, edges=[TOP+LEFT,TOP+RIGHT]);
+        // hdds_holes
+        translate([0,0,-5]) cuboid([125,120,4], rounding=2, edges=[TOP+LEFT,TOP+RIGHT,BOT+LEFT,BOT+RIGHT]);
+        translate([0,0,-35]) cuboid([125,120,4], rounding=2, edges=[TOP+LEFT,TOP+RIGHT,BOT+LEFT,BOT+RIGHT]);
+        // riser_holes
+        translate([0,0,7.5]) ycyl(d=3, l=120);
+        translate([0,0,-22.5]) ycyl(d=3, l=120);
+    }
+    translate([-75,-55,17]) linear_extrude(2.5) {
+	honeycomb(150, 110, 15, 4, whole_only=true);
+    }
+    translate([0,51,-13]) cuboid([150,5,2], rounding=3, edges=[FRONT+LEFT,FRONT+RIGHT]);
+    translate([0,51,-43]) cuboid([150,5,2], rounding=3, edges=[FRONT+LEFT,FRONT+RIGHT]);
+    translate([0,-51,-13]) cuboid([150,5,2], rounding=3, edges=[BACK+LEFT,BACK+RIGHT]);
+    translate([0,-51,-43]) cuboid([150,5,2], rounding=3, edges=[BACK+LEFT,BACK+RIGHT]);
+    // fan_mount
+    rotate([0,-90,0]) {
+        difference() {
+            translate([0,0,75]) rect_tube(size1=[110,110], size2=[60,60], wall=2.5, h=30, rounding1=10, rounding2=3);
+            rotate([0,50,0]) translate([-35,0,90]) cuboid([35,60,10], rounding=10, , edges=[FRONT+LEFT,BACK+LEFT]);
+        }
+        translate([-30,-30,103]) fan_mount(size=60,thick=3);
+    }
+}
+

server_rack/scad/zimablade_plate.scad

@@ -0,0 +1,32 @@
+$fn=60;
+
+include <BOSL2/std.scad>;
+
+zb_length=108;
+zb_width=81;
+zb_height=23;
+
+module zimablade() {
+    color("grey") cuboid([zb_length,zb_width,zb_height], rounding=2, anchor=BOT);
+}
+
+*zimablade();
+
+
+difference() {
+    union() {
+        cuboid([126,102,3], rounding=2, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=TOP);
+        cuboid([120,108,3], rounding=2, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=TOP);
+        cuboid([zb_length+10,zb_width+10,5], rounding=2, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=BOT);
+    }
+    cuboid([zb_length+2,zb_width+2,5], rounding=2, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=BOT);
+    cuboid([zb_length-2,zb_width-2,5], rounding=2, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=TOP);
+    cuboid([zb_length-20,zb_width+20,5], anchor=BOT);
+    cuboid([zb_length+20,zb_width-20,5], anchor=BOT);
+}
+/*
+102.5
+120
+140
+108.25
+*/

tir_sportif/22lr_risers/scad/ammo_risers.scad

@@ -59,32 +59,42 @@ module federal_holder() {
 }
 
 bullets();
+federal_holder();
+cci_holder();
 
-translate([0,50,0]) {
-    cci_holder();
+base_l=77;
+base_w=45;
+plate_l=70;
+plate_w=37.5;
+riser_l=70;
+riser_w=35;
+riser_h=6;
 
-    // cci riser
-    color("orange", alpha=1) {
-        translate([0,0,11.5]) {
-            difference() {
-                cuboid([80,46,23],rounding=1);
-                translate([0,0,11]) cuboid([73,40,7]);
-                translate([0,0,-2]) cuboid([71,36,20],rounding=0);
-                translate([0,0,11]) ycyl(l=46, d=20, rounding=-1);
-            }
-        }
+// federal_riser_vertical
+color("blue", alpha=1) {
+    cuboid([base_l,base_w,4], rounding=4, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=TOP);
+    cuboid([riser_l,riser_w,riser_h], rounding=1, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=BOT);
+    for (i = [-32:14:24]) {
+        translate([i,0,0]) cuboid([6,riser_w,11], rounding=1, anchor=BOT);
     }
 }
 
-federal_holder();
-
-// federal riser
+// federal_riser_horizontal
 color("blue", alpha=1) {
-    translate([0,0,-2]) cuboid([84,48,4], rounding=4, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT]);
-    translate([0,0,3]) cuboid([70,35,6], rounding=1, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT]);
-    translate([-32,0,5.5]) cuboid([6,35,11], rounding=1);
-    translate([-18,0,5.5]) cuboid([6,35,11], rounding=1);
-    translate([-4,0,5.5]) cuboid([6,35,11], rounding=1);
-    translate([10,0,5.5]) cuboid([6,35,11], rounding=1);
-    translate([24,0,5.5]) cuboid([6,35,11], rounding=1);
-}
+    cuboid([base_l,base_w,4], rounding=4, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=TOP);
+    cuboid([riser_l,riser_w,riser_h], rounding=1, edges=[FWD+RIGHT,FWD+LEFT,BACK+RIGHT,BACK+LEFT], anchor=BOT);
+    for (i = [-14.5:14.5:14.5]) {
+        translate([0,i,0]) cuboid([riser_l,6,11], rounding=1, anchor=BOT);
+    }
+}
+
+// cci riser
+!color("orange", alpha=1) {
+    difference() {
+        rect_tube(size=[base_l,base_w], isize=[riser_l+1,riser_w+1], h=23, rounding=4, irounding=1, anchor=BOT);
+        translate([0,0,20]) rect_tube(size=[plate_l+1,plate_w+1], wall=3, h=3, rounding=1, anchor=BOT);
+    *translate([0,0,23]) cuboid([73,40,7]);
+        translate([0,base_w/2,23]) ycyl(l=base_w/2-riser_w/2, d=20, rounding=-1, anchor=BACK);
+        translate([0,-base_w/2,23]) ycyl(l=base_w/2-riser_w/2, d=20, rounding=-1, anchor=FRONT);
+    }
+}

tools/paracord/Jig for Paracord Bracelets - 5524616/LICENSE.txt

@@ -0,0 +1 @@
+This thing was created by Thingiverse user FrankBer, and is licensed under Creative Commons - Attribution - Non-Commercial

tools/paracord/Jig for Paracord Bracelets - 5524616/README.txt

@@ -0,0 +1,4 @@
+Jig for Paracord Bracelets by FrankBer on Thingiverse: https://www.thingiverse.com/thing:5524616
+
+Summary:
+This jig for paracord bracelets doesn't need any additional hardware or tools. You'll find everything you need in the Thing files.You can create bracelets with small and large buckles using the clips in different sizes (small or large). This jig allows you to create bracelets without buckles (knot and loop) as well. Printing recommendations: This jig is designed for easy printing. All parts are already aligned to be printed and don't need supports or rafts.Print the clamping block with at least 70% infill. Otherwise, the screw can break off if the knob is tightened too much.Print the bolts last. You might need to scale them a bit (4% less or more) that they fit tight in the holes. If you don't change the mountings often, you can use M4 metal screws instead of the bolts.When printing the clips, a brim is only recommended if they absolutely do not want to stick to the print bed. The clips are so small that the brim is difficult to remove after printing.You won't need to print the knob if you have a M8 wing nut at hand.

tools/paracord/Paracord Bracelet Jig - 2419047/LICENSE.txt

@@ -0,0 +1 @@
+This thing was created by Thingiverse user keplergelotte, and is licensed under Creative Commons - Attribution

tools/paracord/Paracord Bracelet Jig - 2419047/README.txt

@@ -0,0 +1,4 @@
+extended paracord jig bottom by keplergelotte on Thingiverse: https://www.thingiverse.com/thing:2706369
+
+Summary:
+An extended jig bottom for paracord tool

tools/paracord/paracord_jig.scad

@@ -0,0 +1,56 @@
+$fn=60;
+
+include <BOSL2/std.scad>
+include <nutsnbolts/cyl_head_bolt.scad>;
+
+tube_length=400;
+tube_diam=16;
+
+module screw_back() {
+    *nutcatch_parallel("M5", clh=0.1);
+	translate([0,0,27]) hole_through(name="M5", l=45, cld=0.1, h=10, hcld=0.4);
+	rotate([0,0,90]) translate([0,0,-10]) nutcatch_sidecut("M5", l=20, clk=0.1, clh=0.1, clsl=0.1);
+}
+
+module screw_front() {
+    *nutcatch_parallel("M5", clh=0.1);
+	translate([0,0,26]) hole_through(name="M5", l=24, cld=0.1, h=3, hcld=0.4);
+	rotate([0,0,-90]) translate([0,0,10]) nutcatch_sidecut("M5", l=20, clk=0.2, clh=0.5, clsl=0.5);
+}
+
+module end() {
+    difference() {
+        cuboid([100,20,50], rounding=2);
+        translate([-30,0,0]) ycyl(d=16.5, l=10, rounding2=-1, anchor=FRONT);
+        translate([30,0,0]) ycyl(d=16.5, l=10, rounding2=-1, anchor=FRONT);
+        rotate([0,0,180]) screw_front();
+    }
+}
+
+module mid() {
+    difference() {
+        union() {
+            cuboid([100,30,25], rounding=2, anchor=TOP);
+            cuboid([100,30,25], rounding=2, anchor=BOTTOM);
+        }
+        translate([-30,0,0]) ycyl(d=16.5, l=30, rounding=-2);
+        translate([30,0,0]) ycyl(d=16.5, l=30, rounding=-2);
+        cuboid([110,40,2]);
+        translate([0,5,0]) screw_back();
+        translate([0,-7,0]) screw_front();
+    }
+}
+
+
+color("grey") rotate([90,0,0,]) {
+    *tube(od=tube_diam, id=tube_diam-3, l=tube_length);
+    translate([-30,0,0]) tube(od=16, id=14, l=400);
+    translate([30,0,0]) tube(od=16, id=14, l=400);
+}
+
+translate([0,tube_length/2,0]) mirror([0,1,0]) end();
+translate([0,-tube_length/2,0]) end();
+
+color("red") {
+    mid();
+}