fixed z axis parametric problem related to calculated bottom standoff height, more case cleanup and other fixes and changes

lib/fans.scad

@@ -46,7 +46,8 @@ module fans(style, mask) {
                 ["box92x10", 92, 10, 82.5, 4.3, 40, "#353535"],
                 ["box80x25", 80, 25, 72.5, 4.3, 35, "#353535"],
                 ["box80x10", 80, 10, 72.5, 4.3, 35, "#353535"],
-                ["box60x10", 60, 10, 50, 4.3, 35, "#353535"],
+                ["box60x25", 60, 25, 50, 4.3, 30, "#353535"],
+                ["box60x10", 60, 10, 50, 4.3, 30, "#353535"],
                 ["box50x10", 60, 10, 40, 4.3, 20, "#353535"],
                 ["box40x10", 40, 10, 32, 4.3, 18, "#353535"],
                 ["box30x10", 30, 10, 24, 3.2, 12, "#353535"]

mod/add.scad

@@ -110,7 +110,7 @@ module add(type, loc_x, loc_y, loc_z, face, rotation, size, data, mask) {
         translate([loc_x,loc_y,loc_z]) rotate(rotation) keyhole(data[0],mask); 
     }
     if(type == "nut_holder") {
-        translate([loc_x,loc_y,loc_z]) rotate(rotation) nut_holder(data[0], data[1], size_x, size_y, size_z); 
+        translate([loc_x,loc_y,loc_z]) rotate(rotation) nut_holder(data[0], data[1], size_x, size_y, size_z, mask); 
     }
     if(type == "pcb_holder") {
         translate([loc_x,loc_y,loc_z]) rotate(rotation) pcb_holder([size_x,size_y,size_z],data[0]);
@@ -158,7 +158,7 @@ module add(type, loc_x, loc_y, loc_z, face, rotation, size, data, mask) {
         translate([loc_x,loc_y,loc_z]) rotate(rotation) hk_boom(data[0],data[1],mask); 
     }
     if(type == "hk_boom_speaker") {
-        translate([loc_x,loc_y,loc_z]) rotate(rotation) hk_boom_speaker(data[1],true,data[0],mask); 
+        translate([loc_x,loc_y,loc_z]) rotate(rotation) hk_boom_speaker(mask); 
     }
     if(type == "hk_boom_speaker_pcb") {
         translate([loc_x,loc_y,loc_z]) rotate(rotation) hk_boom_speaker_pcb(data[1],true,data[0],mask); 

mod/case_adapter.scad

@@ -359,7 +359,7 @@ module io_plate() {
 
     io_window_x = case_design == "adapter_mini-stx" ? 123.95 : 158.75;
     io_window_y = 4;
-    io_window_z = case_design == "adapter_mini-stx" ? 40 : 44;
+    io_window_z = case_design == "adapter_mini-stx" ? 40 : case_design == "adapter_thin-mini-stx" ? 25 : 44;
     io_offset = case_design == "adapter_mini-stx" ? 1.2 : 10.79;
 
     difference() {
@@ -368,7 +368,7 @@ module io_plate() {
             cube([io_window_x,4,io_window_z]);
         }
         translate([2,-2,2]) cube([io_window_x-4,5,io_window_z-4]);
-        translate([io_offset,6,bottom_height-pcb_z+pcb_loc_z+2]) 
+        translate([io_offset+pcb_loc_x,6+pcb_loc_y,bottom_height-pcb_z+pcb_loc_z+2]) 
             sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, true);
         // subtractive accessories
         if(accessory_name != "none") {

mod/case_bottom.scad

@@ -483,7 +483,7 @@ module case_bottom(case_design) {
                         if (pcbhole_pos == "left_rear" && bottom_rear_left_enable == true) {
                             bottom_support = bottom_sidewall_support == true ? bottom_rear_left_support : "none";
                             normal_standoff = [bottom_standoff[0],
-                                                bottom_height-case_offset_bz-pcb_z+pcb_loc_z+bottom_rear_left_adjust,
+                                                bottom_height-pcb_z+pcb_loc_z+bottom_rear_left_adjust,
                                                 bottom_standoff[2],
                                                 bottom_standoff[3],
                                                 bottom_standoff[4],
@@ -499,7 +499,7 @@ module case_bottom(case_design) {
                         if (pcbhole_pos == "left_front" && bottom_front_left_enable == true) {
                             bottom_support = bottom_sidewall_support == true ? bottom_front_left_support : "none";
                             normal_standoff = [bottom_standoff[0],
-                                                bottom_height-case_offset_bz-pcb_z+pcb_loc_z+bottom_front_left_adjust,
+                                                bottom_height-pcb_z+pcb_loc_z+bottom_front_left_adjust,
                                                 bottom_standoff[2],
                                                 bottom_standoff[3],
                                                 bottom_standoff[4],
@@ -515,7 +515,7 @@ module case_bottom(case_design) {
                         if (pcbhole_pos == "right_rear" && bottom_rear_right_enable == true) {
                             bottom_support = bottom_sidewall_support == true ? bottom_rear_right_support : "none";
                             normal_standoff = [bottom_standoff[0],
-                                                bottom_height-case_offset_bz-pcb_z+pcb_loc_z+bottom_rear_right_adjust,
+                                                bottom_height-pcb_z+pcb_loc_z+bottom_rear_right_adjust,
                                                 bottom_standoff[2],
                                                 bottom_standoff[3],
                                                 bottom_standoff[4],
@@ -531,7 +531,7 @@ module case_bottom(case_design) {
                         if (pcbhole_pos == "right_front" && bottom_front_right_enable == true) {
                             bottom_support = bottom_sidewall_support == true ? bottom_front_right_support : "none";
                             normal_standoff = [bottom_standoff[0],
-                                                bottom_height-case_offset_bz-pcb_z+pcb_loc_z+bottom_front_right_adjust,
+                                                bottom_height-pcb_z+pcb_loc_z+bottom_front_right_adjust,
                                                 bottom_standoff[2],
                                                 bottom_standoff[3],
                                                 bottom_standoff[4],
@@ -689,11 +689,11 @@ module case_bottom(case_design) {
         }
         // sbc openings
         if(sbc_highlight == true) {
-            #translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z-adj]) 
+            #translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj]) 
                 sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, true);
         }
         else {
-            translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z-adj]) 
+            translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj]) 
                 sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, true);
         }
         // indents
@@ -709,6 +709,7 @@ module case_bottom(case_design) {
                 side = sbc_data[s[0]][i+7];
                 rotation = sbc_data[s[0]][i+8];
 
+//                indent(loc_x, loc_y, bottom_height+pcb_loc_z-adj, rotation[2], side, class, type, wallthick, gap, floorthick, pcb_z);
                 indent(loc_x, loc_y, bottom_height+pcb_loc_z-adj, rotation[2], side, class, type, wallthick, gap, floorthick, pcb_z);
             }   
         }

mod/case_side.scad

@@ -257,11 +257,11 @@ module case_side(case_design, side) {
         }
         // sbc openings
         if(sbc_highlight == true) {
-            #translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z-adj]) 
+            #translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj-adj]) 
                 sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, true);
         }
         else {
-            translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z-adj]) 
+            translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj-adj]) 
                 sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, true);
         }
         // indents

mod/case_top.scad

@@ -405,7 +405,7 @@ module case_top(case_design) {
                         if (pcbhole_pos == "left_rear" && top_rear_left_enable == true) {
                             top_support = top_sidewall_support == true ? top_rear_left_support : "none";
                             normal_standoff = [top_standoff[0],
-                                                top_height+case_offset_bz-pcb_loc_z+top_rear_left_adjust,
+                                                top_height+top_rear_left_adjust-pcb_loc_z,
                                                 top_standoff[2],
                                                 top_standoff[3],
                                                 top_standoff[4],
@@ -421,7 +421,7 @@ module case_top(case_design) {
                         if (pcbhole_pos == "left_front" && top_front_left_enable == true) {
                             top_support = top_sidewall_support == true ? top_front_left_support : "none";
                             normal_standoff = [top_standoff[0],
-                                                top_height+case_offset_bz-pcb_loc_z+top_front_left_adjust,
+                                                top_height+top_front_left_adjust-pcb_loc_z,
                                                 top_standoff[2],
                                                 top_standoff[3],
                                                 top_standoff[4],
@@ -437,7 +437,7 @@ module case_top(case_design) {
                         if (pcbhole_pos == "right_rear" && top_rear_right_enable == true) {
                             top_support = top_sidewall_support == true ? top_rear_right_support : "none";
                             normal_standoff = [top_standoff[0],
-                                                top_height+case_offset_bz-pcb_loc_z+top_rear_right_adjust,
+                                                top_height+top_rear_right_adjust-pcb_loc_z,
                                                 top_standoff[2],
                                                 top_standoff[3],
                                                 top_standoff[4],
@@ -453,7 +453,7 @@ module case_top(case_design) {
                         if (pcbhole_pos == "right_front" && top_front_right_enable == true) {
                             top_support = top_sidewall_support == true ? top_front_right_support : "none";
                             normal_standoff = [top_standoff[0],
-                                                top_height+case_offset_bz-pcb_loc_z+top_front_right_adjust,
+                                                top_height+top_front_right_adjust-pcb_loc_z,
                                                 top_standoff[2],
                                                 top_standoff[3],
                                                 top_standoff[4],
@@ -590,11 +590,11 @@ module case_top(case_design) {
         }
         // sbc openings
         if(sbc_highlight == true) {
-            #translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z-adj]) 
+            #translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj]) 
                 sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, true);
         }
         else {
-            translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z-adj]) 
+            translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj]) 
                 sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, true);
         }
         // indents

mod/parametric_move.scad

@@ -74,7 +74,7 @@ module parametric_move_add(type, loc_x, loc_y, loc_z, face, rotation, parametric
             add(type, loc_x, loc_y, loc_z, face, rotation, size, data, mask);
         }
         if(parametric[0] == "sbc") {
-            add(type, loc_x, loc_y, loc_z+pcb_loc_z, face, rotation, size, data, mask);
+            add(type, loc_x, loc_y, loc_z+pcb_loc_z+case_offset_bz, face, rotation, size, data, mask);
         }
         if(parametric[0] == "sbc-case_z" && face == "top") {
             add(type, loc_x, loc_y, loc_z+case_offset_tz+case_offset_bz, face, rotation, size, data, mask);
@@ -104,7 +104,7 @@ module parametric_move_add(type, loc_x, loc_y, loc_z, face, rotation, parametric
             add(type, loc_x+case_offset_x, loc_y, loc_z, face, rotation, size, data, mask);
         }
         if(parametric[0] == "sbc") {
-            add(type, loc_x+pcb_loc_x, loc_y, loc_z+pcb_loc_z, face, rotation, size, data, mask);
+            add(type, loc_x+pcb_loc_x, loc_y, loc_z+pcb_loc_z+case_offset_bz, face, rotation, size, data, mask);
         }
         if(parametric[0] == "sbc-case_z" && face == "top") {
             add(type, loc_x+pcb_loc_x, loc_y, loc_z+case_offset_tz+case_offset_bz, face, rotation, size, data, mask);
@@ -125,7 +125,7 @@ module parametric_move_add(type, loc_x, loc_y, loc_z, face, rotation, parametric
             add(type, loc_x, loc_y+case_offset_y, loc_z, face, rotation, size, data, mask);
         }
         if(parametric[0] == "sbc") {
-            add(type, loc_x, loc_y+pcb_loc_y, loc_z+pcb_loc_z, face, rotation, size, data, mask);
+            add(type, loc_x, loc_y+pcb_loc_y, loc_z+pcb_loc_z+case_offset_bz, face, rotation, size, data, mask);
         }
         if(parametric[0] == "sbc-case_z" && face == "top") {
             add(type, loc_x,loc_y+pcb_loc_y, loc_z+case_offset_tz+case_offset_bz, face, rotation, size, data, mask);
@@ -146,7 +146,7 @@ module parametric_move_add(type, loc_x, loc_y, loc_z, face, rotation, parametric
             add(type, loc_x+case_offset_x, loc_y+case_offset_y, loc_z, face, rotation, size, data, mask);
         }
         if(parametric[0] == "sbc") {
-            add(type, loc_x+pcb_loc_x, loc_y+pcb_loc_y, loc_z+pcb_loc_z, face, rotation, size, data, mask);
+            add(type, loc_x+pcb_loc_x, loc_y+pcb_loc_y, loc_z+pcb_loc_z+case_offset_bz, face, rotation, size, data, mask);
         }
         if(parametric[0] == "sbc-case_z" && face == "top") {
             add(type, loc_x+pcb_loc_x, loc_y+pcb_loc_y, loc_z+case_offset_tz+case_offset_bz, face, rotation, size, data, mask);

sbc_case_builder.scad

@@ -65,6 +65,12 @@ bottom_clearence = 3.5; //[-10:.01:10]
 // enable flat blank section for export
 flat_blank_section =  false;
 
+/* [Standard Motherboard Case Settings] */
+// adjustment for atx, micro-atx, dtx, flex-atx, mini-dtx, mini-itx, mini-stx, nano-itx,nuc, pico-itx PCB thickness from 2mm default//
+standard_motherboard_thickness =  0; //[-3:.01:3]
+// rear io plate opening for standard form motherboards
+rear_io_plate = false;
+
 /* [3D Case Adjustments] */
 // sbc location x axis
 pcb_loc_x = 0; //[0:.01:300]
@@ -179,13 +185,19 @@ access_panel_orientation = "landscape"; //[landscape,portrait]
 access_panel_location = [10,15]; //[-10:.01:200]
 access_panel_rotation = 0; //[0:90:270]
 
-/* [GPIO and UART] */
+/* [Options and Accessories] */
 // gpio opening
 gpio_opening = "default"; // [default,none,open,block,knockout,vent]
 // uart opening
 uart_opening = "default"; // [default,none,open,knockout]
 // enable indentations around io openings
 indents = true;
+// case accessory group to load
+accessory_name = "none"; // ["none", "hk_uart", "sensors", "c4_shell_boombox", "c4_desktop_lcd3.5", "c4_deskboom_lcd3.5", "c4_panel_boombox", "c4_panel_lcd3.5", "c4_tray_boombox", "c4_round", "c4_hex", "xu4_keyhole", "hc4_tray_drivebox2.5", "hc4_shell_drivebox2.5", "hc4_shell_drivebox2.5v", "hc4_shell_drivebox3.5", "m1s_shell_nvme", "m1s_shell_ups", "m1s_tray_nvme", "m1_tray_ssd", "m1_fitted_pizzabox2.5", "m1_fitted_pizzabox3.5", "h3_shell", "h3_shell_router", "h3_lowboy", "h3_lowboy_router", "h3_ultimate", "h3_ultimate2", "show2_shell", "jetsonnano_shell", "jetsonnano_panel", "jetsonnano_stacked", "jetsonnano_tray", "jetsonnano_tray_sides", "rock5b", "visionfive2_shell", "visionfive2_stacked", "visionfive2_tray", "adapter_mini-stx_m1s"]
+// sbc information text color
+text_color = "Green"; // [Green, Black, Dimgrey, White, Yellow, Orange, Red, DarkbBlue]
+// sbc information text font
+text_font = "Nimbus Mono PS"; // [Nimbus Mono PS, Liberation Mono, Noto Sans Mono]
 
 /* [Extended Top Standoffs] */
 // enable case extended standoffs
@@ -252,19 +264,6 @@ ext_bottom_front_right_enable = true;
 ext_bottom_front_right_adjust = 0; //[-20:.01:20]
 ext_bottom_front_right_support = "front"; //[none,left,rear,front,right]
 
-/* [Accessories and Options] */
-// adjustment for atx, micro-atx, dtx, flex-atx, mini-dtx, mini-itx, mini-stx, nano-itx,nuc, pico-itx PCB thickness from 2mm default//
-standard_motherboard_thickness =  0; //[-3:.01:3]
-// rear io plate opening for standard form motherboards
-rear_io_plate = false;
-
-// case accessory group to load
-accessory_name = "none"; // ["none", "hk_uart", "sensors", "c4_shell_boombox", "c4_desktop_lcd3.5", "c4_deskboom_lcd3.5", "c4_panel_boombox", "c4_panel_lcd3.5", "c4_tray_boombox", "c4_round", "c4_hex", "xu4_keyhole", "hc4_tray_drivebox2.5", "hc4_shell_drivebox2.5", "hc4_shell_drivebox2.5v", "hc4_shell_drivebox3.5", "m1s_shell_nvme", "m1s_shell_ups", "m1s_tray_nvme", "m1_tray_ssd", "m1_fitted_drivebox2.5", "m1_fitted_drivebox3.5", "m1_fitted_pizzabox", "m1_fitted_drivebox3.5v", "h3_shell", "h3_tallboy-ssd", "h3_shell_router", "h3_shell_router-ssd", "h3_lowboy", "h3_lowboy_router", "h3_tray_router", "h3_router_station", "h3_ultimate", "h3_ultimate2", "h3_shell_drivebox2.5v", "show2_shell", "jetsonnano_shell", "jetsonnano_panel", "jetsonnano_stacked", "jetsonnano_tray", "jetsonnano_tray_sides", "rock5b", "visionfive2_shell", "visionfive2_stacked", "visionfive2_tray",adapter_mini-stx_m1s]
-
-text_color = "Green"; // [Green, Black, Dimgrey, White, Yellow, Orange, Red, DarkbBlue]
-text_font = "Nimbus Mono PS"; // [Nimbus Mono PS, Liberation Mono, Noto Sans Mono]
-
-
 a = search([accessory_name],accessory_data);
 s = search([sbc_model],sbc_data);
 
@@ -280,7 +279,7 @@ pcb_radius = sbc_data[s[0]][11][0];
 pcb_z = sbc_model == "atx" || sbc_model == "micro-atx" || sbc_model == "dtx" || sbc_model == "flex-atx" || sbc_model == "mini-dtx" || sbc_model == "mini-itx" || sbc_model == "mini-stx" || sbc_model == "nano-itx" || sbc_model == "nuc" || sbc_model == "pico-itx" ? pcb_z_orig + standard_motherboard_thickness : pcb_z_orig;
 width = pcb_width+2*(wallthick+gap)+case_offset_x;
 depth = pcb_depth+2*(wallthick+gap)+case_offset_y;
-top_height = pcb_tmaxz+floorthick+case_offset_tz;
+top_height = pcb_tmaxz+floorthick+case_offset_tz+pcb_loc_z;
 bottom_height = (case_design == "tray" || case_design == "tray_vu5" || case_design == "tray_vu7" || case_design == "tray_sides") ? pcb_z+pcb_bmaxz+floorthick+case_offset_bz+4 : pcb_z+pcb_bmaxz+floorthick+case_offset_bz;
 case_z = bottom_height+top_height;
 case_diameter = sqrt(pow(width-wallthick-gap,2)+pow(depth-wallthick-gap,2));
@@ -486,7 +485,7 @@ if (view == "model") {
                 }
             }
             if(sbc_off == false) {
-                translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z])
+                translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z])
                     sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, false);
             }
             if(raise_top >= 0) {
@@ -516,7 +515,7 @@ if (view == "model") {
                 color("dimgrey",1) translate([0,0,-lower_bottom]) case_bottom(case_design);
             }
             if(sbc_off == false) {
-                translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z])
+                translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z])
                     sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, false);
             }
             if(raise_top >= 0) {
@@ -556,7 +555,7 @@ if (view == "model") {
                             cube([width+2,gap+wallthick+1.01,case_z+2]);
                     }
                     if(move_front < 0) {
-                        translate([-gap-wallthick-1,depth-gap-wallthick-2.01,-lower_bottom]) 
+                        translate([-gap-wallthick-1,depth-2*(gap+wallthick)-1.01,-lower_bottom]) 
                             cube([width+2,gap+wallthick+1.01,case_z+2]);
                     }
                     if(move_leftside < 0) {
@@ -564,13 +563,13 @@ if (view == "model") {
                             cube([gap+wallthick+1.01,depth+2,case_z+2]);
                     }
                     if(move_rightside < 0) {
-                        translate([width-gap-wallthick-2.01,-gap-wallthick-1,-lower_bottom]) 
+                        translate([width-(2*wallthick)-adj-1.01,-gap-wallthick-1,-lower_bottom]) 
                             cube([gap+wallthick+1,depth+2,case_z+2]);
                     }
                 }
             }
             if(sbc_off == false) {
-                translate([pcb_loc_x,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z])
+                translate([pcb_loc_x,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj])
                     sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, false);
             }
             if(raise_top >= 0) {
@@ -644,7 +643,7 @@ if (view == "model") {
                 color("dimgrey",1) translate([0,0,-lower_bottom]) case_bottom(case_design);
             }
             if(sbc_off == false) {
-                translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z])
+                translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj])
                     sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, false);
             }
             if(raise_top >= 0) {
@@ -660,21 +659,21 @@ if (view == "model") {
                             cube([width+2,gap+wallthick+1.01,case_z+2]);
                     }
                     if(move_front < 0) {
-                        translate([-gap-wallthick-1,depth-gap-wallthick-2.01,-lower_bottom]) 
-                            cube([width+2,gap+wallthick+1.01,case_z+2]);
+                        translate([-gap-wallthick-1,depth-2*(wallthick+gap)-adj,-lower_bottom]) 
+                            cube([width+2,2*(gap+wallthick)+adj,case_z+2]);
                     }
                     if(move_leftside < 0) {
                         translate([-gap-wallthick-1,-gap-wallthick-1,-lower_bottom]) 
                             cube([gap+wallthick+1.01,depth+2,case_z+2]);
                     }
                     if(move_rightside < 0) {
-                        translate([width-gap-wallthick-2.01,-gap-wallthick-1,-lower_bottom]) 
+                        translate([width-2*(wallthick+gap)-adj,-gap-wallthick-1,-lower_bottom]) 
                             cube([gap+wallthick+1,depth+2,case_z+2]);
                     }
                 }
             }
             if(sbc_off == false) {
-                translate([pcb_loc_x ,pcb_loc_y,bottom_height-case_offset_bz-pcb_z+pcb_loc_z])
+                translate([pcb_loc_x ,pcb_loc_y,bottom_height-pcb_z+pcb_loc_z-adj])
                     sbc(sbc_model, cooling, fan_size, gpio_opening, uart_opening, false);
             }
             if(raise_top >= 0) {

sbc_case_builder_accessories.cfg

@@ -146,9 +146,9 @@ accessory_data = [
      "add2","hk_uart_holder",10,0,1.9,"bottom",[0,0,0],["case",false,false,false],[10,10,0],[0],[true,10,2,"default"],
      "model","hk_uart",12.5,22,5,"bottom",[0,0,270],["case",false,false,false],[10,10,0],[0],[false,10,2,"default"],
      "model","hk_uart_strap",25,15,5,"bottom",[0,0,90],["case",false,false,false],[0,0,0],[0],[false,10,2,"default"],
-     "model","hk_boom",32.25,68,4,"bottom",[90,0,0],["case",false,false,false],[0,0,0],[true,"front"],[true,10,2,"default"],
+//     "model","hk_boom",32.25,68,4,"bottom",[90,0,0],["case",false,false,false],[0,0,0],[true,"front"],[true,10,2,"default"],
      "model","hk_boom_vring",76.75,64.5,31,"bottom",[90,0,0],["case",false,false,false],[0,0,0],[0],[false,10,2,"default"],
-     "model","hk_lcd35",95,56,31,"bottom",[0,0,180],["case",false,false,false],[0,0,0],[0],[true,10,2,"default"],
+     "model","hk_lcd35",106.25,55,22.5,"bottom",[0,0,180],["sbc",false,false,true],[0,0,0],[0],[true,10,2,"default"],
      "platter","hk_uart_strap",-35,75,-9,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[0],[false,10,2,"default"],
      "platter","hk_boom_vring",-60,100,0,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[0],[false,10,2,"default"]],
 
@@ -175,16 +175,16 @@ accessory_data = [
     
      ["c4_tray_boombox",
      "sub","vent",44,59,12,"bottom",[0,0,0],["case",false,true,false],[2,10,4],[1,10,"vertical",1],[false,10,2,"default"],
-     "add2","standoff",28.5,3.5,0,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[[5.75,16,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
-     "add2","standoff",28.5,56.25,0,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[[5.75,16,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",28.5,3.5,0,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[[5.75,13,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",28.5,56.25,0,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[[5.75,13,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
      "add2","hk_boom_speaker_holder",16.75,54.6,17.5,"bottom",[90,0,180],["case",false,true,false],[0,0,0],["friction",0],[false,10,2,"default"],
      "add2","hk_boom_speaker_holder",108.25,54.6,17.5,"bottom",[90,0,180],["case",false,true,false],[0,0,0],["friction",0],[false,10,2,"default"],
      "add2","hk_boom_grill",16.75,59,17.5,"bottom",[90,0,180],["case",false,true,false],[0,0,0],["dome"],[false,10,2,"default"],
      "add2","hk_boom_grill",108.25,59,17.5,"bottom",[90,0,180],["case",false,true,false],[0,0,0],["dome"],[false,10,2,"default"],
-     "model","hk_boom_speaker",16.75,56,17.5,"bottom",[270,0,0],["case",false,true,false],[0,0,0],[false,"left"],[false,10,2,"default"],
-     "model","hk_boom_speaker",108.25,56,17.5,"bottom",[270,0,0],["case",false,true,false],[0,0,0],[false,"right"],[false,10,2,"default"],
-     "model","hk_boom",32,0,16,"bottom",[0,0,90],["case",false,false,false],[0,0,0],[false,"none"],[true,10,2,"pcb"],
-     "model","hk_boom_vring",5,44.5,20,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[0],[false,10,2,"default"],
+     "model","hk_boom_speaker",16.75,56,17.5,"bottom",[270,0,0],["case",false,true,false],[0,0,0],[false,"left"],[true,10,2,"default"],
+     "model","hk_boom_speaker",108.25,56,17.5,"bottom",[270,0,0],["case",false,true,false],[0,0,0],[false,"right"],[true,10,2,"default"],
+     "model","hk_boom",32,0,13,"bottom",[0,0,90],["case",false,false,false],[0,0,0],[false,"none"],[true,10,2,"pcb"],
+     "model","hk_boom_vring",5,44.5,16.5,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[0],[false,10,2,"default"],
      "platter","hk_boom_vring",-50,0,0,"bottom",[0,0,0],["case",false,false,false],[0,0,0],[0],[false,10,2,"default"]],
 
      ["c4_round",
@@ -202,59 +202,63 @@ accessory_data = [
      // Odroid-HC4
      ["hc4_tray_drivebox2.5",
      "add2","hk_hc4_oled_holder",20,82,1.99,"bottom",[0,0,0],["case",false,true,false],[0,0,2],[0],[true,10,2,"default"],
-     "add2","hd_holder",10,-24,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait"],[false,10,2,"default"],
-     "suball","fan_mask",37,-.1,7,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["fan_open"],[false,10,2,"default"],
-     "suball","vent",72,87,27,"bottom",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
      "model","hk_hc4_oled",20,82,2,"bottom",[0,0,0],["case",false,true,false],[0,0,0],[0],[false,10,2,"default"],
+     "suball","vent",72,87,27,"bottom",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
+     "model","fan",24.25,35,3,"bottom",[0,0,0],["sbc",true,true,false],[40,0,3],["box40x10"],[false,10,2,"default"],
+     "add2","hd_holder",10,-24,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait"],[false,10,2,"default"],
      "model","hd25",10,-24,2,"bottom",[0,0,0],["case",true,true,false],[0,0,0],["portrait",15],[true,17,2,"both"],
      "model","hd25",10,-24,20,"bottom",[0,0,0],["case",true,true,false],[0,0,0],["portrait",15],[true,17,2,"default"],
+     "model","fan",5.25,10,7.5,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["box40x10"],[true,10,-6,"fan_open"],
      "model","fan_cover",37,-4,7,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["fan_1"],[false,10,2,"default"],
      "platter","fan_cover",-50,50,0,"bottom",[0,0,0],["case",false,false,false],[40,0,3],["fan_1"],[false,10,2,"default"]],
      
      ["hc4_shell_drivebox2.5",
      "add2","hk_hc4_oled_holder",20,82,1.99,"bottom",[0,0,0],["case",false,true,false],[0,0,2],[0],[true,10,2,"default"],
-     "add2","hd_holder",12,-21,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait"],[false,10,2,"default"],
+     "model","hk_hc4_oled",20,82,1.99,"bottom",[0,0,0],["case",false,true,false],[0,0,0],[0],[false,10,2,"default"],
+     "model","fan",24.25,35,3,"bottom",[0,0,0],["sbc",true,true,false],[40,0,3],["box40x10"],[false,10,2,"default"],
      "sub","vent",71.85,88,30,"top",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
-     "suball","fan_mask",39,-.1,7,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["fan_open"],[false,10,2,"default"],
      "sub","vent",-3.5,35,34,"top",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",92,35,34,"top",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",-3.5,35,9,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",92,35,9,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "model","hk_hc4_oled",20,82,1.99,"bottom",[0,0,0],["case",false,true,false],[0,0,0],[0],[false,10,2,"default"],
+     "add2","hd_holder",12,-21,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait"],[false,10,2,"default"],
      "model","hd25",12,-21,2,"bottom",[0,0,0],["case",true,true,false],[0,0,0],["portrait",15],[true,20,2,"both"],
      "model","hd25",12,-21,20,"bottom",[0,0,0],["case",true,true,false],[0,0,0],["portrait",15],[true,20,2,"default"],
-     "model","fan_cover",39,-4,7,"top",[90,0,0],["case",true,false,false],[40,0,3],["fan_1"],[false,10,2,"default"],
+     "model","fan",39,10,7.5,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["box40x10"],[true,10,-6,"fan_open"],
+     "model","fan_cover",39,-4,7.5,"top",[90,0,0],["case",true,false,false],[40,0,3],["fan_1"],[false,10,2,"default"],
      "platter","fan_cover",-50,50,0,"bottom",[0,0,0],["case",false,false,false],[40,0,3],["fan_1"],[false,10,2,"default"]],
      
      ["hc4_shell_drivebox2.5v",
-     "add2","hd_holder",45.6,-21,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","right"],[false,10,2,"default"],
-     "add2","hd_holder",79.6,-21,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left",3],[false,10,2,"default"],
-//     "sub","hd_holes",45.6,-21,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","right",3],[false,10,2,"default"],
-//     "sub","hd_holes",79.6,-21,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left",3],[false,10,2,"default"],
-     "sub","round",91.3,-5,6.07,"bottom",[0,90,0],["case",true,true,false],[3,0,6],[0],[false,10,2,"default"],
-     "sub","round",91.3,71.6,6.07,"bottom",[0,90,0],["case",true,true,false],[3,0,6],[0],[false,10,2,"default"],
-     "sub","vent",71.85,88,30,"top",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
-     "sub","fan_mask",45.6,-.1,30,"top",[90,0,0],["case",true,false,false],[40,0,3],["fan_open"],[false,10,2,"default"],
+     "add2","hd_holder",47,-21,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","right"],[false,10,2,"default"],
+     "add2","hd_holder",81,-21,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left",3],[false,10,2,"default"],
+     "model","hd25",47,-21,71.85,"bottom",[0,90,0],["case",true,true,false],[0,0,0],["portrait",15],[true,10,2,"default"],
+     "model","hd25",81,-21,2,"bottom",[0,270,0],["case",true,true,false],[0,0,0],["portrait",15],[true,18,2,"both"],
+     "model","fan",24.25,35,3,"bottom",[0,0,0],["sbc",true,true,false],[40,0,3],["box40x10"],[false,10,2,"default"],
+     "sub","vent",72,88,30,"top",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
+     "sub","vent",-3.5,35,34,"top",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",92,35,34,"top",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",-3.5,35,9,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",92,35,9,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "add1","hk_hc4_oled_holder",20,82,1.99,"bottom",[0,0,0],["case",false,true,false],[0,0,2],[0],[true,10,2,"default"],
      "model","hk_hc4_oled",20,82,1.99,"bottom",[0,0,0],["case",false,true,false],[0,0,0],[0],[false,10,2,"default"],
-     "model","fan_cover",46.6,-3,30,"top",[90,0,0],["case",true,false,false],[40,0,3],["fan_1"],[false,10,2,"default"],
-     "model","hd25",45.6,79,71.85,"bottom",[-90,0,-90],["case",true,true,false],[0,0,0],["portrait",15],[true,10,2,"default"],
-     "model","hd25",79.3,79,2,"bottom",[90,0,-90],["case",true,true,false],[0,0,0],["portrait",15],[true,10,2,"default"],
+     "model","fan",40,10,30,"top",[90,0,0],["case",true,false,false],[40,0,3],["box40x10"],[true,10,-6,"fan_open"],
+     "model","fan_cover",40,-3,30,"top",[90,0,0],["case",true,false,false],[40,0,3],["fan_1"],[false,10,2,"default"],
      "platter","fan_cover",-50,50,0,"bottom",[0,0,0],["case",false,false,false],[40,0,3],["fan_1"],[false,10,2,"default"]],
      
      ["hc4_shell_drivebox3.5",
      "add1","hk_hc4_oled_holder",20,82,3,"bottom",[0,0,0],["case",false,true,false],[0,0,3],[0],[true,10,2,"default"],
-     "add2","hd_holder",-19.4,-67,3,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[3.5,"portrait"],[false,10,2,"default"],
-//     "sub","hd_holes",-19.4,-67,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[3.5,"portrait","horizontal","none",3],[false,10,2,"default"],
-     "sub","round",91.6,-38.5,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",91.6,3.4,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",91.6,63.1,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "suball","vent",72,88,29,"bottom",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
-     "suball","fan_mask",5.6,-1.5,7,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["fan_open"],[false,10,2,"default"],
      "model","hk_hc4_oled",20,82,1.99,"bottom",[0,0,0],["case",false,true,false],[0,0,0],[0],[false,10,2,"default"],
-     "model","hd35",-19.4,80,3,"bottom",[0,0,-90],["case",true,true,false],[0,0,0],["portrait"],[true,10,2,"default"],
-     "model","hd35",-19.4,80,35,"bottom",[0,0,-90],["case",true,true,false],[0,0,0],["portrait"],[true,10,2,"default"],
-     "model","fan_cover",5.6,-4,7,"top",[90,0,0],["case",true,false,false],[40,0,3],["fan_1"],[false,10,2,"default"],
+     "suball","vent",72,88,29,"bottom",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
+     "sub","vent",-4.5,35,34,"top",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",92,35,34,"top",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",-4.5,35,9,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",92,35,9,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "model","fan",24.25,35,3,"bottom",[0,0,0],["sbc",true,true,false],[40,0,3],["box40x10"],[false,10,2,"default"],
+     "add2","hd_holder",-21,-67,3,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[3.5,"portrait"],[false,10,2,"default"],
+     "model","hd35",-21,-67,3,"bottom",[0,0,0],["case",true,true,false],[0,0,0],["portrait"],[true,20,2,"both"],
+     "model","hd35",-21,-67,35,"bottom",[0,0,0],["case",true,true,false],[0,0,0],["portrait"],[true,20,2,"default"],
+     "model","fan_cover",5.5,-4,7,"top",[90,0,0],["case",true,false,false],[40,0,3],["fan_1"],[false,10,2,"default"],
+     "model","fan",5.25,10,7.5,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["box40x10"],[true,10,-6,"fan_open"],
      "platter","fan_cover",-50,50,0,"bottom",[0,0,0],["case",false,false,false],[40,0,3],["fan_1"],[false,10,2,"default"]],
 
      // Odroid-M1S
@@ -294,74 +298,32 @@ accessory_data = [
 
      // Odroid-M1
      ["m1_tray_ssd",
-//     "add2","button",60,118.5,37.7,"top",[0,0,0],["sbc-case_z",false,false,true],[10,0,18.5],["recess"],[true,10,2,"default"],
-//     "model","button_assembly",60,118.5,37.7,"top",[0,0,0],["sbc-case_z",false,false,true],[10,0,18.5],["recess"],[false,10,2,"default"],
-//     "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,11],["recess"],[false,10,2,"default"],
-//     "sub","hd_holes",10,22,35,"top",[0,0,0],["sbc-case_z",true,true,true],[0,0,0],[2.5,"portrait","horizontal","none",3],[false,10,2,"default"],
-     "model","hd25",80,122,35.5,"top",[0,180,90],["sbc-case_z",true,true,true],[0,0,0],["portrait",7],[true,10,2,"default"],
+     "model","hd25",80,22,35.5,"top",[0,180,0],["sbc-case_z",true,true,true],[0,0,0],["portrait",7],[true,10,2,"bottom"],
      "sub","vent",94.5,32,10,"top",[0,0,90],["case",true,false,false],[2,15,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",-6.5,32,10,"top",[0,0,90],["case",false,false,false],[2,15,4],[1,17,"vertical",1],[false,10,2,"default"]],
 
-     ["m1_fitted_drivebox2.5",
-     "add2","hd_holder",10,20,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait"],[false,10,2,"default"],
-//     "sub","hd_holes",10,20,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","horizontal","none",3],[false,10,2,"default"],
-     "sub","round",92,34,5,"bottom",[0,90,0],["case",true,true,false],[3,0,3],[0],[false,10,2,"default"],
-     "sub","round",92,110.6,5,"bottom",[0,90,0],["case",true,true,false],[3,0,3],[0],[false,10,2,"default"],
-     "sub","round",92,34,23,"bottom",[0,90,0],["case",true,true,false],[3,0,3],[0],[false,10,2,"default"],
-     "sub","round",92,110.6,23,"bottom",[0,90,0],["case",true,true,false],[3,0,3],[0],[false,10,2,"default"],
-     "suball","fan_mask",39,-1,7,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["fan_open"],[false,10,2,"default"],
-     "sub","vent",-3.75,25,30,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",92,25,30,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.75,25,9,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",92,25,9,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "model","hd25",10,120,2,"bottom",[0,0,-90],["case",true,true,false],[0,0,0],["portrait",15],[true,10,2,"default"],
-     "model","hd25",10,120,20,"bottom",[0,0,-90],["case",true,true,false],[0,0,0],["portrait",15],[true,10,2,"default"],
-     "model","fan_cover",39,-4,7,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["fan_hex"],[false,10,2,"default"],
-     "platter","fan_cover",-50,50,0,"bottom",[0,0,0],["case",false,false,false],[40,0,3],["fan_hex"],[false,10,2,"default"]],
-     
-     ["m1_fitted_drivebox3.5",
-     "add2","hd_holder",-19.4,-27,2.49,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[3.5,"portrait"],[false,10,2,"default"],
-//     "sub","hd_holes",-19.4,-27,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[3.5,"portrait","horizontal","none",3],[false,10,2,"default"],
-     "sub","round",91.6,1.5,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",91.6,43.4,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",91.6,103.1,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","vent",-3.75,60,40,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",92,60,40,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.75,60,20,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",92,60,20,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "suball","vent",29,126,29,"bottom",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
-     "suball","fan_mask",5.6,-1.5,7,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["fan_open"],[false,10,2,"default"],
-     "model","hd35",-19.4,120,2.49,"bottom",[0,0,-90],["case",true,true,false],[0,0,0],["portrait"],[true,10,2,"default"],
-     "model","hd35",-19.4,120,34.5,"bottom",[0,0,-90],["case",true,true,false],[0,0,0],["portrait"],[true,10,2,"default"],
-     "model","fan_cover",5.6,-4,7,"bottom",[90,0,0],["case",true,false,false],[40,0,3],["fan_hex"],[false,10,2,"default"],
-     "platter","fan_cover",-50,50,0,"bottom",[0,0,0],["case",false,false,false],[40,0,3],["fan_hex"],[false,10,2,"default"]],
+    ["m1_fitted_pizzabox2.5",
+     "sub","vent",-3.75,30,9,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",93,30,9,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "model","fan",10,1,25,"top",[0,0,0],["case",true,true,true],[0,0,0],["box60x10"],[true,10,-10,"fan_hex"],
+     "add2","standoff",22,36,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",22,112.5,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",83.5,36,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",83.5,112.5,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "model","hd25",18,22,5,"bottom",[0,0,0],["case",true,true,false],[0,0,0],["portrait",15],[true,10,2,"bottom"]],
 
-     ["m1_fitted_pizzabox",
-//     "sub","hd_holes",-12,-27,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[3.5,"portrait","horizontal","none",3],[false,10,2,"default"],
-     "sub","round",91.6,1.5,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",91.6,43.4,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",91.6,103.1,9.35,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
+    ["m1_fitted_pizzabox3.5",
      "sub","vent",-3.75,60,9,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",92,60,9,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "suball","vent",-89,126,15,"bottom",[0,0,0],["case",true,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
-     "suball","fan_mask",-30,60,48,"top",[0,0,0],["case",true,false,false],[80,0,3],["fan_open"],[false,10,2,"default"],
-     "model","hd35",-12,120,2.5,"bottom",[0,0,-90],["case",true,true,false],[0,0,0],["portrait"],[true,10,2,"default"]],
-
-     ["m1_fitted_drivebox3.5v",
-     "add2","hd_holder",80,-27,2.49,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[3.5,"portrait","vertical","left"],[false,10,2,"default"],
-//     "sub","hd_holes",80,-27,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[3.5,"portrait","vertical","left",3],[false,10,2,"default"],
-     "sub","round",91.6,14.5,6,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",91.6,58.55,6,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",91.6,90.1,6,"bottom",[0,90,0],["case",true,true,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","vent",-3.75,60,40,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",92,60,40,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.75,60,20,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",92,60,20,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "suball","vent",29,126,29,"bottom",[0,0,0],["case",false,true,false],[2,13,4],[1,4,"vertical",1],[false,10,2,"default"],
-     "suball","fan_mask",5.6,-1.5,35,"bottom",[90,0,0],["case",true,false,false],[60,0,3],["fan_open"],[false,10,2,"default"],
-     "model","hd35",80,120,2.5,"bottom",[90,0,-90],["case",true,true,false],[0,0,0],["portrait"],[true,10,2,"default"],
-     "model","fan_cover",5.6,-4,35,"bottom",[90,0,0],["case",true,false,false],[60,0,3],["fan_hex"],[false,10,2,"default"],
-     "platter","fan_cover",-50,50,0,"bottom",[0,0,0],["case",false,false,false],[60,0,3],["fan_hex"],[false,10,2,"default"]],
+     "model","fan",-100,63,25,"top",[0,0,0],["case",true,true,true],[0,0,0],["box60x10"],[true,10,-10,"fan_hex"],
+     "add2","standoff",-8.75,14.25,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",-8.75,58.75,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",-8.75,90.5,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",86.5,14.25,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",86.5,58.75,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "add2","standoff",86.5,90.5,0,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[[5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"],
+     "model","hd35",-12,-27,5,"bottom",[0,0,0],["case",true,true,false],[0,0,0],["portrait"],[true,10,2,"bottom"]],
 
      // Odroid-H3
      ["h3_shell",
@@ -369,74 +331,35 @@ accessory_data = [
      "sub","vent",111.5,30,18,"top",[0,0,90],["case",true,false,true],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",-3.5,30,4,"bottom",[0,0,90],["case",false,false,true],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",111.5,30,4,"bottom",[0,0,90],["case",true,false,true],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "add2","batt_holder",98,40,55.25,"top",[180,0,-18],["sbc-case_z",true,true,true],[10,10,0],[0],[false,10,2,"default"],
+     "model","fan",7.5,20,43,"top",[0,0,0],["sbc-case_z",true,true,true],[0,0,0],["box80x10"],[true,10,-10,"fan_hex"],
+     "add2","batt_holder",101,40,55.25,"top",[180,0,-18],["sbc-case_z",true,true,true],[10,10,0],[0],[false,10,2,"default"],
      "add2","button",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[true,10,2,"default"],
      "add2","button",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[true,10,2,"default"],
-     "model","button_assembly",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[false,10,2,"default"],
-     "model","button_assembly",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[false,10,2,"default"],
-     "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,32],["recess"],[false,10,2,"default"],
-     "platter","button_assembly",-30,0,0,"top",[0,0,0],["case",false,false,false],[10,0,32],["recess"],[false,10,2,"default"]],
-
-     ["h3_tallboy-ssd",
-     "sub","vent",-3.5,30,58,"top",[0,0,90],["case",false,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",111.5,30,58,"top",[0,0,90],["case",true,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.5,30,28,"top",[0,0,90],["case",false,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",111.5,30,28,"top",[0,0,90],["case",true,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.5,30,4,"bottom",[0,0,90],["case",false,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",111.5,30,4,"bottom",[0,0,90],["case",true,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "add2","button",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,53],["recess"],[true,10,2,"default"],
-     "add2","button",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,53],["recess"],[true,10,2,"default"],
-     "model","button_assembly",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,58],["recess"],[false,10,2,"default"],
-     "model","button_assembly",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,58],["recess"],[false,10,2,"default"],
-     "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,58],["recess"],[false,10,2,"default"],
-     "platter","button_assembly",-30,0,0,"top",[0,0,0],["case",false,false,false],[10,0,58],["recess"],[false,10,2,"default"],
-     "sub","round",111,34,6.07,"bottom",[0,90,0],["case",true,false,false],[3,0,3],[0],[false,10,2,"default"],
-     "sub","round",111,110.6,6.07,"bottom",[0,90,0],["case",true,false,false],[3,0,3],[0],[false,10,2,"default"],
-     "add2","hd_holder",98,10,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left"],[false,10,2,"default"],
-//     "sub","hd_holes",98,10,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left",3],[false,10,2,"default"],
-     "model","hd25",98,110,2,"bottom",[90,0,-90],["case",true,true,false],[0,0,0],["portrait",7],[true,10,2,"default"]],
+     "model","button_assembly",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,36.5],["recess"],[false,10,2,"default"],
+     "model","button_assembly",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,36.5],["recess"],[false,10,2,"default"],
+     "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,36.5],["recess"],[false,10,2,"default"],
+     "platter","button_assembly",-30,0,0,"top",[0,0,0],["case",false,false,false],[10,0,36.5],["recess"],[false,10,2,"default"]],
 
      ["h3_shell_router",
      "sub","vent",-3.5,30,40,"top",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",111.5,30,40,"top",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",-3.5,30,4,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",111.5,30,4,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "add2","batt_holder",98,40,65.25,"top",[180,0,-18],["sbc",true,true,true],[10,10,0],[0],[false,10,2,"default"],
+     "model","hk_netcard",0,0,9,"bottom",[0,0,0],["sbc",true,true,true],[0,0,0],["portrait"],[true,10,2,"default"],
      "add2","button",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[true,10,2,"default"],
      "add2","button",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[true,10,2,"default"],
      "model","button_assembly",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[false,10,2,"default"],
      "model","button_assembly",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[false,10,2,"default"],
-     "model","hk_netcard",0,0,19,"bottom",[0,0,0],["sbc",true,true,true],[0,0,0],["portrait"],[true,10,2,"default"],
      "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,32],["recess"],[false,10,2,"default"],
      "platter","button_assembly",-30,0,0,"top",[0,0,0],["case",false,false,false],[10,0,32],["recess"],[false,10,2,"default"]],
-     
-     ["h3_shell_router-ssd",
-     "sub","vent",111.5,30,40,"top",[0,0,90],["case",true,false,false],[2,15,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.5,30,4,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.5,30,40,"top",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",111.5,30,4,"bottom",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","round",111,44,6.07,"bottom",[0,90,0],["case",true,false,false],[3,0,4],[0],[false,10,2,"default"],
-     "sub","round",111,120.6,6.07,"bottom",[0,90,0],["case",true,false,false],[3,0,4],[0],[false,10,2,"default"],
-     "add2","batt_holder",98,40,75.25,"top",[180,0,-18],["sbc",true,true,true],[10,10,0],[0],[false,10,2,"default"],
-     "add2","button",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,42],["recess"],[true,10,2,"default"],
-     "add2","button",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,42],["recess"],[true,10,2,"default"],
-     "model","button_assembly",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,42],["recess"],[false,10,2,"default"],
-     "model","button_assembly",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,42],["recess"],[false,10,2,"default"],
-     "model","hk_netcard",0,0,19,"bottom",[0,0,0],["sbc",true,true,true],[0,0,0],["portrait"],[true,10,2,"default"],
-     "add2","hd_holder",101,10,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left"],[false,10,2,"default"],
-//     "sub","hd_holes",101,10,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left",3],[false,10,2,"default"],
-     "model","hd25",101,110,2,"bottom",[90,0,-90],["case",true,true,false],[0,0,0],["portrait",7],[true,10,2,"default"],
-     "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,42],["recess"],[false,10,2,"default"],
-     "platter","button_assembly",-30,0,0,"top",[0,0,0],["case",false,false,false],[10,0,42],["recess"],[false,10,2,"default"]],
 
       ["h3_lowboy",
      "sub","rectangle",94.5,-4,32,"top",[0,0,0],["sbc-case_z",true,true,true],[14,24.5,35],[[.25,.25,.25,.25]],[false,10,2,"default"],
      "sub","rectangle",68,-4,32,"top",[0,0,0],["sbc-case_z",true,true,true],[19.5,21.5,35],[[.25,.25,.25,.25]],[false,10,2,"default"],
      "sub","rectangle",44.5,-4,32,"top",[0,0,0],["sbc-case_z",true,true,true],[20.5,31,35],[[.25,.25,.25,.25]],[false,10,2,"default"],
      "sub","rectangle",19.5,-4,32,"top",[0,0,0],["sbc-case_z",true,true,true],[20.5,31,35],[[.25,.25,.25,.25]],[false,10,2,"default"],
-     "sub","rectangle",9.5,26.5,50,"top",[0,0,0],["sbc-case_z",true,true,true],[79.5,74.5,5],[[.25,.25,.25,.25]],[false,10,2,"default"],
-     "sub","vent",-3.5,30,18,"top",[0,0,90],["case",false,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",111.5,30,18,"top",[0,0,90],["case",true,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",-3.5,30,24,"top",[0,0,90],["case",false,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "sub","vent",111.5,30,24,"top",[0,0,90],["case",true,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",-3.5,30,4,"bottom",[0,0,90],["case",false,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",111.5,30,4,"bottom",[0,0,90],["case",true,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
      "add2","button",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,11],["recess"],[true,10,2,"default"],
@@ -451,7 +374,6 @@ accessory_data = [
      "sub","rectangle",68,-4,32,"top",[0,0,0],["sbc-case_z",true,true,true],[19.5,21.5,35],[[.25,.25,.25,.25]],[false,10,2,"default"],
      "sub","rectangle",44.5,-4,32,"top",[0,0,0],["sbc-case_z",true,true,true],[20.5,31,35],[[.25,.25,.25,.25]],[false,10,2,"default"],
      "sub","rectangle",19.5,-4,32,"top",[0,0,0],["sbc-case_z",true,true,true],[20.5,31,35],[[.25,.25,.25,.25]],[false,10,2,"default"],
-     "sub","rectangle",9.5,26.5,50,"top",[0,0,0],["sbc-case_z",true,true,true],[79.5,74.5,5],[[.25,.25,.25,.25]],[false,10,2,"default"],
      "sub","vent",-3.5,30,30,"top",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",111.5,30,30,"top",[0,0,90],["case",true,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",-3.5,30,4,"bottom",[0,0,90],["case",false,false,false],[2,10,4],[1,17,"vertical",1],[false,10,2,"default"],
@@ -460,30 +382,10 @@ accessory_data = [
      "add2","button",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,11],["recess"],[true,10,2,"default"],
      "model","button_assembly",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,11],["recess"],[false,10,2,"default"],
      "model","button_assembly",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,11],["recess"],[false,10,2,"default"],
-     "model","hk_netcard",0,0,19,"bottom",[0,0,0],["sbc",true,true,true],[0,0,0],["portrait"],[true,10,2,"default"],
+     "model","hk_netcard",0,0,9,"bottom",[0,0,0],["sbc",true,true,true],[0,0,0],["portrait"],[true,10,2,"default"],
      "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,11],["recess"],[false,10,2,"default"],
      "platter","button_assembly",-30,0,0,"top",[0,0,0],["case",false,false,false],[10,0,11],["recess"],[false,10,2,"default"]],
 
-     ["h3_tray_router",
-     "suball","vent",-6.5,30,45,"top",[0,0,90],["case",false,false,false],[2,10,7],[1,17,"vertical",1],[false,10,2,"default"],
-     "suball","vent",111.5,30,45,"top",[0,0,90],["case",true,false,false],[2,10,7],[1,17,"vertical",1],[false,10,2,"default"],
-     "suball","vent",-6.5,30,6,"top",[0,0,90],["case",false,false,false],[2,10,7],[1,17,"vertical",1],[false,10,2,"default"],
-     "suball","vent",111.5,30,6,"top",[0,0,90],["case",true,false,false],[2,10,7],[1,17,"vertical",1],[false,10,2,"default"],
-     "add2","button",12.34,106.43,59.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[true,10,2,"default"],
-     "add2","button",23.77,106.43,59.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[true,10,2,"default"],
-     "model","button_assembly",12.34,106.43,59.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[false,10,2,"default"],
-     "model","button_assembly",23.77,106.43,59.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,32],["recess"],[false,10,2,"default"],
-     "model","hk_netcard",0,0,19,"bottom",[0,0,0],["sbc",true,true,true],[0,0,0],["portrait"],[true,10,2,"default"],
-     "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,44],["recess"],[false,10,2,"default"], 
-     "platter","button_assembly",-30,0,0,"top",[0,0,0],["case",false,false,false],[10,0,44],["recess"],[false,10,2,"default"]],
-
-     ["h3_router_station",
-     "suball","vent",-6.5,30,45,"left",[0,0,90],["case",false,false,false],[2,10,7],[1,17,"vertical",1],[false,10,2,"default"],
-     "suball","vent",112,30,45,"right",[0,0,90],["case",true,false,false],[2,10,7],[1,17,"vertical",1],[false,10,2,"default"],
-     "suball","vent",-6.5,30,6,"left",[0,0,90],["case",false,false,false],[2,10,7],[1,17,"vertical",1],[false,10,2,"default"],
-     "suball","vent",112,30,6,"right",[0,0,90],["case",true,false,false],[2,10,7],[1,17,"vertical",1],[false,10,2,"default"],
-     "model","hk_netcard",0,0,19,"bottom",[0,0,0],["sbc",true,true,true],[0,0,0],["portrait"],[true,10,2,"default"]],
-
      ["h3_ultimate",
      "sub","vent",-3.5,30,58,"top",[0,0,90],["case",false,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",111.5,30,58,"top",[0,0,90],["case",true,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
@@ -491,29 +393,23 @@ accessory_data = [
      "sub","vent",111.5,30,28,"top",[0,0,90],["case",true,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",-3.5,30,4,"bottom",[0,0,90],["case",false,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
      "sub","vent",111.5,30,4,"bottom",[0,0,90],["case",true,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
+     "model","fan",7.5,20,28,"top",[0,0,0],["sbc-case_z",true,true,true],[0,0,0],["box80x25"],[true,25,-25,"fan_hex"],
      "model","hk_pwr_button",20,110,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[0,0,0],[0],[true,10,2,"default"],
-     "sub","round",111,34,6.07,"bottom",[0,90,0],["case",true,false,false],[3,0,6],[0],[false,10,2,"default"],
-     "sub","round",111,110.5,6.07,"bottom",[0,90,0],["case",true,false,false],[3,0,6],[0],[false,10,2,"default"],
      "add2","hd_holder",98,10,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left"],[false,10,2,"default"],
-//     "sub","hd_holes",98,10,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left",3],[false,10,2,"default"],
-     "model","hd25",98,110,2,"bottom",[90,0,-90],["case",true,true,false],[0,0,0],["portrait",7],[true,10,2,"default"]],
+     "model","hd25",98,10,2,"bottom",[0,270,0],["case",true,true,false],[0,0,0],["portrait",7],[true,19,2,"both"]],
 
      ["h3_ultimate2",
-     "suball","fan_mask",0,25,3,"top",[0,270,0],["case",false,false,false],[60,0,6],["fan_open"],[false,10,2,"default"],
+     "model","fan",24,25,3,"bottom",[0,270,0],["case",false,false,false],[0,0,0],["box60x25"],[true,25,-25,"fan_open"],
      "model","fan_cover",-4,25,3,"top",[0,270,0],["case",false,false,false],[60,0,2],["fan_hex"],[false,10,2,"default"],
      "platter","fan_cover",-100,150,0,"top",[0,0,0],["case",false,false,false],[60,0,2],["fan_hex"],[false,10,2,"default"],
      // side panel
      "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],[false,10,2,"default"],
      "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],[false,10,2,"default"],
      "suball","rectangle",111,26.77,62,"top",[0,90,0],["case",true,false,false],[58,77.43,4],[[2,2,2,2]],[false,10,2,"default"],
-     "sub","round",111,16.57,57,"top",[0,90,0],["case",true,false,false],[7,0,4],[0],[false,10,2,"default"],
-     "sub","round",111,16.57,9,"bottom",[0,90,0],["case",true,false,false],[7,0,4],[0],[false,10,2,"default"],
-     "sub","round",111,114.4,57,"top",[0,90,0],["case",true,false,false],[7,0,4],[0],[false,10,2,"default"],
-     "sub","round",111,114.4,9,"bottom",[0,90,0],["case",true,false,false],[7,0,4],[0],[false,10,2,"default"],
-     "add2","nut_holder",144,16.57,57,"top",[0,270,0],["case",false,false,false],[8,16,5],["m3","sloped"],[false,10,2,"default"],
-     "add2","nut_holder",144,16.57,9 ,"bottom",[0,270,0],["case",false,false,false],[8,16,5],["m3","sloped"],[false,10,2,"default"],
-     "add2","nut_holder",144,114.4,57,"top",[0,270,0],["case",false,false,false],[8,16,5],["m3","sloped"],[false,10,2,"default"],
-     "add2","nut_holder",144,114.4,9 ,"bottom",[0,270,0],["case",false,false,false],[8,16,5],["m3","sloped"],[false,10,2,"default"],
+     "add2","nut_holder",144,16.57,57,"top",[0,270,0],["case",false,false,false],[8,16,5],["m3","sloped"],[true,10,4,"default"],
+     "add2","nut_holder",144,16.57,9 ,"bottom",[0,270,0],["case",false,false,false],[8,16,5],["m3","sloped"],[true,10,4,"default"],
+     "add2","nut_holder",144,114.4,57,"top",[0,270,0],["case",false,false,false],[8,16,5],["m3","sloped"],[true,10,4,"default"],
+     "add2","nut_holder",144,114.4,9 ,"bottom",[0,270,0],["case",false,false,false],[8,16,5],["m3","sloped"],[true,10,4,"default"],
      // clearence trim
      "sub","rectangle",100.5,17,25,"top",[0,0,0],["sbc-case_z",true,true,true],[9,4,15],[[1,1,1,1]],[false,10,2,"default"],
      // front wall support
@@ -542,28 +438,6 @@ accessory_data = [
      "model","hk_pwr_button",18,113,55.25,"top",[0,0,180],["case",false,false,true],[0,0,0],[0],[true,10,2,"default"],
      "model","dsub",18,-1,46,"top",[90,90,0],["case",false,false,false],[0,0,0],["db9","female"],[true,10,2,"default"]],
 
-     ["h3_shell_drivebox2.5v",
-     "sub","vent",-3.5,30,58,"top",[0,0,90],["case",false,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",111.5,30,58,"top",[0,0,90],["case",true,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.5,30,28,"top",[0,0,90],["case",false,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",111.5,30,28,"top",[0,0,90],["case",true,false,false],[2,12,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",-3.5,30,4,"bottom",[0,0,90],["case",false,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "sub","vent",111.5,30,4,"bottom",[0,0,90],["case",true,false,false],[2,6,4],[1,17,"vertical",1],[false,10,2,"default"],
-     "add2","button",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,53],["recess"],[true,10,2,"default"],
-     "add2","button",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,53],["recess"],[true,10,2,"default"],
-     "model","button_assembly",12.34,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,58],["recess"],[false,10,2,"default"],
-     "model","button_assembly",23.77,106.43,55.25,"top",[0,0,0],["sbc-case_z",true,true,true],[10,0,58],["recess"],[false,10,2,"default"],
-     "platter","button_assembly",-20,0,0,"top",[0,0,0],["case",false,false,false],[10,0,58],["recess"],[false,10,2,"default"],
-     "platter","button_assembly",-30,0,0,"top",[0,0,0],["case",false,false,false],[10,0,58],["recess"],[false,10,2,"default"],
-     "sub","round",111,24,6.07,"bottom",[0,90,0],["case",true,true,false],[3,0,3],[0],[false,10,2,"default"],
-     "sub","round",111,100.6,6.07,"bottom",[0,90,0],["case",true,true,false],[3,0,3],[0],[false,10,2,"default"],
-     "add2","hd_holder",100,10,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left"],[false,10,2,"default"],
-     "add2","hd_holder",65,10,1.99,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","right"],[false,10,2,"default"],
-//     "sub","hd_holes",100,10,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","left",3],[false,10,2,"default"],
-//     "sub","hd_holes",65,10,-.01,"bottom",[0,0,0],["case",true,true,false],[0,0,0],[2.5,"portrait","vertical","right",3],[false,10,2,"default"],
-     "model","hd25",65,110,71.85,"bottom",[-90,0,-90],["case",true,true,false],[0,0,0],["portrait",15],[true,10,2,"default"],
-     "model","hd25",100,110,2,"bottom",[90,0,-90],["case",true,true,false],[0,0,0],["portrait",15],[true,10,2,"default"]],
-
      ["show2_shell",
      "model","hk_wb2",6.25,24.675,16,"bottom",[0,0,180],["sbc",true,true,true],[0,0,0],[0],[false,10,2,"default"],
      "sub","rectangle",.5,8,8.5,"top",[0,0,0],["case",false,false,false],[6,16.5,8],[[.5,.5,.5,.5]],[false,10,2,"default"]],