Move keyboard cable hole 6mm to the left

notebook_nueva/modelo.py

@@ -45,17 +45,17 @@ 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 = (
     cq.Sketch()
     .push(mounting_pillar_positions)
     .trapezoid(12, 12, 90, mode="a")
-    .circle(1.5, mode="s")
+    .circle(1.8, mode="s")
 )
 
 screw_holes = cq.Sketch().push(mounting_pillar_positions).circle(3, mode="a")
@@ -82,7 +82,7 @@ battery_holder = (
 
 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

notebook_nueva/screen_mount.py

@@ -36,12 +36,17 @@ 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)
-    .trapezoid(12, 12, 90, mode="a")
     .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")