From 1ef63e412df7847c9249fadc20e0e20a45133ac0 Mon Sep 17 00:00:00 2001 From: Edward Kisiel Date: Sat, 19 Oct 2024 19:52:18 -0400 Subject: [PATCH] changed pillar Z location and changed rpi hat to use pillars in accessories.cfg. --- lib/oem_rpi.scad | 16 ++++++++-------- mod/add.scad | 2 +- sbc_case_builder_accessories.cfg | 13 +++++++++---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/lib/oem_rpi.scad b/lib/oem_rpi.scad index 346f300..b0d5e90 100644 --- a/lib/oem_rpi.scad +++ b/lib/oem_rpi.scad @@ -74,13 +74,13 @@ module rpi_m2hat(mask) { [hole_size, "#fee5a6", hole_size+1], size_z, enablemask, [false, 20, 0, "default"]); pcbpad("round", size_x-hole_size, hole_size, 0, "top", 0, [1, 1, 0], [hole_size, "#fee5a6", hole_size+1], size_z, enablemask, [false, 20, 0, "default"]); - pillar("hex", hole_size-4, size_y-hole_size, 0, "bottom", 0, [4, 3, 16], - [0, "#fee5a6"], size_z, enablemask, [false, 20, 0, "default"]); - pillar("hex", size_x-hole_size-4, size_y-hole_size, 0, "bottom", 0, [4, 3, 16], - [0, "#fee5a6"], size_z, enablemask, [false, 20, 0, "default"]); - pillar("hex", hole_size-4, hole_size, 0, "bottom", 0, [4, 3, 16], - [0, "#fee5a6"], size_z, enablemask, [false, 20, 0, "default"]); - pillar("hex", size_x-hole_size-4, hole_size, 0, "bottom", 0, [4, 3, 16], - [0, "#fee5a6"], size_z, enablemask, [false, 20, 0, "default"]); +// pillar("hex", hole_size-4, size_y-hole_size, 0, "bottom", 0, [4, 3, 16], +// [0, "#fee5a6"], size_z, enablemask, [false, 20, 0, "default"]); +// pillar("hex", size_x-hole_size-4, size_y-hole_size, 0, "bottom", 0, [4, 3, 16], +// [0, "#fee5a6"], size_z, enablemask, [false, 20, 0, "default"]); +// pillar("hex", hole_size-4, hole_size, 0, "bottom", 0, [4, 3, 16], +// [0, "#fee5a6"], size_z, enablemask, [false, 20, 0, "default"]); +// pillar("hex", size_x-hole_size-4, hole_size, 0, "bottom", 0, [4, 3, 16], +// [0, "#fee5a6"], size_z, enablemask, [false, 20, 0, "default"]); } } \ No newline at end of file diff --git a/mod/add.scad b/mod/add.scad index bc5c417..8fa0ce4 100644 --- a/mod/add.scad +++ b/mod/add.scad @@ -203,7 +203,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_xu4_shifter_shield(mask); } if(type == "pillar") { - translate([loc_x,loc_y,loc_z]) rotate(rotation) pillar(data[0], 0, 0, 0, data[2], 0, size, data, pcb_z, false, mask); + translate([loc_x,loc_y,loc_z]) rotate(rotation) pillar(data[0], 0, 0, 0, data[2], 0, size, data, 0, false, mask); } if(type == "rpi_m2hat") { translate([loc_x,loc_y,loc_z]) rotate(rotation) rpi_m2hat(mask); diff --git a/sbc_case_builder_accessories.cfg b/sbc_case_builder_accessories.cfg index 0f1fb87..c769666 100644 --- a/sbc_case_builder_accessories.cfg +++ b/sbc_case_builder_accessories.cfg @@ -179,10 +179,10 @@ accessory_data = [ // Odroid-XU4 ["xu4_shifter_shield", - "model","pillar",3.5,3.5,7,"bottom",[0,0,0],["sbc",true,true,true],[5.75,3.4,19],["hex","silver","top"],[false,10,2,"default"], - "model","pillar",3.5,55.5,7,"bottom",[0,0,0],["sbc",true,true,true],[5.75,3.4,19],["hex","silver","top"],[false,10,2,"default"], - "model","pillar",79.5,3.5,7,"bottom",[0,0,0],["sbc",true,true,true],[5.75,3.4,19],["hex","silver","top"],[false,10,2,"default"], - "model","pillar",79.5,55.5,7,"bottom",[0,0,0],["sbc",true,true,true],[5.75,3.4,19],["hex","silver","top"],[false,10,2,"default"], + "model","pillar",3.5,3.5,8,"bottom",[0,0,0],["sbc",true,true,true],[4,3,19],["hex","silver","top"],[false,10,2,"default"], + "model","pillar",3.5,55.5,8,"bottom",[0,0,0],["sbc",true,true,true],[4,3,19],["hex","silver","top"],[false,10,2,"default"], + "model","pillar",79.5,3.5,8,"bottom",[0,0,0],["sbc",true,true,true],[4,3,19],["hex","silver","top"],[false,10,2,"default"], + "model","pillar",79.5,55.5,8,"bottom",[0,0,0],["sbc",true,true,true],[4,3,19],["hex","silver","top"],[false,10,2,"default"], "model","hk_xu4_shifter_shield",0,0,27,"bottom",[0,0,0],["sbc",true,true,true],[0,0,0],[0],[true,10,2,"default"]], ["xu4_keyhole", @@ -436,7 +436,12 @@ accessory_data = [ "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"]], + // RPI ["rpi5_m2hat", + "model","pillar",3.5,3.5,9.65,"bottom",[0,0,0],["sbc",true,true,true],[4,3,16],["hex","#fee5a6","top"],[false,10,2,"default"], + "model","pillar",3.5,52.5,9.65,"bottom",[0,0,0],["sbc",true,true,true],[4,3,16],["hex","#fee5a6","top"],[false,10,2,"default"], + "model","pillar",61.5,3.5,9.65,"bottom",[0,0,0],["sbc",true,true,true],[4,3,16],["hex","#fee5a6","top"],[false,10,2,"default"], + "model","pillar",61.5,52.5,9.65,"bottom",[0,0,0],["sbc",true,true,true],[4,3,16],["hex","#fee5a6","top"],[false,10,2,"default"], "model","rpi_m2hat",0,0,25.65,"top",[0,0,0],["sbc",true,true,true],[0,0,0],[0],[true,20,2,"default"]],