diff --git a/docs/_build/doctrees/solidLib.primitives.doctree b/docs/_build/doctrees/solidLib.primitives.doctree
new file mode 100644
index 0000000..d61335c
Binary files /dev/null and b/docs/_build/doctrees/solidLib.primitives.doctree differ
diff --git a/docs/_build/html/_sources/solidLib.primitives.rst.txt b/docs/_build/html/_sources/solidLib.primitives.rst.txt
new file mode 100644
index 0000000..7967d40
--- /dev/null
+++ b/docs/_build/html/_sources/solidLib.primitives.rst.txt
@@ -0,0 +1,7 @@
+solidLib.primitives module
+==========================
+
+.. automodule:: solidLib.primitives
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/docs/_build/html/solidLib.primitives.html b/docs/_build/html/solidLib.primitives.html
new file mode 100644
index 0000000..9b8e0cc
--- /dev/null
+++ b/docs/_build/html/solidLib.primitives.html
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/solidLib.primitives.rst b/docs/solidLib.primitives.rst
new file mode 100644
index 0000000..7967d40
--- /dev/null
+++ b/docs/solidLib.primitives.rst
@@ -0,0 +1,7 @@
+solidLib.primitives module
+==========================
+
+.. automodule:: solidLib.primitives
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/solidLib/assortment.py b/solidLib/assortment.py
index 9a664c7..655d333 100644
--- a/solidLib/assortment.py
+++ b/solidLib/assortment.py
@@ -37,7 +37,7 @@ def grid(
scallop = slp.pill(
[
[0, 0, 0],
- [dsl.settings.raster - 2 * h - (w - 2 * h), 0, 0],
+ [sl.settings.raster - 2 * h - (w - 2 * h), 0, 0],
# [0,0,h], [dim - 2 * h - (w - 2 * h),0,h]
],
h,
@@ -71,7 +71,7 @@ def grid_inv(
return scad.cube([x * sl.settings.raster, y * sl.settings.raster, h]) - g
-def bin(x: float, y: float, h: float = 67):
+def bin(x: float, y: float, h: float = 67, wall: float = 2):
"""
standardized container
@@ -79,20 +79,19 @@ def bin(x: float, y: float, h: float = 67):
"""
class dims:
- wall = 2
r_in = 2
- r_out = r_in + wall
+ r_out = r_in + 2
- bulk = slp.rfcube([sl.settings.raster * x, sl.settings.raster * y, h], sl.settings.raster.r_out)
- hole = slp.rcube([sl.settings.raster * x - dims.wall * 2, sl.settings.raster * y - dims.wall * 2, h], dims.r_in)
- hole = scad.translate([dims.wall, dims.wall, dims.wall])(hole)
+ bulk = slp.rfcube([sl.settings.raster * x, sl.settings.raster * y, h], dims.r_out)
+ hole = slp.rcube([sl.settings.raster * x - wall * 2, sl.settings.raster * y - wall * 2, h], dims.r_in)
+ hole = scad.translate([wall, wall, wall])(hole)
wall_o = scad.cylinder(r=dims.r_out, h=dims.r_out, segments=sl.settings.segments)
g = grid(x, y)
- goverlay = grid(x, y, w=2 + 2 * dims.wall, h=dims.r_in, fillet=True)
- goverlay = scad.translate([0, 0, dims.wall])(goverlay)
+ goverlay = grid(x, y, w=2 + 2 * wall, h=dims.r_in, fillet=True)
+ goverlay = scad.translate([0, 0, wall])(goverlay)
goverlay = scad.intersection()(goverlay, hole)
return bulk - hole - g + goverlay
@@ -174,7 +173,8 @@ def toolinlay2(
:param inset_tool: depth of additional toolspace inset
:param maxh: system height restriction
"""
- x_dim = 3
+ x_dim = 2
+ y_dim = 3
r_in = 2
base = slp.rfcube([x_dim * sl.settings.raster, y_dim * sl.settings.raster, height + inset], r_in + wall)
@@ -244,7 +244,7 @@ def toolinlay2(
)
)
- lower = bin(2, 3, h=maxh - height, dim=sl.settings.raster)
+ lower = bin(2, 3, h=maxh - height, wall=2.2)
lower = scad.color("red", 0.5)(lower)
base = scad.translate([0, 0, maxh - height - inset])(base)