Fix size in pogo plug

This cut is not needed with the lower keyboard position.

notebook_nueva/battery_holder.py

@@ -0,0 +1,27 @@
+import cadquery as cq
+
+cpu_stand_positions = [(0, 0), (58, 0), (58, 49), (0, 49)]
+
+lower_stands = cq.Sketch().push(cpu_stand_positions).circle(3, mode="a")
+
+higher_stands = cq.Sketch().push(cpu_stand_positions).circle(2.65 / 2, mode="a")
+
+# This is a holder for DuPont cables so they connect to this
+# things' pogo pins which are used to power the CPU
+
+if __name__ == "__main__":
+
+    pin_positions = [(0, 0), (4 * 2.54, 0)]
+    width = 5 * 2.54 + 1
+    height = 7
+    model = (
+        cq.Workplane("XY")
+        .workplane()
+        .box(width, height, 2.54 + 1)
+        .faces(">Z")
+        .workplane(centerOption="CenterOfBoundBox")
+        .center(-width / 2 + 1.3 + .5, 0)
+        .placeSketch(cq.Sketch().push(pin_positions).trapezoid(2.60, 10, 90, mode="a"))
+        .cutBlind(-2.54)
+    )
+    cq.exporters.export(model, "pogo_plug.stl")

notebook_nueva/cpu_holder.py

@@ -1,28 +1,7 @@
-import cadquery2 as cq
+import cadquery as cq
-from cadquery2 import exporters
 
-lower_stands = (
+cpu_stand_positions = [(0, 0), (23, 0), (23, 58), (0, 58)]
-    cq.Sketch().push([(0, 0), (58, 0), (58, 23), (0, 23)]).circle(3, mode="a")
-)
 
-higher_stands = (
+lower_stands = cq.Sketch().push(cpu_stand_positions).circle(3, mode="a")
-    cq.Sketch().push([(0, 0), (58, 0), (58, 23), (0, 23)]).circle(2.65 / 2, mode="a")
-)
 
-model = (
+higher_stands = cq.Sketch().push(cpu_stand_positions).circle(2.65 / 2, mode="a")
-    cq.Workplane("XY")
-    .workplane()
-    .box(75, 40, 2)
-    .edges("+Z")
-    .fillet(3)
-    .faces(">Z")
-    .workplane(centerOption="CenterOfBoundBox")
-    .center(-29, -11.5)
-    .placeSketch(lower_stands)
-    .extrude(4)
-    .workplane()
-    .placeSketch(higher_stands)
-    .extrude(9)
-)
-
-exporters.export(model, "cpu_holder.stl")

notebook_nueva/modelo.py

@@ -1,5 +1,8 @@
-import cadquery2 as cq
+import cadquery as cq
-from cadquery2 import exporters
+from cadquery import exporters
+
+import battery_holder
+import cpu_holder
 
 # Base for the notebook. Basically a kbd base that extends back
 # as much as possible
@@ -8,36 +11,48 @@ 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
 width = kbd_width + 2 * shell_t
-height = 164  # Max bed size
+height = 159
-thickness = 20 + shell_t  # 20 inside
+thickness = 27 + shell_t  # 27 inside
 
 # Insert Positions
 ti_radius = 2.35
 ti_depth = 6.25
 
 # Positions are determined by measuring the keyboard
-# mounting holes
+
+kbd_pillar_positions = [
+    (18.25, -16),
+    (142.5, -25.5),
+    (kbd_width - 20, -16),
+    (23.5, -79.5),
+    (145.5, -82.5),
+    (kbd_width - 19, -79.5),
+]
+
+
+# 2-level mounting pillars for the kbd
+# Width of these need to be tweaked for
+# each specific keyboard
 kbd_pillars = (
     cq.Sketch()
-    .push(
+    .push(kbd_pillar_positions)
-        [
+    .circle(2.2, mode="a")
-            (19, -16.5),
+    # Holes for self-tapping screws
-            (133, -16.5),
+    .circle(1.1, mode="s")
-            (247.5, -16.5),
+)
-            (24, -86),
+
-            (142.5, -91),
+kbd_lower_pillars = (
-            (261.5, -86),
+    cq.Sketch()
-        ]
+    .push(kbd_pillar_positions)
-    )
+    .circle(4, mode="a")
-    .circle(6, mode="a")
+    # Holes for self-tapping screws
-    # Holes for M3 threaded inserts
+    .circle(1.1, mode="s")
-    .circle(ti_radius, mode="s")
 )
 
 # These are placed where convenient, and are used to join the top and bottom
@@ -45,10 +60,11 @@ kbd_pillars = (
 # Measured from top-left corner OUTSIDE
 mounting_pillar_positions = [
     (6, -6),
-    (width - 6, -6),
+    (6, -40),
-    (width - 6, -40),
     (120, -6),
     (170, -6),
+    (width - 6, -6),
+    (width - 6, -40),
 ]
 
 mounting_pillars = (
@@ -60,32 +76,21 @@ mounting_pillars = (
 
 screw_holes = cq.Sketch().push(mounting_pillar_positions).circle(3, mode="a")
 
-battery_holder = (
+# Hole for the USB hub's exposed port
-    cq.Sketch()
+usb_in = cq.Sketch().trapezoid(13, 5.5, 90, mode="a")
-    .polygon(
+
-        [(-67, 5), (0, 5), (0, -12), (-67, -12), (-67, 5)],
+# Holes for the battery power cable and button
-        mode="a",
+power_in = cq.Sketch().trapezoid(10, 5.5, 90, mode="a")
-    )
+power_button_cut = cq.Sketch().trapezoid(7, 7, 90, mode="a")
-    .trapezoid(83, 83, 90, mode="a")
+
-    .trapezoid(80, 80, 90, mode="s")
+# CPU stand pins
-    .polygon(
+lower_stands = (
-        [(-67, 3), (0, 3), (0, -10), (-67, -10), (-67, 3)],
+    cq.Sketch().push([(0, 0), (58, 0), (58, 23), (0, 23)]).circle(3, mode="a")
-        mode="s",
-    )
-    # Cutout for the
-    .polygon(
-        [(-67, 30), (0, 30), (0, 12), (-67, 12), (-67, 30)],
-        mode="s",
-    )
 )
 
-
+higher_stands = (
-power_in = cq.Sketch().circle(5, mode="a")
+    cq.Sketch().push([(0, 0), (58, 0), (58, 23), (0, 23)]).circle(2.65 / 2, mode="a")
-usb_in = cq.Sketch().trapezoid(13, 5.5, 90, mode="a")
+)
-switch_in = cq.Sketch().trapezoid(13.5, 8, 90, mode="a")
-
-
-# Motherboard mount
 
 
 def model():
@@ -99,38 +104,44 @@ def model():
         .fillet(2)
         .faces(">Z")
         .shell(-shell_t)
-        # Battery holder
+        # Power inlet
-        .workplaneFromTagged("mid_height")
+        .faces(">Y")
-        .center(-width / 2 + shell_t + 65, height / 2 - shell_t - 45)
-        .placeSketch(battery_holder)
-        .extrude(-height / 2)
-        # Power cable inlet
-        .faces("<X")
         .workplane(centerOption="CenterOfBoundBox")
-        .center(-height / 2 + shell_t + 48.5, -3)
+        # The position is arbitrary, based on the components available
+        .center(width / 2 - 15 - 21, -8.5)
         .placeSketch(power_in)
         .cutBlind(-shell_t)
+        # Power button
+        .faces(">Y")
+        .workplane(centerOption="CenterOfBoundBox")
+        # The position is arbitrary, based on the components available,
+        .center(width / 2 - 67 - 21, -1)
+        .placeSketch(power_button_cut)
+        .cutBlind(-shell_t)
         # USB inlet
         .faces(">X")
         .workplane(centerOption="CenterOfBoundBox")
-        .center(-height / 2 + shell_t + 50, -5)
+        # The position is arbitrary, based on the components
+        # available, keyboard height, cable length, etc.
+        .center(-height / 2 + shell_t + 60, -8)
         .placeSketch(usb_in)
         .cutBlind(-shell_t)
-        # Hole for power switch
-        .faces(">Y")
-        .workplane(centerOption="CenterOfBoundBox")
-        .center(0, 0)
-        .placeSketch(switch_in)
-        .cutBlind(-shell_t)
         # Slanted mounting pillars on the kbd top
         .faces(">Z")
         .workplane(centerOption="CenterOfBoundBox")
         # Top-left kbd corner inside the box
         .center(-width / 2 + shell_t, kbd_height - height / 2 + shell_t)
         .transformed(rotate=cq.Vector(kbd_angle, 0, 0))
+        # These two offsets push the keyboard "down" into the case
+        # and need to be adjusted per-keyboard
         .tag("sloped")
+        .workplane(offset=-2.5)
         .placeSketch(kbd_pillars)
         .extrude(-1000)
+        .workplaneFromTagged("sloped")
+        .workplane(offset=-5.5)
+        .placeSketch(kbd_lower_pillars)
+        .extrude(-1000)
         # Remove the excess extrusion
         .workplaneFromTagged("mid_height")
         .transformed(offset=cq.Vector(0, 0, -thickness / 2))
@@ -151,13 +162,41 @@ def model():
         .placeSketch(screw_holes)
         # 13 is 20-7 (screw thread length - threaded insert depth)
         .cutBlind(thickness - 13)
+        # CPU Stands (lower)
+        # The -65, -40 is the position of the CPU,
+        # and should be a parameter (TODO)
+        .workplaneFromTagged("mid_height")
+        .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox")
+        .center(width / 2 - 40, height / 2 - 65)
+        .placeSketch(cpu_holder.lower_stands)
+        .extrude(7)
+        # CPU Stands (higher)
+        .workplaneFromTagged("mid_height")
+        .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox")
+        .center(width / 2 - 40, height / 2 - 65)
+        .placeSketch(cpu_holder.higher_stands)
+        .extrude(13)
+        # Battery Stands (lower)
+        # The +18, -55 is the position of the battery system,
+        # and should be a parameter (TODO)
+        .workplaneFromTagged("mid_height")
+        .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox")
+        .center(-width / 2 + 21, height / 2 - 56)
+        .placeSketch(battery_holder.lower_stands)
+        .extrude(shell_t + 5)
+        # Battery Stands (higher)
+        .workplaneFromTagged("mid_height")
+        .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox")
+        .center(-width / 2 + 21, height / 2 - 56)
+        .placeSketch(battery_holder.higher_stands)
+        .extrude(shell_t + 11)
     )
 
 
 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 +214,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

@@ -1,5 +1,5 @@
-import cadquery2 as cq
+import cadquery as cq
-from cadquery2 import exporters
+from cadquery import exporters
 
 from modelo import (
     kbd_height,
@@ -10,12 +10,11 @@ from modelo import (
     ti_radius,
 )
 
-ti_radius = 2.5
-
 # Size of the whole object
 width = kbd_width + 2 * shell_t
-height = 59
+height = 66
-thickness = 62  # Will be shorter after construction
+height_bottom = 59
+thickness = 48  # Will be shorter after construction
 
 # Visible screen size
 vis_w = 220
@@ -28,6 +27,9 @@ scr_h = 65
 scr_thickness = 5.5
 screen_cutout = cq.Sketch().trapezoid(scr_w, scr_h, 90, mode="a")
 
+# Screen angle
+scr_angle = 20
+
 # Circuit board and cable hole.
 # This is in the back of the screen, and is a bit shorter in height than the
 # screen. It's wider so it removes enough material to make the shape simpler.
@@ -38,13 +40,14 @@ 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(20, 9, 90, mode="a").vertices().fillet(1)
 
 mounting_pillars = (
     cq.Sketch()
-    .polygon([(0, 0), (width, 0), (width, -12), (0, -12), (0, 0)], mode="a")
     .push(mounting_pillar_positions)
+    .trapezoid(-12, 12, 90, mode="a")
     .circle(ti_radius, mode="s")
+    .clean()
 )
 
 
@@ -54,9 +57,9 @@ def model():
         .workplane()
         .tag("mid_height")
         .box(width, height, thickness)
-        # The screen goes at a 45 degree angle
+        # The screen goes rotated
         .faces(">Z")
-        .transformed(rotate=(45, 0, 0))
+        .transformed(rotate=(scr_angle, 0, 0))
         # Move the screen "lower" so it doesn't interfere
         # so much with the back
         .center(0, -2)
@@ -65,6 +68,35 @@ def model():
         # of the inclined screen
         .placeSketch(cq.Sketch().trapezoid(1000, 1000, 90, mode="a"))
         .cutBlind(1000)
+        # Trim the top
+        .workplaneFromTagged("mid_height")
+        .workplane(offset=21)
+        .placeSketch(cq.Sketch().trapezoid(1000, 1000, 90, mode="a"))
+        .cutBlind(100)
+        # Make bottom smaller to fit with base
+        .faces(">X")
+        .workplane(centerOption="CenterOfBoundBox")
+        .center(-height / 2, -thickness / 2)
+        .placeSketch(
+            cq.Sketch()
+            .polygon(
+                [
+                    (height_bottom, 0),
+                    (height_bottom, thickness / 3),
+                    (height, thickness - 21),
+                    (height, thickness),
+                    (height + 5, thickness + 5),
+                    (height + 5, 0),
+                    (height_bottom, 0),
+                ]
+            )
+            .vertices()
+            .fillet(3)
+        )
+        .cutBlind(-1000)
+        # Fillet top of the object
+        .edges("|X and >Z")
+        .fillet(3)
         # Cut off viewport hole so we can see the screen
         .workplaneFromTagged("slanted")
         .placeSketch(viewport_cutout)
@@ -76,11 +108,6 @@ def model():
         .center(-3, 0)
         .placeSketch(screen_cutout)
         .cutBlind(-scr_thickness)
-        # Trim the top
-        .workplaneFromTagged("mid_height")
-        .workplane(offset=21)
-        .placeSketch(cq.Sketch().trapezoid(1000, 1000, 90, mode="a"))
-        .cutBlind(100)
         # Make it hollow
         .faces("<Z")
         # Can't be exactly shell_t because cq fails
@@ -90,44 +117,43 @@ def model():
         .workplane(offset=-scr_thickness, centerOption="CenterOfBoundBox")
         .placeSketch(board_cutout)
         .cutBlind(-6)
-        # Fillet top of the object
+        # # Make small hole for the keyboard cable
-        .edges(">Z and |X")
+        # # not needed with this keyboard
-        .fillet(5)
+        # .faces("<Y")
-        # Make small hole for the keyboard cable
+        # .workplane(centerOption="CenterOfBoundBox")
-        .faces(">Y")
+        # .center(width / 2 - 175, -4)
-        .workplane(offset=-5, centerOption="CenterOfBoundBox")
+        # .placeSketch(kbd_cable_hole)
-        .center(-width / 2 + 128, -23)
+        # .cutBlind(-height / 2)
-        .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)
+        .center(-width / 2, height_bottom - height / 2)
         .placeSketch(mounting_pillars)
         .extrude(10)
     )
 
 
-exporters.export(model(), "screen_mount.stl")
+if __name__ == "__main__":
 
-split_offset = -133
+    print("Exporting")
+    exporters.export(model(), "screen_mount.stl")
 
-right_side = (
+    offset_width = -width / 2
+
+    right_side = (
         model()
         .faces(">X")
-    .workplane(centerOption="CenterOfBoundBox", offset=split_offset)
+        .workplane(centerOption="CenterOfBoundBox", offset=offset_width)
-    .center(0, height / 2)
         .split(keepTop=True)
-)
+    )
 
-exporters.export(right_side, "right_screen_mount.stl")
+    exporters.export(right_side, "right_screen_mount.stl")
 
-left_side = (
+    left_side = (
         model()
         .faces(">X")
-    .workplane(centerOption="CenterOfBoundBox", offset=split_offset)
+        .workplane(centerOption="CenterOfBoundBox", offset=offset_width)
-    .center(0, height / 2)
         .split(keepBottom=True)
-)
+    )
 
-exporters.export(left_side, "left_screen_mount.stl")
+    exporters.export(left_side, "left_screen_mount.stl")

requirements.txt

@@ -1 +1 @@
-cadquery
+cadquery2