Refactor hex vents into helper function

notebook_nueva/battery_holder.py

@@ -1,6 +1,6 @@
 import cadquery as cq
 
-from utils import extrude_shape, punch_hole, punch_hole2
+from utils import extrude_shape, punch_hole2, hex_vents
 
 stand_positions = [(3.5, 3.5), (61.5, 3.5), (61.5, 52.5), (3.5, 52.5)]
 stands = (
@@ -71,24 +71,7 @@ elements = [
 ]
 
 
-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),
-    }
-]
+vents = hex_vents(size=6, width=width, height=height)
 
 
 # Hole distances are relative to the rightmost pillar
@@ -124,43 +107,45 @@ def add(
     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,
-        )
+    if bottom_face:
+        # 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,
+            )
 
-    # Battery holder stands and pogo pin holder
-    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),
-        )
+        # Battery holder stands and pogo pin holder
+        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,
-        )
+    if back_face:
+        # 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

notebook_nueva/modelo.py

@@ -200,7 +200,7 @@ def model():
         offset_x=cpu_offset_x,
         offset_y=cpu_offset_y,
         bottom_face="<Z",
-        back_face=None,
+        back_face=None,  # Not exposing the holes
         shell_t=shell_t,
     )
 

notebook_nueva/utils.py

@@ -34,3 +34,23 @@ def punch_hole2(*, model, face, w, h, x_offset, y_offset, hole, depth):
         .placeSketch(hole["shape"])
         .cutBlind(-depth)
     )
+
+def hex_vents(*, size, width, height):
+    vent_positions = []
+    for x in range(1, width // size):
+        for y in range(1, int(height // size / 0.8)):
+            vent_positions.append(
+                (
+                    (x + (y % 2) / 2) * size - size * 0.2,
+                    y * size * 0.8 + size * 0.2,
+                )
+            )
+    vents = [
+        {
+            "x": 0,
+            "y": 0,
+            "shape": cq.Sketch().push(vent_positions).regularPolygon((size) / 2, 6),
+        }
+    ]
+
+    return vents

notebook_nueva/zero_holder.py

@@ -1,6 +1,6 @@
 import cadquery as cq
 
-from utils import extrude_shape, punch_hole2
+from utils import extrude_shape, punch_hole2, hex_vents
 
 width = 65
 height = 30
@@ -42,26 +42,17 @@ elements = [
     },
 ]
 
-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 = [
+vents = hex_vents(size=6, width=width, height=height)
+
+holes = [
+    # One hole for everything TODO: improve
     {
-        "x": 0,
-        "y": 0,
-        "shape": cq.Sketch().push(vent_positions).regularPolygon((hex_size) / 2, 6),
+        "x": -width / 2,
+        "y": 1 + pillar_height,
+        "shape": cq.Sketch().trapezoid(50, 6, 90, mode="a").vertices().fillet(1),
     }
 ]
 
-holes = []  # TODO
-
 
 def add(
     *,
@@ -76,43 +67,45 @@ def add(
     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,
-        )
+    if bottom_face:
+        # 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),
-        )
+        # 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,
-        )
+    if back_face:
+        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