diff --git a/notebook_nueva/audio_plug.py b/notebook_nueva/audio_plug.py index ae9d316..30f69cf 100644 --- a/notebook_nueva/audio_plug.py +++ b/notebook_nueva/audio_plug.py @@ -29,7 +29,6 @@ def add( back_face, shell_t ): - # Holes if back_face: for hole in holes: diff --git a/notebook_nueva/battery_holder.py b/notebook_nueva/battery_holder.py index 7d550c4..605f901 100644 --- a/notebook_nueva/battery_holder.py +++ b/notebook_nueva/battery_holder.py @@ -106,7 +106,6 @@ def add( back_face, shell_t ): - if bottom_face: # Vents for vent in vents: diff --git a/notebook_nueva/hdmi_out.py b/notebook_nueva/hdmi_out.py index 65b4916..07ad6e3 100644 --- a/notebook_nueva/hdmi_out.py +++ b/notebook_nueva/hdmi_out.py @@ -29,7 +29,6 @@ def add( back_face, shell_t ): - # Holes if back_face: for hole in holes: diff --git a/notebook_nueva/keyboard.py b/notebook_nueva/keyboard.py index df41c68..a0359d3 100644 --- a/notebook_nueva/keyboard.py +++ b/notebook_nueva/keyboard.py @@ -55,7 +55,6 @@ def add( back_face, shell_t ): - # This one is special, it creates angled things and cuts off the # case, so ... it's going to do weird stuff diff --git a/notebook_nueva/left_side.stl b/notebook_nueva/left_side.stl index 011ca22..27bc9a1 100644 Binary files a/notebook_nueva/left_side.stl and b/notebook_nueva/left_side.stl differ diff --git a/notebook_nueva/lid.py b/notebook_nueva/lid.py index 83cb2c1..bc38db4 100644 --- a/notebook_nueva/lid.py +++ b/notebook_nueva/lid.py @@ -67,7 +67,6 @@ def model(): if __name__ == "__main__": - model = model() exporters.export(model, "lid.stl") diff --git a/notebook_nueva/model.stl b/notebook_nueva/model.stl index 3e6b79b..82ddd21 100644 Binary files a/notebook_nueva/model.stl and b/notebook_nueva/model.stl differ diff --git a/notebook_nueva/model.svg b/notebook_nueva/model.svg index 12903d5..2310e35 100644 --- a/notebook_nueva/model.svg +++ b/notebook_nueva/model.svg @@ -1335,12 +1335,12 @@ - - - - - - + + + + + + @@ -1362,16 +1362,18 @@ - - - + + + + + - - - - - - + + + + + + @@ -1472,12 +1474,15 @@ - - - - - - + + + + + + + + + @@ -1515,6 +1520,12 @@ + + + + + + @@ -1551,6 +1562,14 @@ + + + + + + + + @@ -2944,12 +2963,27 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/notebook_nueva/modelo.py b/notebook_nueva/modelo.py index 52d267c..28aadfb 100644 --- a/notebook_nueva/modelo.py +++ b/notebook_nueva/modelo.py @@ -169,7 +169,6 @@ def model(): if __name__ == "__main__": - model = model() left_cutout = cq.Sketch().polygon( diff --git a/notebook_nueva/right_side.stl b/notebook_nueva/right_side.stl index 2480a42..a5a71ba 100644 Binary files a/notebook_nueva/right_side.stl and b/notebook_nueva/right_side.stl differ diff --git a/notebook_nueva/screen_mount.py b/notebook_nueva/screen_mount.py index 4406cce..1742e88 100644 --- a/notebook_nueva/screen_mount.py +++ b/notebook_nueva/screen_mount.py @@ -132,7 +132,6 @@ def model(): if __name__ == "__main__": - print("Exporting") exporters.export(model(), "screen_mount.stl") diff --git a/notebook_nueva/screen_pillars.py b/notebook_nueva/screen_pillars.py index dd74dc4..7fc8c30 100644 --- a/notebook_nueva/screen_pillars.py +++ b/notebook_nueva/screen_pillars.py @@ -47,7 +47,6 @@ def add( shell_t ): if bottom_face: - # Mounting pillars for element in elements: model = extrude_shape( diff --git a/notebook_nueva/usb_hub.py b/notebook_nueva/usb_hub.py index b12cbe1..1dbd8a6 100644 --- a/notebook_nueva/usb_hub.py +++ b/notebook_nueva/usb_hub.py @@ -26,7 +26,20 @@ elements = [ cq.Sketch().trapezoid(22, 10, 90, mode="a").trapezoid(17, 10, 90, mode="s") ), "height": 8, - } + }, + # Outline + { + "x": 0, + "y": 35, + "shape": ( + cq.Sketch() + .trapezoid(17, 70, 90, mode="a") + .trapezoid(15, 68, 90, mode="s") + .vertices() + .fillet(3) + ), + "height": 0.2, + }, ] @@ -42,7 +55,6 @@ def add( back_face, shell_t ): - # USB Hub extrusions if bottom_face: for element in elements: @@ -51,8 +63,8 @@ def add( face=bottom_face, w=width, h=height, - x_offset=263, # offset_x, - y_offset=0, # shell_t + offset_y, + x_offset=offset_x, + y_offset=shell_t + offset_y, element=element, height=-(element["height"] + shell_t), ) diff --git a/notebook_nueva/zero_holder.py b/notebook_nueva/zero_holder.py index 0895873..42ff080 100644 --- a/notebook_nueva/zero_holder.py +++ b/notebook_nueva/zero_holder.py @@ -66,7 +66,6 @@ def add( back_face, shell_t ): - if bottom_face: # Vents for vent in vents: