Move keyboard cable hole 6mm to the left

notebook_nueva/modelo.py

@@ -21,7 +21,9 @@ thickness = 20 + shell_t  # 20 inside
 ti_radius = 2.35
 ti_depth = 6.25
 
-pillars = (
+# Positions are determined by measuring the keyboard
+# mounting holes
+kbd_pillars = (
     cq.Sketch()
     .push(
         [
@@ -34,9 +36,30 @@ pillars = (
         ]
     )
     .circle(6, mode="a")
+    # Holes for M3 threaded inserts
     .circle(ti_radius, mode="s")
 )
 
+# These are placed where convenient, and are used to join the top and bottom
+# parts of the case.
+# Measured from top-left corner OUTSIDE
+mounting_pillar_positions = [
+    (6, -6),
+    (120, -6),
+    (170, -6),
+    (width - 6, -6),
+    (width - 6, -40),
+]
+
+mounting_pillars = (
+    cq.Sketch()
+    .push(mounting_pillar_positions)
+    .trapezoid(12, 12, 90, mode="a")
+    .circle(1.8, mode="s")
+)
+
+screw_holes = cq.Sketch().push(mounting_pillar_positions).circle(3, mode="a")
+
 battery_holder = (
     cq.Sketch()
     .polygon(
@@ -49,12 +72,20 @@ battery_holder = (
         [(-67, 3), (0, 3), (0, -10), (-67, -10), (-67, 3)],
         mode="s",
     )
+    # Cutout for the
+    .polygon(
+        [(-67, 30), (0, 30), (0, 12), (-67, 12), (-67, 30)],
+        mode="s",
+    )
 )
 
 
 power_in = cq.Sketch().circle(5, mode="a")
 usb_in = cq.Sketch().trapezoid(13, 5.5, 90, mode="a")
-switch_in = cq.Sketch().trapezoid(13.5, 8, 90, mode="a")
+switch_in = cq.Sketch().trapezoid(13.5, 8.5, 90, mode="a")
+
+
+# Motherboard mount
 
 
 def model():
@@ -88,7 +119,7 @@ def model():
         # Hole for power switch
         .faces(">Y")
         .workplane(centerOption="CenterOfBoundBox")
-        .center(-height / 2 + shell_t + 50, 0)
+        .center(0, 0)
         .placeSketch(switch_in)
         .cutBlind(-shell_t)
         # Slanted mounting pillars on the kbd top
@@ -98,7 +129,7 @@ def model():
         .center(-width / 2 + shell_t, kbd_height - height / 2 + shell_t)
         .transformed(rotate=cq.Vector(kbd_angle, 0, 0))
         .tag("sloped")
-        .placeSketch(pillars)
+        .placeSketch(kbd_pillars)
         .extrude(-1000)
         # Remove the excess extrusion
         .workplaneFromTagged("mid_height")
@@ -107,9 +138,24 @@ def model():
         # Slope for the beyboard
         .workplaneFromTagged("sloped")
         .split(keepBottom=True)
+        # Pillars to join with top half
+        .workplaneFromTagged("mid_height")
+        .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox")
+        .center(-width / 2, height / 2)
+        .placeSketch(mounting_pillars)
+        .extrude(thickness)
+        # Holes to insert screws from the bottom
+        .workplaneFromTagged("mid_height")
+        .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox")
+        .center(-width / 2, height / 2)
+        .placeSketch(screw_holes)
+        # 13 is 20-7 (screw thread length - threaded insert depth)
+        .cutBlind(thickness - 13)
     )
 
 
+if __name__ == "__main__":
+
     left_cutout = cq.Sketch().polygon(
         [(0, 0), (160, 0), (160, -100), (135, -100), (135, -200), (0, -200), (0, 0)],
         mode="a",

notebook_nueva/screen_mount.py

@@ -1,21 +1,19 @@
 import cadquery2 as cq
 from cadquery2 import exporters
 
-# Some dimensions copied from modelo.py,
+from modelo import (
-# TODO refactor into a separate file
+    kbd_height,
-
+    kbd_width,
-# Thickness of the outer material
+    mounting_pillar_positions,
-shell_t = 3
+    shell_t,
-
+    ti_depth,
-# Size of the kbd board
+    ti_radius,
-kbd_height = 98
+)
-kbd_width = 286
-kbd_angle = 5
 
 # Size of the whole object
 width = kbd_width + 2 * shell_t
-height = 69
+height = 59
-thickness = 10
+thickness = 62  # Will be shorter after construction
 
 # Visible screen size
 vis_w = 220
@@ -38,7 +36,19 @@ board_cutout = cq.Sketch().trapezoid(
     mode="a",
 )
 
-kbd_cable_hole = cq.Sketch().trapezoid(15, 5, 90, mode="a").vertices().fillet(1)
+kbd_cable_hole = cq.Sketch().trapezoid(15, 6, 90, mode="a").vertices().fillet(1)
+
+# The last mounting pillar is handled specially
+x, y = mounting_pillar_positions[-1]
+mounting_pillars = (
+    cq.Sketch()
+    .polygon([(0, 0), (width, 0), (width, -12), (0, -12), (0, 0)], mode="a")
+    .polygon(
+        [(x - 6, y - 6), (x - 6, y + 6), (x + 6, y + 6), (x + 6, y - 6), (x - 6, y - 6)]
+    )
+    .push(mounting_pillar_positions)
+    .circle(ti_radius, mode="s")
+)
 
 
 def model():
@@ -46,7 +56,8 @@ def model():
         cq.Workplane("XY")
         .workplane()
         .tag("mid_height")
-        .box(width, 59, 62)
+        .box(width, height, thickness)
+        # The screen goes at a 45 degree angle
         .faces(">Z")
         .transformed(rotate=(45, 0, 0))
         # Move the screen "lower" so it doesn't interfere
@@ -75,31 +86,42 @@ def model():
         .cutBlind(100)
         # Make it hollow
         .faces("<Z")
-        .shell(-2)
+        # Can't be exactly shell_t because cq fails
+        .shell(-shell_t + 0.01)
         # Cut hole for the screen board and cables
         .workplaneFromTagged("slanted")
         .workplane(offset=-scr_thickness, centerOption="CenterOfBoundBox")
         .placeSketch(board_cutout)
-        .cutBlind(-5)
+        .cutBlind(-6)
         # Fillet top of the object
         .edges(">Z and |X")
         .fillet(5)
         # Make small hole for the keyboard cable
         .faces(">Y")
         .workplane(offset=-5, centerOption="CenterOfBoundBox")
-        .center(width / 2 - 128, -23)
+        .center(-width / 2 + 134, -24)
         .placeSketch(kbd_cable_hole)
         .cutBlind(-1000)
+        # Pillars to join with bottom half
+        .workplaneFromTagged("mid_height")
+        .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox")
+        .center(-width / 2, height / 2)
+        .placeSketch(mounting_pillars)
+        .extrude(10)
     )
 
 
+if __name__ == "__main__":
+
+    print("Exporting")
     exporters.export(model(), "screen_mount.stl")
 
+    offset_width = -133
+
     right_side = (
         model()
         .faces(">X")
-    .workplane(centerOption="CenterOfBoundBox", offset=-140)
+        .workplane(centerOption="CenterOfBoundBox", offset=offset_width)
-    .center(0, height / 2)
         .split(keepTop=True)
     )
 
@@ -108,8 +130,7 @@ exporters.export(right_side, "right_screen_mount.stl")
     left_side = (
         model()
         .faces(">X")
-    .workplane(centerOption="CenterOfBoundBox", offset=-140)
+        .workplane(centerOption="CenterOfBoundBox", offset=offset_width)
-    .center(0, height / 2)
         .split(keepBottom=True)
     )