diff --git a/notebook_nueva/cpu_holder.py b/notebook_nueva/cpu_holder.py index 45a5690..80623ef 100644 --- a/notebook_nueva/cpu_holder.py +++ b/notebook_nueva/cpu_holder.py @@ -1,6 +1,6 @@ import cadquery as cq -cpu_stand_positions = [(0, 0), (23, 0), (23, 58), (0, 58)] +cpu_stand_positions = [(0, 0), (0, 23), (58, 23), (58, 0)] stands = cq.Sketch().push(cpu_stand_positions).circle(3, mode="a").circle(2.65 / 2, mode="s") pillar_height = 7 \ No newline at end of file diff --git a/notebook_nueva/left_side.stl b/notebook_nueva/left_side.stl index e3f8c41..5b6659b 100644 Binary files a/notebook_nueva/left_side.stl and b/notebook_nueva/left_side.stl differ diff --git a/notebook_nueva/model.stl b/notebook_nueva/model.stl index 57eaa34..040068b 100644 Binary files a/notebook_nueva/model.stl and b/notebook_nueva/model.stl differ diff --git a/notebook_nueva/modelo.py b/notebook_nueva/modelo.py index a53121c..28905dc 100644 --- a/notebook_nueva/modelo.py +++ b/notebook_nueva/modelo.py @@ -64,7 +64,7 @@ mounting_pillar_positions = [ (120, -6), (170, -6), (width - 6, -6), - (width - 6, -40), + (width - 6, -30), ] mounting_pillars = ( @@ -80,15 +80,15 @@ screw_holes = cq.Sketch().push(mounting_pillar_positions).circle(3, mode="a") usb_in = cq.Sketch().trapezoid(13, 5.5, 90, mode="a") # Thing to "grab" the hub so it stays in place usb_holder = ( - cq.Sketch().trapezoid(10, 22, 90, mode="a").trapezoid(10, 17, 90, mode="s").clean() + cq.Sketch().trapezoid(22, 10, 90, mode="a").trapezoid(17, 10, 90, mode="s").clean() ) # Hole for the USB hub's exposed port audio_in = cq.Sketch().trapezoid(17, 6, 90, mode="a") # CPU holder position from back-right corner of the case -cpu_offset_x = 40 -cpu_offset_y = 65 +cpu_offset_x = 150 +cpu_offset_y = 55 # Battery holder position from front-left corner of the case battery_offset_x = 21 @@ -139,17 +139,17 @@ def model(): # USB inlet # The position is arbitrary, based on the components # available, keyboard height, cable length, etc. - .faces(">X") + .faces(">Y") .workplane(centerOption="CenterOfBoundBox") - .center(-height / 2 + shell_t + 45 + 13 / 2, -8) + .center(- width / 2 + shell_t + 45 + 13 / 2, -8) .placeSketch(usb_in) .cutBlind(-shell_t) # Audio plugs # The position is arbitrary, based on the components # available, keyboard height, cable length, etc. - .faces("X") .workplane(centerOption="CenterOfBoundBox") - .center(width / 2 - shell_t - 34.5 - 17 / 2, -8) + .center(height / 2 - shell_t - 34.5 - 17 / 2, -8) .placeSketch(audio_in) .cutBlind(-shell_t) # Slanted mounting pillars on the kbd top @@ -210,11 +210,11 @@ def model(): .placeSketch(battery_holder.pin_holder) .extrude(shell_t + 3) # Channel for the usb hub - .workplaneFromTagged("mid_height") - .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox") - .center(width / 2 - 5, -height / 2 + shell_t + 45 + 13 / 2) + .faces(">Y") + .workplane(centerOption="CenterOfBoundBox") + .center(- width / 2 + shell_t + 45 + 13 / 2, -8) .placeSketch(usb_holder) - .extrude(shell_t + 8) + .extrude(-shell_t - 8) ) diff --git a/notebook_nueva/right_screen_mount.stl b/notebook_nueva/right_screen_mount.stl index 8c2c50b..76cb6d3 100644 Binary files a/notebook_nueva/right_screen_mount.stl and b/notebook_nueva/right_screen_mount.stl differ diff --git a/notebook_nueva/right_side.stl b/notebook_nueva/right_side.stl index 9454423..f840145 100644 Binary files a/notebook_nueva/right_side.stl and b/notebook_nueva/right_side.stl differ diff --git a/notebook_nueva/screen_mount.stl b/notebook_nueva/screen_mount.stl index 5c2659f..d73235e 100644 Binary files a/notebook_nueva/screen_mount.stl and b/notebook_nueva/screen_mount.stl differ