diff options
Diffstat (limited to 'model')
| -rw-r--r-- | model/main.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/model/main.py b/model/main.py index 235b364..5b374f7 100644 --- a/model/main.py +++ b/model/main.py @@ -122,7 +122,7 @@ def build_oled(outer, screen, tol, hole, pins, pinlen, ribbon): part = part.union(box(pins.x, pins.y, pinlen)\ .translate((0, outer.y / 2 - pins.y / 2, slab - pinlen))) if tol != 0: - part = part.union(box(*ribbon.xyz()).translate((0, -outer.y / 2 + ribbon.y / 2 + tol, slab))) + part = part.union(box(*(ribbon + V21(tol)).xyz()).translate((0, -outer.y / 2 + ribbon.y / 2, slab))) return part return Ext(gen(0), gen(tol)) @@ -130,7 +130,7 @@ def build_antenna(radius, height, top_offset, top_space, top_radius, tol, hex_he def gen(tol): part = cylinder(radius + tol, height + 2 * tol).translate((0, 0, -tol)) if tol != 0: - part = part.union(cylinder(top_radius + 2 * tol, top_space + tol).translate((0, 0, top_offset))) + part = part.union(cylinder(top_radius + 2 * tol, top_space + tol).translate((0, 0, top_offset - tol))) part = part.union(cylinder(top_radius + tol + 4, height + tol - top_offset - top_space) \ .translate((0, 0, top_offset + top_space))) part = part.union(XY.polygon(6, hex_radius + tol * 2) \ @@ -315,10 +315,10 @@ def main(): oled = V(outer = V3(25.5, 26, 4), screen = V3(24.9, 16.6, 1.6), tol = tol * 2, hole = 1, pins = V3(4 * 2.54, 2.54, 0.5), - pinlen = 8, ribbon = V3(9, 5, 1)) + pinlen = 8, ribbon = V3(9, 5, 1.1)) - antenna = V(radius = 6.2/2, height = 13, top_offset = 7.6 + 0.5, - top_radius = 7.6/2, top_space = 3, tol = tol * 2, + antenna = V(radius = 6.2/2, height = 13, top_offset = 7.8, + top_radius = 7.6/2, top_space = 2.8, tol = tol * 2, hex_height = 2, hex_radius = 9) lid = V3(base.x, base.y, 10) @@ -333,7 +333,7 @@ def main(): hole_radius = 3.2/2, hole_offset = 2.8, tol = tol, bolt_radius = 3/2, bolt_head_radius = 3, bolt_depth = 4, usbc_height = 1.60) - board_space = V3(36, 50, 10) + board_space = V3(36, 54, 10) rod_support = V(thickness = thin_wall, height = 9) #rod_hole = V(height = 12, radius = m3hole) |