Refactor zero_holder to match battery_holder, added vents
This commit is contained in:
parent
d9749bc38e
commit
4f1b09ab95
@ -1,5 +1,6 @@
|
|||||||
import cadquery as cq
|
import cadquery as cq
|
||||||
from utils import punch_hole2, extrude_shape, punch_hole
|
|
||||||
|
from utils import extrude_shape, punch_hole, punch_hole2
|
||||||
|
|
||||||
stand_positions = [(3.5, 3.5), (61.5, 3.5), (61.5, 52.5), (3.5, 52.5)]
|
stand_positions = [(3.5, 3.5), (61.5, 3.5), (61.5, 52.5), (3.5, 52.5)]
|
||||||
stands = (
|
stands = (
|
||||||
@ -70,7 +71,7 @@ elements = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
hex_size = width // 13
|
hex_size = 6
|
||||||
vent_positions = []
|
vent_positions = []
|
||||||
for x in range(1, width // hex_size):
|
for x in range(1, width // hex_size):
|
||||||
for y in range(1, int(height // hex_size / 0.8)):
|
for y in range(1, int(height // hex_size / 0.8)):
|
||||||
@ -80,13 +81,12 @@ for x in range(1, width // hex_size):
|
|||||||
y * hex_size * 0.8 + hex_size * 0.2,
|
y * hex_size * 0.8 + hex_size * 0.2,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
vents = cq.Sketch().push(vent_positions).regularPolygon((hex_size) / 2, 6)
|
|
||||||
|
|
||||||
vents = [
|
vents = [
|
||||||
{
|
{
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
"shape": vents,
|
"shape": cq.Sketch().push(vent_positions).regularPolygon((hex_size) / 2, 6),
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
Binary file not shown.
@ -192,18 +192,17 @@ def model():
|
|||||||
depth=shell_t,
|
depth=shell_t,
|
||||||
)
|
)
|
||||||
|
|
||||||
# CPU holder stands
|
model = cpu_holder.add(
|
||||||
for element in cpu_holder.elements:
|
model=model,
|
||||||
model = extrude_shape(
|
width=width,
|
||||||
model=model,
|
height=height,
|
||||||
face="<Z",
|
thickness=thickness,
|
||||||
w=width,
|
offset_x=cpu_offset_x,
|
||||||
h=height,
|
offset_y=cpu_offset_y,
|
||||||
x_offset=cpu_offset_x + element["x"],
|
bottom_face="<Z",
|
||||||
y_offset=shell_t + cpu_offset_y + element["y"],
|
back_face=None,
|
||||||
shape=element["shape"],
|
shell_t=shell_t,
|
||||||
height=-(element["height"] + shell_t),
|
)
|
||||||
)
|
|
||||||
|
|
||||||
# This adds all the holes and extrusions for the battery system
|
# This adds all the holes and extrusions for the battery system
|
||||||
model = battery_holder.add(
|
model = battery_holder.add(
|
||||||
|
Binary file not shown.
@ -1,10 +1,18 @@
|
|||||||
import cadquery as cq
|
import cadquery as cq
|
||||||
|
|
||||||
positions = [(0, 0), (0, 23), (58, 23), (58, 0)]
|
from utils import extrude_shape, punch_hole2
|
||||||
|
|
||||||
stands = cq.Sketch().push(positions).circle(3, mode="a").circle(2.65 / 2, mode="s")
|
width = 65
|
||||||
|
height = 30
|
||||||
pillar_height = 7
|
pillar_height = 7
|
||||||
|
|
||||||
|
stand_positions = [(3.5, 3.5), (3.5, 26.5), (61.5, 26.5), (61.5, 3.5)]
|
||||||
|
|
||||||
|
stands = (
|
||||||
|
cq.Sketch().push(stand_positions).circle(3, mode="a").circle(2.65 / 2, mode="s")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
elements = [
|
elements = [
|
||||||
# CPU holder stands
|
# CPU holder stands
|
||||||
{
|
{
|
||||||
@ -12,5 +20,99 @@ elements = [
|
|||||||
"y": 0,
|
"y": 0,
|
||||||
"shape": stands,
|
"shape": stands,
|
||||||
"height": pillar_height,
|
"height": pillar_height,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"x": 0,
|
||||||
|
"y": 0,
|
||||||
|
"shape": cq.Sketch().push(stand_positions).circle(5),
|
||||||
|
"height": 0,
|
||||||
|
},
|
||||||
|
# Perimeter
|
||||||
|
{
|
||||||
|
"x": width / 2,
|
||||||
|
"y": height / 2,
|
||||||
|
"shape": (
|
||||||
|
cq.Sketch()
|
||||||
|
.trapezoid(width, height, 90, mode="a")
|
||||||
|
.trapezoid(width - 2, height - 2, 90, mode="s")
|
||||||
|
.vertices()
|
||||||
|
.fillet(3)
|
||||||
|
),
|
||||||
|
"height": 0.2,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
hex_size = 6
|
||||||
|
vent_positions = []
|
||||||
|
for x in range(1, width // hex_size):
|
||||||
|
for y in range(1, int(height // hex_size / 0.8)):
|
||||||
|
vent_positions.append(
|
||||||
|
(
|
||||||
|
(x + (y % 2) / 2) * hex_size - hex_size * 0.2,
|
||||||
|
y * hex_size * 0.8 + hex_size * 0.2,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
vents = [
|
||||||
|
{
|
||||||
|
"x": 0,
|
||||||
|
"y": 0,
|
||||||
|
"shape": cq.Sketch().push(vent_positions).regularPolygon((hex_size) / 2, 6),
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
holes = [] # TODO
|
||||||
|
|
||||||
|
|
||||||
|
def add(
|
||||||
|
*,
|
||||||
|
model,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
thickness,
|
||||||
|
offset_x,
|
||||||
|
offset_y,
|
||||||
|
bottom_face,
|
||||||
|
back_face,
|
||||||
|
shell_t
|
||||||
|
):
|
||||||
|
|
||||||
|
# Vents
|
||||||
|
for vent in vents:
|
||||||
|
model = punch_hole2(
|
||||||
|
model=model,
|
||||||
|
face=bottom_face,
|
||||||
|
w=width,
|
||||||
|
h=height,
|
||||||
|
x_offset=offset_x + vent["x"],
|
||||||
|
y_offset=shell_t + offset_y + vent["y"],
|
||||||
|
hole=vent,
|
||||||
|
depth=shell_t,
|
||||||
|
)
|
||||||
|
|
||||||
|
# CPU holder extrusions
|
||||||
|
for element in elements:
|
||||||
|
model = extrude_shape(
|
||||||
|
model=model,
|
||||||
|
face=bottom_face,
|
||||||
|
w=width,
|
||||||
|
h=height,
|
||||||
|
x_offset=offset_x + element["x"],
|
||||||
|
y_offset=shell_t + offset_y + element["y"],
|
||||||
|
shape=element["shape"],
|
||||||
|
height=-(element["height"] + shell_t),
|
||||||
|
)
|
||||||
|
|
||||||
|
# Holes
|
||||||
|
for hole in holes:
|
||||||
|
model = punch_hole2(
|
||||||
|
model=model,
|
||||||
|
face=back_face,
|
||||||
|
w=width,
|
||||||
|
h=thickness,
|
||||||
|
x_offset=width - offset_x,
|
||||||
|
y_offset=shell_t,
|
||||||
|
hole=hole,
|
||||||
|
depth=shell_t,
|
||||||
|
)
|
||||||
|
|
||||||
|
return model
|
||||||
|
Loading…
Reference in New Issue
Block a user