diff --git a/notebook_nueva/battery_holder.py b/notebook_nueva/battery_holder.py index d04d7ab..6718cf8 100644 --- a/notebook_nueva/battery_holder.py +++ b/notebook_nueva/battery_holder.py @@ -1,8 +1,7 @@ import cadquery as cq stand_positions = [(0, 0), (58, 0), (58, 49), (0, 49)] -lower_stands = cq.Sketch().push(stand_positions).circle(3, mode="a") -higher_stands = cq.Sketch().push(stand_positions).circle(2.65 / 2, mode="a") +stands = cq.Sketch().push(stand_positions).circle(3, mode="a").circle(2.65 / 2, mode="s") pillar_height = 7 # Holes for the battery power cable and button @@ -10,24 +9,24 @@ power_in = cq.Sketch().trapezoid(10, 5.5, 90, mode="a") power_in_offset_x = 15 power_in_offset_y = -1 button_offset_x = 67 -button_offset_y = 5 +button_offset_y = 5.5 power_button_cut = cq.Sketch().trapezoid(7, 7, 90, mode="a") # This is a holder for DuPont cables so they connect to this # things' pogo pins which are used to power the CPU -pin_positions = [(4, 0), (4 * 2.54 + 4, 0)] +pin_positions = [(3.5, 0), (4 * 2.54 + 3.5, 0)] pin_holder_width = 25 pin_holder_height = 15 pin_holder = ( cq.Sketch() .polygon( [ - (0, 0), + (0.5, 0), (pin_holder_width, 0), (pin_holder_width, pin_holder_height), (0, pin_holder_height), - (0, 0), + (0.5, 0), ], mode="a", ) diff --git a/notebook_nueva/cpu_holder.py b/notebook_nueva/cpu_holder.py index 4d681b2..45a5690 100644 --- a/notebook_nueva/cpu_holder.py +++ b/notebook_nueva/cpu_holder.py @@ -2,6 +2,5 @@ import cadquery as cq cpu_stand_positions = [(0, 0), (23, 0), (23, 58), (0, 58)] -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") +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 bfab942..e3f8c41 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 7b82f39..57eaa34 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 43a4a23..a53121c 100644 --- a/notebook_nueva/modelo.py +++ b/notebook_nueva/modelo.py @@ -188,31 +188,18 @@ def model(): .placeSketch(screw_holes) # 13 is 20-7 (screw thread length - threaded insert depth) .cutBlind(thickness - 13) - # CPU Stands (lower) + # CPU Stands .workplaneFromTagged("mid_height") .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox") .center(width / 2 - cpu_offset_x, height / 2 - cpu_offset_y) - .placeSketch(cpu_holder.lower_stands) - .extrude(7) - # CPU Stands (higher) - .workplaneFromTagged("mid_height") - .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox") - .center(width / 2 - cpu_offset_x, height / 2 - cpu_offset_y) - .placeSketch(cpu_holder.higher_stands) - .extrude(10.5) - # Battery Stands (lower) - # and should be a parameter (TODO) + .placeSketch(cpu_holder.stands) + .extrude(cpu_holder.pillar_height) + # Battery Stands .workplaneFromTagged("mid_height") .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox") .center(-width / 2 + battery_offset_x, height / 2 - battery_offset_y) - .placeSketch(battery_holder.lower_stands) + .placeSketch(battery_holder.stands) .extrude(shell_t + battery_holder.pillar_height) - # Battery Stands (higher) - .workplaneFromTagged("mid_height") - .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox") - .center(-width / 2 + battery_offset_x, height / 2 - battery_offset_y) - .placeSketch(battery_holder.higher_stands) - .extrude(shell_t + battery_holder.pillar_height + 3.5) # Pogo pin connector holders .workplaneFromTagged("mid_height") .workplane(offset=-thickness / 2, centerOption="CenterOfBoundBox") diff --git a/notebook_nueva/right_side.stl b/notebook_nueva/right_side.stl index d6e206e..9454423 100644 Binary files a/notebook_nueva/right_side.stl and b/notebook_nueva/right_side.stl differ