larger hole for kbd mounting screws

* Adjusted sizes and other parameters for the new 65% keyboard
* Commented battery holder (waiting on the 18650 charger)

notebook_nueva/modelo.py

@@ -8,8 +8,8 @@ from cadquery2 import exporters
 shell_t = 3
 
 # Size of the kbd board
-kbd_height = 98
+kbd_height = 95.5
-kbd_width = 286
+kbd_width = 305
 kbd_angle = 5
 
 # Size of the whole object
@@ -27,17 +27,17 @@ kbd_pillars = (
     cq.Sketch()
     .push(
         [
-            (19, -16.5),
+            (18.25, -16),
-            (133, -16.5),
+            (142.5, -25.5),
-            (247.5, -16.5),
+            (kbd_width - 20, -16),
-            (24, -86),
+            (23.5, -79.5),
-            (142.5, -91),
+            (145.5, -82.5),
-            (261.5, -86),
+            (kbd_width - 19, -79.5),
         ]
     )
-    .circle(6, mode="a")
+    .circle(2.2, mode="a")
-    # Holes for M3 threaded inserts
+    # Holes for self-tapping screws
-    .circle(ti_radius, mode="s")
+    .circle(1.1, mode="s")
 )
 
 # These are placed where convenient, and are used to join the top and bottom
@@ -45,10 +45,10 @@ kbd_pillars = (
 # Measured from top-left corner OUTSIDE
 mounting_pillar_positions = [
     (6, -6),
-    (width - 6, -6),
-    (width - 6, -40),
     (120, -6),
     (170, -6),
+    (width - 6, -6),
+    (width - 6, -40),
 ]
 
 mounting_pillars = (
@@ -60,29 +60,29 @@ mounting_pillars = (
 
 screw_holes = cq.Sketch().push(mounting_pillar_positions).circle(3, mode="a")
 
-battery_holder = (
+# battery_holder = (
-    cq.Sketch()
+#     cq.Sketch()
-    .polygon(
+#     .polygon(
-        [(-67, 5), (0, 5), (0, -12), (-67, -12), (-67, 5)],
+#         [(-67, 5), (0, 5), (0, -12), (-67, -12), (-67, 5)],
-        mode="a",
+#         mode="a",
-    )
+#     )
-    .trapezoid(83, 83, 90, mode="a")
+#     .trapezoid(83, 83, 90, mode="a")
-    .trapezoid(80, 80, 90, mode="s")
+#     .trapezoid(80, 80, 90, mode="s")
-    .polygon(
+#     .polygon(
-        [(-67, 3), (0, 3), (0, -10), (-67, -10), (-67, 3)],
+#         [(-67, 3), (0, 3), (0, -10), (-67, -10), (-67, 3)],
-        mode="s",
+#         mode="s",
-    )
+#     )
-    # Cutout for the
+#     # Cutout for the
-    .polygon(
+#     .polygon(
-        [(-67, 30), (0, 30), (0, 12), (-67, 12), (-67, 30)],
+#         [(-67, 30), (0, 30), (0, 12), (-67, 12), (-67, 30)],
-        mode="s",
+#         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
@@ -100,10 +100,10 @@ def model():
         .faces(">Z")
         .shell(-shell_t)
         # Battery holder
-        .workplaneFromTagged("mid_height")
+        # .workplaneFromTagged("mid_height")
-        .center(-width / 2 + shell_t + 65, height / 2 - shell_t - 45)
+        # .center(-width / 2 + shell_t + 65, height / 2 - shell_t - 45)
-        .placeSketch(battery_holder)
+        # .placeSketch(battery_holder)
-        .extrude(-height / 2)
+        # .extrude(-height / 2)
         # Power cable inlet
         .faces("<X")
         .workplane(centerOption="CenterOfBoundBox")
@@ -157,7 +157,7 @@ def model():
 if __name__ == "__main__":
 
     left_cutout = cq.Sketch().polygon(
-        [(0, 0), (160, 0), (160, -100), (135, -100), (135, -200), (0, -200), (0, 0)],
+        [(0, 0), (width / 2, 0), (width / 2, -height), (0, -height), (0, 0)],
         mode="a",
     )
 
@@ -175,13 +175,11 @@ if __name__ == "__main__":
 
     right_cutout = cq.Sketch().polygon(
         [
-            (160, 0),
+            (width / 2, 0),
             (width, 0),
             (width, -height),
-            (135, -height),
+            (width / 2, -height),
-            (135, -100),
+            (width / 2, 0),
-            (160, -100),
-            (160, 0),
         ],
         mode="a",
     )

notebook_nueva/screen_mount.py

@@ -36,11 +36,16 @@ 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")
 )
@@ -94,7 +99,7 @@ def model():
         # 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
@@ -106,24 +111,27 @@ def model():
     )
 
 
-exporters.export(model(), "screen_mount.stl")
+if __name__ == "__main__":
 
-right_side = (
+    print("Exporting")
-    model()
+    exporters.export(model(), "screen_mount.stl")
-    .faces(">X")
-    .workplane(centerOption="CenterOfBoundBox", offset=-width / 2)
-    .center(0, height / 2)
-    .split(keepTop=True)
-)
 
-exporters.export(right_side, "right_screen_mount.stl")
+    offset_width = -133
 
-left_side = (
+    right_side = (
-    model()
+        model()
-    .faces(">X")
+        .faces(">X")
-    .workplane(centerOption="CenterOfBoundBox", offset=-width / 2)
+        .workplane(centerOption="CenterOfBoundBox", offset=offset_width)
-    .center(0, height / 2)
+        .split(keepTop=True)
-    .split(keepBottom=True)
+    )
-)
 
-exporters.export(left_side, "left_screen_mount.stl")
+    exporters.export(right_side, "right_screen_mount.stl")
+
+    left_side = (
+        model()
+        .faces(">X")
+        .workplane(centerOption="CenterOfBoundBox", offset=offset_width)
+        .split(keepBottom=True)
+    )
+
+    exporters.export(left_side, "left_screen_mount.stl")