Reordered components so kbd doesn't interfere with other things

notebook_nueva/modelo.py

@@ -75,18 +75,6 @@ def model():
     # Now the basic box shape is in place, start adding things
     # and cutting holes.
 
-    model = keyboard.add(
-        model=model,
-        width=width,
-        height=height,
-        thickness=thickness,
-        bottom_face=">Z",  # Yes >Z
-        back_face=None,
-        offset_x=0,
-        offset_y=height - keyboard.kbd_height,
-        shell_t=shell_t,
-    )
-
     model = usb_hub.add(
         model=model,
         width=width,
@@ -149,6 +137,18 @@ def model():
         shell_t=shell_t,
     )
 
+    model = keyboard.add(
+        model=model,
+        width=width,
+        height=height,
+        thickness=thickness,
+        bottom_face=">Z",  # Yes >Z
+        back_face=None,
+        offset_x=0,
+        offset_y=height - keyboard.kbd_height,
+        shell_t=shell_t,
+    )
+
     return model
 
 

notebook_nueva/usb_hub.py

@@ -23,10 +23,7 @@ elements = [
         "x": 0,
         "y": 5,
         "shape": (
-            cq.Sketch()
+            cq.Sketch().trapezoid(22, 10, 90, mode="a").trapezoid(17, 10, 90, mode="s")
-            .trapezoid(22, 10, 90, mode="a")
-            .trapezoid(17, 10, 90, mode="s")
-            .clean()
         ),
         "height": 8,
     }
@@ -47,6 +44,7 @@ def add(
 ):
 
     # USB Hub extrusions
+    print(offset_x)
     if bottom_face:
         for element in elements:
             model = extrude_shape(
@@ -54,8 +52,8 @@ def add(
                 face=bottom_face,
                 w=width,
                 h=height,
-                x_offset=offset_x,
+                x_offset=263,  # offset_x,
-                y_offset=shell_t + offset_y,
+                y_offset=0,  # shell_t + offset_y,
                 element=element,
                 height=-(element["height"] + shell_t),
             )