diff --git a/SBC_Model_Framework b/SBC_Model_Framework index 49a4f84..513ae0a 160000 --- a/SBC_Model_Framework +++ b/SBC_Model_Framework @@ -1 +1 @@ -Subproject commit 49a4f84432e2f49b4499185369a5c9ce24263a91 +Subproject commit 513ae0a1ba836666a345e5a337a37bb6b3fa2fa9 diff --git a/sbc_case_builder.json b/sbc_case_builder.json index fcab9bc..3bf0a4a 100644 --- a/sbc_case_builder.json +++ b/sbc_case_builder.json @@ -11926,7 +11926,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -12026,7 +12026,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -12376,7 +12376,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -12476,7 +12476,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -12826,7 +12826,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -12926,7 +12926,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -13276,7 +13276,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -13376,7 +13376,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -13726,7 +13726,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", @@ -13826,7 +13826,7 @@ "indents": "false", "lip": "5", "lower_bottom": "0", - "mode": "none", + "mode": "vim_heatsink", "move_front": "0", "move_leftside": "0", "move_rear": "0", diff --git a/sbc_case_builder.scad b/sbc_case_builder.scad index 9c63f7f..1634af9 100644 --- a/sbc_case_builder.scad +++ b/sbc_case_builder.scad @@ -51,7 +51,7 @@ include <./sbc_case_builder_accessories.cfg>; /* [Case View] */ // viewing mode "platter", "model", "debug" view = "model"; // [platter, model, debug] -// enable highlight for sbc subtarctive geometry +// enable highlight for sbc component subtarctive geometry sbc_highlight = false; // enable highlight for accessory subtarctive geometry accessory_highlight = false; @@ -124,7 +124,7 @@ cooling = "fan"; // [none,vents,fan,custom] // exhaust vents exhaust_vents = "vent"; // [none,vent] // special mode -mode = "none"; // [none,net_card] +mode = "none"; // [none,net_card,vim_heatsink] // top case standoff - [diameter,height(not used),holesize,supportsize,supportheight,type(0=none, 1=countersink, 2=recessed, 3=nut holder, 4=blind),style(0=hex, 1=cylinder),reverse,insert,insert hole dia.,insert depth] top_standoff = [6.75,18,2.5,10,4,4,0,1,0,4.5,5.1]; @@ -1216,20 +1216,38 @@ module case_top(case_design) { pcb_hole_x = sbc_data[s[0]][i]+pcb_loc_x; pcb_hole_y = sbc_data[s[0]][i+1]+pcb_loc_y; pcb_hole_size = sbc_data[s[0]][i+2]; - if (pcb_hole_x!=0 && pcb_hole_y!=0) { - normal_standoff = [top_standoff[0], - top_height+pcb_loc_z, - top_standoff[2], - top_standoff[3], - top_standoff[4], - top_standoff[5], - top_standoff[6], - top_standoff[7], - top_standoff[8], - top_standoff[9], - top_standoff[10]]; - translate([pcb_hole_x,pcb_hole_y,case_z]) standoff(normal_standoff); + if(mode == "vim_heatsink") { + if (pcb_hole_x!=0 && pcb_hole_y!=0) { + normal_standoff = [top_standoff[0], + top_height+pcb_loc_z-3.25, + top_standoff[2], + top_standoff[3], + top_standoff[4], + top_standoff[5], + top_standoff[6], + top_standoff[7], + top_standoff[8], + top_standoff[9], + top_standoff[10]]; + translate([pcb_hole_x,pcb_hole_y,case_z]) standoff(normal_standoff); + } } + else { + if (pcb_hole_x!=0 && pcb_hole_y!=0) { + normal_standoff = [top_standoff[0], + top_height+pcb_loc_z, + top_standoff[2], + top_standoff[3], + top_standoff[4], + top_standoff[5], + top_standoff[6], + top_standoff[7], + top_standoff[8], + top_standoff[9], + top_standoff[10]]; + translate([pcb_hole_x,pcb_hole_y,case_z]) standoff(normal_standoff); + } + } } } // extended standoffs @@ -1258,34 +1276,58 @@ module case_top(case_design) { // standoff sidewall support if(sidewall_support == true && sbc_top_standoffs == true) { if(pcb_width/pcb_depth >= 1.4) { - translate([0,pcb_depth,0]) rotate([180,0,0]) { +// translate([0,pcb_depth,0]) rotate([180,0,0]) { for (i=[7:3:16]) { pcb_hole_x = sbc_data[s[0]][i]+pcb_loc_x; pcb_hole_y = sbc_data[s[0]][i+1]+pcb_loc_y; pcb_hole_size = sbc_data[s[0]][i+2]; - if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 7 || i == 13) { - translate([pcb_hole_x-1, pcb_hole_y-(top_standoff[0]/2)-(gap-adjust)-1.4, - -case_z]) cube([2,gap+1.6,top_height]); + if(mode == "vim_heatsink") { + if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 7 || i == 13) { + translate([pcb_hole_x-1, pcb_hole_y-(top_standoff[0]/2)-(gap-adjust)-1.4, + case_z-(top_height-3.25)]) cube([2,gap+1.6,top_height-3.25]); + } + if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 10 || i == 16) { + translate([pcb_hole_x-1, pcb_hole_y+(top_standoff[0]/2)-.6+adjust,case_z-(top_height-3.25)]) + cube([2,gap+1.6,top_height-3.25]); + } } - if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 10 || i == 16) { - translate([pcb_hole_x-1, pcb_hole_y+(top_standoff[0]/2)-.6+adjust,-case_z]) - cube([2,gap+1.6,top_height]); + else { + if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 7 || i == 13) { + translate([pcb_hole_x-1, pcb_hole_y-(top_standoff[0]/2)-(gap-adjust)-1.4, + case_z-top_height]) cube([2,gap+1.6,top_height]); + } + if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 10 || i == 16) { + translate([pcb_hole_x-1, pcb_hole_y+(top_standoff[0]/2)-.6+adjust,case_z-top_height]) + cube([2,gap+1.6,top_height]); + } } } - } +// } } else { for (i=[7:3:16]) { pcb_hole_x = sbc_data[s[0]][i]+pcb_loc_x; pcb_hole_y = sbc_data[s[0]][i+1]+pcb_loc_y; pcb_hole_size = sbc_data[s[0]][i+2]; - if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 7 || i == 10) { - translate([pcb_hole_x+pcb_loc_x-(top_standoff[0]/2)-gap-adjust-.45,pcb_hole_y-1, - bottom_height+adjust]) cube([gap+adjust+1,2,top_height]); + if(mode == "vim_heatsink") { + if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 7 || i == 10) { + translate([pcb_hole_x+pcb_loc_x-(top_standoff[0]/2)-gap-adjust-.45,pcb_hole_y-1, + bottom_height+adjust]) cube([gap+adjust+1,2,top_height-3.25]); + } + if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 13 || i == 16) { + translate([pcb_hole_x+pcb_loc_x+(top_standoff[0]/2)-adjust-.45,pcb_hole_y-1, + bottom_height+adjust]) cube([gap+adjust+1,2,top_height-3.25]); + } } - if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 13 || i == 16) { - translate([pcb_hole_x+pcb_loc_x+(top_standoff[0]/2)-adjust-.45,pcb_hole_y-1, - bottom_height+adjust]) cube([gap+adjust+1,2,top_height]); + else{ + if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 7 || i == 10) { + translate([pcb_hole_x+pcb_loc_x-(top_standoff[0]/2)-gap-adjust-.45,pcb_hole_y-1, + bottom_height]) cube([gap+adjust+1,2,top_height]); + } + if (pcb_hole_x!=0 && pcb_hole_y!=0 && i == 13 || i == 16) { + translate([pcb_hole_x+pcb_loc_x+(top_standoff[0]/2)-adjust-.45,pcb_hole_y-1, + bottom_height]) cube([gap+adjust+1,2,top_height]); + } } } } diff --git a/sbc_case_builder_accessories.cfg b/sbc_case_builder_accessories.cfg index 1426e0c..ca8bf52 100644 --- a/sbc_case_builder_accessories.cfg +++ b/sbc_case_builder_accessories.cfg @@ -1157,159 +1157,159 @@ accessory_data = [ "add2","standoff",61.5,52.5,0,"bottom",[0,0,0],40,0,6,2,0,"",[6.75,4,3.2,10,4,1,0,0,0,4.5,5.1]], ["vim1_shell", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim1_panel", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim1_stacked", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim1_tray", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim1_tray_sides", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim1_round", "suball","rectangle",4.5,-26,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,10,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim1_hex", "suball","rectangle",4.5,-20,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,20,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim1_snap", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim1_fitted", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_shell", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_panel", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_stacked", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_tray", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_tray_sides", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_round", "suball","rectangle",4.5,-26,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,10,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_hex", "suball","rectangle",4.5,-20,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,20,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_snap", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim2_fitted", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_shell", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_panel", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_stacked", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_tray", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_tray_sides", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_round", "suball","rectangle",4.5,-26,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,10,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_hex", "suball","rectangle",4.5,-20,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,20,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_snap", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3l_fitted", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_shell", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_panel", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_stacked", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_tray", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_tray_sides", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_round", "suball","rectangle",4.5,-26,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,10,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_hex", "suball","rectangle",4.5,-20,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,20,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_snap", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim3_fitted", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_shell", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_panel", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_stacked", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_tray", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_tray_sides", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_round", "suball","rectangle",4.5,-26,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,10,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_hex", "suball","rectangle",4.5,-20,5.5,"top",[0,0,0],11,20,8,0,0,"vertical",[1,1,1,1], // sub hdmi opening "suball","rectangle",21.5,-26,4,"top",[0,0,0],21,20,15.5,0,0,"vertical",[1,1,1,1], // sub hdmi opening - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,19.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_snap", - "sub","fan",10,10,23.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["vim4_fitted", - "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening + "sub","fan",10,10,20.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening ["tinkerboard_shell", "sub","fan",10,10,24.5,"top",[0,0,0],40,0,6,2,0,"",0], // sub fan opening diff --git a/sbc_case_builder_library.scad b/sbc_case_builder_library.scad index 11f204a..e9b32f9 100644 --- a/sbc_case_builder_library.scad +++ b/sbc_case_builder_library.scad @@ -2752,19 +2752,19 @@ module mask(loc_x,loc_y,loc_z,rotation,side,class,type,wallthick,gap,floorthick, place(loc_x-1,loc_y-3,loc_z-1.25,8,3,rotation,side) microusb_open(); } // double stack usb opening - if(type == "double_stacked_a" && rotation == 0) { + if((type == "double_stacked_a" || type == "double_stacked_usb3-usbc") && rotation == 0) { place(loc_x-1,loc_y-6,loc_z,15.5,16,rotation,side) cube([15.5,8,16.5]); } - if(type == "double_stacked_a" && rotation == 90) { + if((type == "double_stacked_a" || type == "double_stacked_usb3-usbc") && rotation == 90) { place(loc_x-6,loc_y-1.25,loc_z,15.5,16,rotation,side) cube([15.5,8,16.5]); } - if(type == "double_stacked_a" && rotation == 180) { + if((type == "double_stacked_a" || type == "double_stacked_usb3-usbc") && rotation == 180) { place(loc_x-1,loc_y+7.5,loc_z,15.5,16,rotation,side) cube([15.5,8,16.5]); } - if(type == "double_stacked_a" && rotation == 270) { + if((type == "double_stacked_a" || type == "double_stacked_usb3-usbc") && rotation == 270) { place(loc_x+6.25,loc_y-1,loc_z,15.5,16,rotation,side) cube([15.5,8,16.5]); }