Merge pull request #23 from tomek-szczesny/main

h3_ultimate2 development
This commit is contained in:
Edward Kisiel
2023-01-15 16:53:04 +00:00
committed by GitHub
3 changed files with 64 additions and 5 deletions

View File

@@ -629,6 +629,14 @@ data_3=orientation("vertical","horizontal")
*uses:* data4=[pin, type("male" or "female"), floor_thick] *uses:* data4=[pin, type("male" or "female"), floor_thick]
**vent_panel_hex**
*description:* cover for vent opening, honeycomb pattern
*uses:* size_x=x, size_y=y, size_z=thick,
data1=cell_size, data2=cell_spacing,
data3="x", "y", "none", or "default", data4=border
#### Platter class “types” #### Platter class “types”
@@ -665,3 +673,13 @@ data_3=orientation("vertical","horizontal")
*description:* hk stereo boom bonnet volume wheel extention *description:* hk stereo boom bonnet volume wheel extention
*uses:* data_1=tolerence *uses:* data_1=tolerence
**vent_panel_hex**
*description:* cover for vent opening, honeycomb pattern
*uses:* size_x=x, size_y=y, size_z=thick,
data1=cell_size, data2=cell_spacing,
data3="x", "y", "none", or "default", data4=border

View File

@@ -899,11 +899,16 @@ accessory_data = [
"model","hd25",98,110,2,"bottom",[90,0,-90],["case",true,true,false],0,0,0,7,0,"",0], // model 2.5 hd "model","hd25",98,110,2,"bottom",[90,0,-90],["case",true,true,false],0,0,0,7,0,"",0], // model 2.5 hd
["h3_ultimate2", ["h3_ultimate2",
"sub","vent_hex",112,10,2+12*sqrt(8/3),"top",[0,0,90],["case",true,false,false],17,4,4,9,3,"vertical",0, // vent opening
"sub","vent_hex",112,10,2,"bottom",[0,0,90],["case",true,false,false],17,1,4,9,3,"vertical",0, // vent opening
"suball","fan",0,25,3,"top",[0,270,0],["case",false,false,false],60,0,6,1,0,"",0, // sub fan opening "suball","fan",0,25,3,"top",[0,270,0],["case",false,false,false],60,0,6,1,0,"",0, // sub fan opening
"model","fan_cover",-4,25,3,"top",[0,270,0],["case",false,false,false],60,0,3,2,0,"",0, // model fan cover "model","fan_cover",-4,25,3,"top",[0,270,0],["case",false,false,false],60,0,3,2,0,"",0, // model fan cover
"platter","fan_cover",-100,150,0,"top",[0,0,0],["case",false,false,false],60,0,3,2,0,"",0, // model fan cover "platter","fan_cover",-100,150,0,"top",[0,0,0],["case",false,false,false],60,0,3,2,0,"",0, // model fan cover
"model","vent_panel_hex",144,11.77,64,"top",[0,90,0],["case",false,false,false],62,107.43,3,5.0,1.6,"y",14, // model vent cover
"platter","vent_panel_hex",-200,13.77,0,"top",[0,0,0],["case",false,false,false],62,107.43,3,5.0,1.6,"y",14, // model vent cover
"suball","rectangle",111,26.77,64,"top",[0,90,0],["case",true,false,false],62,77.43,4,0,0,"",[2,2,2,2], // vent opening
"sub","round",111,11.77+3.2+1.6,64-7,"top",[0,90,0],["case",true,false,false],3.2,0,4,0,0,"",0, // vent cover screw hole
"sub","round",111,11.77+3.2+1.6,2+7,"bottom",[0,90,0],["case",true,false,false],3.2,0,4,0,0,"",0, // vent cover screw hole
"sub","round",111,119.2-3.2-1.6,64-7,"top",[0,90,0],["case",true,false,false],3.2,0,4,0,0,"",0, // vent cover screw hole
"sub","round",111,119.2-3.2-1.6,2+7,"bottom",[0,90,0],["case",true,false,false],3.2,0,4,0,0,"",0, // vent cover screw hole
"sub","round",3.81,17.78,35,"top",[0,0,0],["sbc-case_z",true,true,true],6.5,0,19,0,0,"",0, // sub screw hole "sub","round",3.81,17.78,35,"top",[0,0,0],["sbc-case_z",true,true,true],6.5,0,19,0,0,"",0, // sub screw hole
"sub","round",3.81,106.19,35,"top",[0,0,0],["sbc-case_z",true,true,true],6.5,0,19,0,0,"",0, // sub screw hole "sub","round",3.81,106.19,35,"top",[0,0,0],["sbc-case_z",true,true,true],6.5,0,19,0,0,"",0, // sub screw hole
"sub","round",106.04,24.77,35,"top",[0,0,0],["sbc-case_z",true,true,true],6.5,0,19,0,0,"",0, // sub screw hole "sub","round",106.04,24.77,35,"top",[0,0,0],["sbc-case_z",true,true,true],6.5,0,19,0,0,"",0, // sub screw hole

View File

@@ -3,7 +3,7 @@
Contributions: Contributions:
hk_vu8m(brackets),u_bracket(),screw(),m1_hdmount() Copyright 2022 Tomek Szczęsny, mctom @ www.forum.odroid.com hk_vu8m(brackets),u_bracket(),screw(),m1_hdmount() Copyright 2022 Tomek Szczęsny, mctom @ www.forum.odroid.com
vent_hex() Copyright 2023 Tomek Szczęsny, mctom @ www.forum.odroid.com vent_hex(), vent_panel_hex() Copyright 2023 Tomek Szczęsny, mctom @ www.forum.odroid.com
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -50,7 +50,8 @@
added mask for microsdcard2 added mask for microsdcard2
20221207 version 2.0.3 added double_stacked_usb3-usb2, hd35_vtab(side) and supporting code 20221207 version 2.0.3 added double_stacked_usb3-usb2, hd35_vtab(side) and supporting code
2023xxxx version 2.0.x added h3_port_extender(style, mask = false), hk_pwr_button(mask = false), keyhole(keysize, mask = false), 2023xxxx version 2.0.x added h3_port_extender(style, mask = false), hk_pwr_button(mask = false), keyhole(keysize, mask = false),
vent_hex(cells_x, cells_y, cell_size, cell_spacing, orientation) and supporting code, dsub(dsubsize, mask = false) vent_hex(cells_x, cells_y, cell_size, cell_spacing, orientation) and supporting code, dsub(dsubsize, mask = false),
vent_panel_hex(x, y, thick, cell_size, cell_spacing, border, borders),
see https://github.com/hominoids/SBC_Case_Builder see https://github.com/hominoids/SBC_Case_Builder
@@ -125,6 +126,7 @@
keyhole(keysize, mask = false) keyhole(keysize, mask = false)
vent_hex(cells_x, cells_y, cell_size, cell_spacing, orientation) vent_hex(cells_x, cells_y, cell_size, cell_spacing, orientation)
dsub(dsubsize, mask = false) dsub(dsubsize, mask = false)
vent_panel_hex(x, y, thick, cell_size, cell_spacing, border, borders);
*/ */
use <./lib/fillets.scad>; use <./lib/fillets.scad>;
@@ -264,6 +266,9 @@ module add(type,loc_x,loc_y,loc_z,face,rotation,size_x,size_y,size_z,data_1,data
if(type == "fan_cover") { if(type == "fan_cover") {
translate([loc_x,loc_y,loc_z]) rotate(rotation) fan_cover(size_x, size_z); translate([loc_x,loc_y,loc_z]) rotate(rotation) fan_cover(size_x, size_z);
} }
if(type == "vent_panel_hex") {
translate([loc_x,loc_y,loc_z]) rotate(rotation) vent_panel_hex(x=size_x, y=size_y, thick=size_z, cell_size=data_1, cell_spacing=data_2, border=data_4, borders=data_3);
}
if(type == "feet") { if(type == "feet") {
translate([loc_x,loc_y,loc_z]) rotate(rotation) feet(size_x, size_z); translate([loc_x,loc_y,loc_z]) rotate(rotation) feet(size_x, size_z);
} }
@@ -739,6 +744,37 @@ module fan_cover(size, thick) {
} }
} }
/* hex vent panel */
// borders:
// y - specified size along y axis
// x - specified size along x axis
// none - both borders the size of cell_spacing, no mounting holes
// anything else ("default") - all borders of specified size
module vent_panel_hex(x, y, thick, cell_size=8, cell_spacing=3, border=3, borders="default") {
hole = 3.2;
xb = (borders == "y" || borders == "none") ? cell_spacing : border;
yb = (borders == "x" || borders == "none") ? cell_spacing : border;
hxb = max(yb/2, cell_spacing + hole);
hyb = max(xb/2, cell_spacing + hole);
cells_x = floor((2*(x-2*xb-cell_size)/(cell_size+cell_spacing))+1);
cells_y = floor(((sqrt(12)*(y-2*yb)-4*cell_size)/(3*(cell_size+cell_spacing)))+1);
csx = cell_size + (cells_x-1)*(cell_size+cell_spacing)/2;
csy = sqrt(4/3)*cell_size + ((cell_size+cell_spacing)*sqrt(3/4)*(cells_y-1));
difference() {
color("grey",1) slab([x,y,thick],2);
translate([(x-csx)/2,(y-csy)/2,-1])
vent_hex(cells_x, cells_y, thick+3, cell_size, cell_spacing, "horizontal");
if (borders != "none") {
translate([ hxb, hyb, -1]) cylinder(d=hole, h=thick+3);
translate([x - hxb, hyb, -1]) cylinder(d=hole, h=thick+3);
translate([ hxb, y - hyb, -1]) cylinder(d=hole, h=thick+3);
translate([x - hxb, y - hyb, -1]) cylinder(d=hole, h=thick+3);
}
}
}
module hk_wb2() { module hk_wb2() {
difference () { difference () {
@@ -3546,7 +3582,7 @@ module vent_hex(cells_x, cells_y, thickness, cell_size, cell_spacing, orientatio
ys = xs * sqrt(3/4); ys = xs * sqrt(3/4);
rot = (orientation=="vertical") ? 90 : 0; rot = (orientation=="vertical") ? 90 : 0;
rotate([rot,0,0]) translate([cell_size/2, cell_size*sqrt(3/8),-1]) { rotate([rot,0,0]) translate([cell_size/2, cell_size*sqrt(1/3),-1]) {
for (ix = [0 : ceil(cells_x/2)-1]) { for (ix = [0 : ceil(cells_x/2)-1]) {
for (iy = [0 : 2 : cells_y-1]) { for (iy = [0 : 2 : cells_y-1]) {
translate([ix*xs, iy*ys,0]) rotate([0,0,90]) translate([ix*xs, iy*ys,0]) rotate([0,0,90])