diff --git a/SBC_Model_Framework b/SBC_Model_Framework index 3cf4de2..26b19da 160000 --- a/SBC_Model_Framework +++ b/SBC_Model_Framework @@ -1 +1 @@ -Subproject commit 3cf4de2b5970cdf830fb1298d81fb17c613b68aa +Subproject commit 26b19dafc850510c6a432eb46768782342fb92bd diff --git a/sbc_case_builder.scad b/sbc_case_builder.scad index 440cc76..c4d506d 100644 --- a/sbc_case_builder.scad +++ b/sbc_case_builder.scad @@ -75,7 +75,7 @@ case_design = "shell"; // [shell,panel,stacked,tray,round,hex,snap,fitted] // base case style case_style = "none"; // ["none","vu5","vu7","sides"] // single board computer model -sbc_model = "c4"; // [c1+,c2,c4,xu4,xu4q,mc1,hc1,hc4,m1,n1,n2,n2+,h2,jetsonnano,show2,rockpro64,rpi3b+] +sbc_model = "c4"; // [c1+,c2,c4,xu4,xu4q,mc1,hc1,hc4,m1,n1,n2,n2+,h2,show2,rock64,rockpro64,jetsonnano,rpizero,rpi3a+,rpi3b+,rpi4b,rockpi4b+,rockpi4c+,test] // sbc location x axis pcb_loc_x = 0; //[0:.5:200] // sbc location y axis diff --git a/sbc_case_builder_library.scad b/sbc_case_builder_library.scad index ebab572..dbe11df 100644 --- a/sbc_case_builder_library.scad +++ b/sbc_case_builder_library.scad @@ -2475,22 +2475,6 @@ module mask(loc_x,loc_y,loc_z,rotation,side,class,type,wallthick,gap,floorthick, if(type == "hdmi_a" && side == "top" && rotation == 270) { place(loc_x+1,loc_y-.5,loc_z,15,11.5,rotation,side) hdmi_open(); } - // micro usb opening - if(class == "usb2" && type == "micro" && rotation == 0 && side == "top") { - place(loc_x,loc_y-3,loc_z,8,3,rotation,side) microusb_open(); - } - if(class == "usb2" && type == "micro" && rotation == 90 && side == "top") { - place(loc_x-3,loc_y-1,loc_z,8,3,rotation,side) microusb_open(); - } - if(class == "usb2" && type == "micro" && rotation == 180 && side == "top") { - place(loc_x-1,loc_y+4.5,loc_z,8,3,rotation,side) microusb_open(); - } - if(class == "usb2" && type == "micro" && rotation == 270 && side == "top") { - place(loc_x+4.5,loc_y,loc_z,8,3,rotation,side) microusb_open(); - } - if(class == "usb2" && type == "micro" && rotation == 0 && side == "bottom") { - place(loc_x-1,loc_y-3,loc_z-1.25,8,3,rotation,side) microusb_open(); - } // power plug openings if(type == "pwr5.5_7.5x11.5" && rotation == 0) { place(loc_x,loc_y,loc_z,7,7,rotation,side) @@ -2647,6 +2631,22 @@ module mask(loc_x,loc_y,loc_z,rotation,side,class,type,wallthick,gap,floorthick, place(loc_x+9,loc_y,loc_z,16,17.5,rotation,side) cube([16.5,8,14]); } + // micro usb opening + if(class == "usb2" && type == "micro" && rotation == 0 && side == "top") { + place(loc_x,loc_y-3,loc_z,8,3,rotation,side) microusb_open(); + } + if(class == "usb2" && type == "micro" && rotation == 90 && side == "top") { + place(loc_x-3,loc_y-1,loc_z,8,3,rotation,side) microusb_open(); + } + if(class == "usb2" && type == "micro" && rotation == 180 && side == "top") { + place(loc_x-1,loc_y+4.5,loc_z,8,3,rotation,side) microusb_open(); + } + if(class == "usb2" && type == "micro" && rotation == 270 && side == "top") { + place(loc_x+4.5,loc_y,loc_z,8,3,rotation,side) microusb_open(); + } + if(class == "usb2" && type == "micro" && rotation == 0 && side == "bottom") { + 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) { place(loc_x-1,loc_y-6,loc_z,15.5,16,rotation,side) @@ -2664,23 +2664,40 @@ module mask(loc_x,loc_y,loc_z,rotation,side,class,type,wallthick,gap,floorthick, place(loc_x+6.25,loc_y-1,loc_z,15.5,16,rotation,side) cube([15.5,8,16.5]); } - // single vert usb2 opening - if(type == "single_vert_a" && rotation == 0) { + // single vertical usb opening + if(type == "single_vertical_a" && rotation == 0) { place(loc_x-.5,loc_y-6,loc_z,6.5,19.5,rotation,side) cube([6.5,8,15]); } - if(type == "single_vert_a" && rotation == 90) { + if(type == "single_vertical_a" && rotation == 90) { place(loc_x-6,loc_y-.25,loc_z,6.5,19.5,rotation,side) cube([6.5,8,15]); } - if(type == "single_vert_a" && rotation == 180) { + if(type == "single_vertical_a" && rotation == 180) { place(loc_x-.5,loc_y+6,loc_z,6.5,19.5,rotation,side) cube([6.5,8,15]); } - if(type == "single_vert_a" && rotation == 270) { + if(type == "single_vertical_a" && rotation == 270) { place(loc_x+6.5,loc_y,loc_z,6.5,19.5,rotation,side) cube([6.5,8,15]); } + // single horizontal usb opening + if(type == "single_horizontal_a" && rotation == 0) { + place(loc_x-.5,loc_y-6,loc_z,7.5,19.5,rotation,side) + cube([15,8,7.5]); + } + if(type == "single_horizontal_a" && rotation == 90) { + place(loc_x-6,loc_y+7,loc_z,7.5,19.5,rotation,side) + cube([15,8,7.5]); + } + if(type == "single_horizontal_a" && rotation == 180) { + place(loc_x+7,loc_y+.5,loc_z,7.5,19.5,rotation,side) + cube([15,8,7.5]); + } + if(type == "single_horizontal_a" && rotation == 270) { + place(loc_x+.5,loc_y,loc_z,7.5,19.5,rotation,side) + cube([15,8,7.5]); + } // ir opening if(type == "ir_1" && rotation == 0) { place(loc_x,loc_y,loc_z,6,6,rotation,side)