diff --git a/notebook_nueva/hinged_lid.py b/notebook_nueva/hinged_lid.py
index 3c6d7c6..58899e0 100644
--- a/notebook_nueva/hinged_lid.py
+++ b/notebook_nueva/hinged_lid.py
@@ -13,7 +13,7 @@ from modelo import (
shell_t,
)
-from screen_mount import height_bottom
+import screen_mount
import keyboard
@@ -92,9 +92,11 @@ def model():
.workplane(
centerOption="CenterOfBoundBox", offset=model_thickness - thickness / 2
)
+ .workplaneFromTagged("base")
+ .workplane(offset=thickness / 2 - shell_t)
.center(-width / 2, height / 2 - shell_t)
.placeSketch(mounting_pillars)
- .extrude(10)
+ .extrude(-10)
# Hole for screws
.workplaneFromTagged("rightSide")
.placeSketch(cq.Sketch().circle(screw_radius))
@@ -226,6 +228,45 @@ def model():
.cutBlind(-hinge_width / 2 - 1)
)
+ # Screen mount
+ model = (
+ model.workplaneFromTagged("base")
+ .center(0, -32)
+ .tag("screen_plane")
+ .workplane(offset=thickness / 2 - shell_t)
+ .placeSketch(
+ cq.Sketch()
+ .trapezoid(
+ screen_mount.scr_w + 2 * shell_t, screen_mount.scr_h + 2 * shell_t, 90
+ )
+ .vertices()
+ .fillet(2)
+ )
+ .extrude(-9)
+ .workplaneFromTagged("screen_plane")
+ .workplane(offset=thickness / 2 - shell_t)
+ .placeSketch(
+ cq.Sketch()
+ .trapezoid(screen_mount.vis_w, screen_mount.vis_h, 90)
+ .vertices()
+ .fillet(2)
+ )
+ .cutBlind(-9)
+ .workplaneFromTagged("screen_plane")
+ .workplane(offset=thickness / 2 - shell_t)
+ .placeSketch(
+ cq.Sketch()
+ .trapezoid(screen_mount.scr_w - 40, screen_mount.scr_h + 2 * shell_t, 90)
+ .vertices()
+ .fillet(2)
+ )
+ .cutBlind(-9)
+ .workplaneFromTagged("screen_plane")
+ .workplane(offset=thickness / 2 - shell_t - screen_mount.scr_thickness - 2)
+ .placeSketch(cq.Sketch().trapezoid(screen_mount.scr_w, screen_mount.scr_h, 90))
+ .cutBlind(screen_mount.scr_thickness)
+ )
+
# Cut off shape of the base
model = (
diff --git a/notebook_nueva/hinged_lid.stl b/notebook_nueva/hinged_lid.stl
index 1da7ffa..cfae68a 100644
Binary files a/notebook_nueva/hinged_lid.stl and b/notebook_nueva/hinged_lid.stl differ
diff --git a/notebook_nueva/hinged_lid.svg b/notebook_nueva/hinged_lid.svg
index 767184e..51d4ac4 100644
--- a/notebook_nueva/hinged_lid.svg
+++ b/notebook_nueva/hinged_lid.svg
@@ -30,10 +30,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -64,6 +93,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123,6 +188,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -173,8 +270,8 @@
-
+
@@ -190,7 +287,7 @@
-
+
@@ -206,7 +303,7 @@
-
+
@@ -290,12 +387,12 @@
-
+
-
+