Merge branch 'main' into main

.gitignore

@@ -3,6 +3,4 @@ ignore/
 gridfinity-rebuilt.json
 stl/
 batch/
-docs/
+site/
-site/
-mkdocs.yml

docs/baseplates.md

@@ -0,0 +1,41 @@
+# gridfinity-rebuilt-baseplate
+
+To round out the rebuilt catalog, we have baseplates. Originally, baseplates were not included as there was not anything really interesting to parameterize, unlike with bins. However, upon closer inspection, there is a couple things that would make peoples' lives easier. For instance, what is called here the "skeletonized" style, in that the baseplate is still thick to allow for magnets, but the center portion is removed. Additionally, being able to generate spacers for the sides of the bases, so that they fit perfectly inside your drawers.
+
+![Bin](images/baseplate.gif)
+
+## Script Parameters
+
+Parameter | Range | Description
+--- | ----- | ---
+gridx | { n>=0 \| n∈R } | number of bases along the x-axis<br> If set to zero, will fill with as many <br>bases that fit within `distancex`
+gridy | { n>=0 \| n∈R } | number of bases along the y-axis<br> If set to zero, will fill with as many <br>bases that fit within `distancey`
+length | { n>0 \| n∈R } | length of one unit of the base. <br> default: 42 (The Answer to the Ultimate Question of Life, <br>the Universe, and Everything.)
+distancex | { n>0 \| n∈R } | minimum length of baseplate along x <br>alternatively, how large is the drawer along x <br>(leave zero to ignore)
+distancey | { n>0 \| n∈R } | minimum length of baseplate along y <br>alternatively, how large is the drawer along y <br>(leave zero to ignore)
+fitx | { -1<=n<=1 \| n∈R } | alignment factor for extra space along x axis
+fity | { -1<=n<=1 \| n∈R } | alignment factor for extra space along y axis
+style_plate | { 0, 1, 2 } | the style of baseplate <br>     • (0) thin (minimum material, only outline) <br>     • (1) weighted (thick with space for tire iron) <br>     • (2) skeletonized (thick, center hollowed) 
+enable_magnet | boolean | toggle hole for magnet on top
+style_hole | { 0, 1, 2 } | the style of holes underneath the baseplate, if applicable <br>     • (0) none <br>     • (1) countersink <br>     • (2) counterbore
+
+## Modules
+
+### gridfinityBaseplate
+
+Generates a baseplate to use with gridfinity bins. 
+
+** `gridfinityBaseplate(gridx, gridy, length, distancex, distancey, style_plate, enable_magnet, style_hole)` **
+
+Parameter | Range | Description
+--- | ----- | ---
+gridx | { n>=0 \| n∈R } | number of bases along the x-axis<br> If set to zero, will fill with as many <br>bases that fit within `distancex`
+gridy | { n>=0 \| n∈R } | number of bases along the y-axis<br> If set to zero, will fill with as many <br>bases that fit within `distancey`
+length | { n>0 \| n∈R } | length of one unit of the base. <br> default: 42 (The Answer to the Ultimate Question of Life, <br>the Universe, and Everything.)
+distancex | { n>0 \| n∈R } | minimum length of baseplate along x <br>alternatively, how large is the drawer along x <br>(leave zero to ignore)
+distancey | { n>0 \| n∈R } | minimum length of baseplate along y <br>alternatively, how large is the drawer along y <br>(leave zero to ignore)
+fitx | { -1<=n<=1 \| n∈R } | alignment factor for extra space along x axis
+fity | { -1<=n<=1 \| n∈R } | alignment factor for extra space along y axis
+style_plate | { 0, 1, 2 } | the style of baseplate <br>     • (0) thin (minimum material, only outline) <br>     • (1) weighted (thick with space for tire iron) <br>     • (2) skeletonized (thick, center hollowed) 
+enable_magnet | boolean | toggle hole for magnet on top
+style_hole | { 0, 1, 2 } | the style of holes underneath the baseplate, if applicable <br>     • (0) none <br>     • (1) countersink <br>     • (2) counterbore

docs/bins.md

@@ -0,0 +1,172 @@
+# gridfinity-rebuilt-bins
+
+Generates stock bins, with a great number of variations. 
+
+![Bin](images/custom_dimension.gif)
+
+## Script Parameters
+
+Parameter | Range | Description
+--- | ----- | ---
+gridx | { n>0 \| n∈R } | number of bases along the x-axis  
+gridy | { n>0 \| n∈R } | number of bases along the y-axis  
+gridz | { n>0 \| n∈R } | bin height. See bin height information and "gridz_define" below.  
+length | { n>0 \| n∈R } | length of one unit of the base. <br> default: 42 (The Answer to the Ultimate Question of Life, <br>the Universe, and Everything.)
+divx | { n>0 \| n∈Z }  | number of compartments along X
+divy | { n>0 \| n∈Z }  | number of compartments along Y
+scoop | n>0 \| n∈R | controls the fillet on the bottom of the compartment for easy <br> item removal. 0 is disabled, 1 is full, any other real number will <br> scale from full. 
+enable_zsnap | boolean | automatically snap the bin size to the nearest 7mm increment. <br> default: true
+style_lip | {0, 1, 2} | if you are not stacking the bin, you can disable the top lip <br> to save space. <br>     • (0) Regular lip <br>     • (1) Subtract lip to save space <br>     • (2) Disable lip while retaining height
+gridz_define | { n>0 \| n∈R } | determine what the variable "gridz" applies to based on <br> your use case. default: 0. <br>     • (0) gridz is the height in # of 7mm increments (Zack) <br>     • (1) gridz is the internal height in millimeters <br>     • (2) gridz is the overall external height of the bin in millimeters
+height_internal | { n>0 \| n∈R } | height of the internal block. <br> Can be lower than bin height to save filament on custom bins. <br> default of 0 means use the calculated height.
+style_tab | { 0, 1, 2, 3, 4, 5 } | how the tabs for labels are generated. <br>     • (0) Full tabs across the entire compartment <br>     • (1) automatic tabs <br>     - left aligned tabs on the left edge<br>     - right aligned tabs on right edge<br>     -  center tabs otherwise <br>     • (2) left aligned tabs <br>     • (3) center aligned tabs <br>     • (4) right aligned tabs <br>     • (5) no tabs
+style_hole | { 0, 1, 2, 3 } | the style of holes in the bases <br>     • (0) No holes <br>     • (1) Magnet holes only <br>     • (2) Magnet and screw holes - no printable slit <br>     • (3) Magnet and screw holes - with printable slit
+div_base_x | { n>=0 \| n∈Z } | number of divisions per 1 unit of base along the X axis. <br>(default 1, only use integers. <br>0 means automatically guess the division)
+div_base_y | { n>=0 \| n∈Z } | number of divisions per 1 unit of base along the Y axis. <br>(default 1, only use integers. <br>0 means automatically guess the division)
+
+<br>
+
+## Modules
+
+---
+
+### gridfinityInit
+
+Initializes the top part of the bin (walls and solid section). All bins have to use this module, and have the compartments cut out from it. 
+
+** `gridfinityInit (gridx, gridy, height, height_internal, length)` **
+
+Parameter | Range | Description
+--- | ----- | ---
+gridx | { n>0 \| n∈R } | number of bases along the x-axis  
+gridy | { n>0 \| n∈R } | number of bases along the y-axis  
+height | { n>0 \| n∈R } | height of the bin, in millimeters (but not exactly). <br> See the `height()` function for more info.
+height_internal | { n>0 \| n∈R } | height of the internal block. <br> Can be lower than bin height to save filament on custom bins. <br> default of 0 means use the calculated height.
+length | { n>0 \| n∈R } | length of one unit of the base. <br> default: 42 (The Answer to the Ultimate Question of Life, <br>the Universe, and Everything.)
+
+```
+// Example: generate a 3x3x6 bin with a 42mm unit size
+gridfinityInit(3, 3, height(6), 0, 42) {
+	cutEqual(n_divx = 3, n_divy = 3, style_tab = 0, scoop_weight = 1);
+}
+```
+
+---
+
+### height
+
+Calculates the proper height for bins. 
+ 
+** `height (gridz, gridz_define, style_lip, enable_zsnap)` **
+
+Parameter | Range | Description
+--- | ----- | ---
+gridz | { n>0 \| n∈R } | bin height. See bin height information and "gridz_define" below.  
+gridz_define | { n>0 \| n∈R } | determine what the variable "gridz" applies to based on <br> your use case. default: 0. <br>     • (0) gridz is the height in # of 7mm increments (Zack) <br>     • (1) gridz is the internal height in millimeters <br>     • (2) gridz is the overall external height of the bin in millimeters
+style_lip | {0, 1, 2} | if you are not stacking the bin, you can disable the top lip <br> to save space. <br>     • (0) Regular lip <br>     • (1) Subtract lip to save space <br>     • (2) Disable lip while retaining height
+enable_zsnap | boolean | automatically snap the bin size to the nearest 7mm increment. <br> default: true
+
+```
+// Example: height for a 6 unit high bin
+height(6);
+
+// Example: height for a bin that can fit (at maximum) a 30mm high object inside
+height(30, 1, 0, false); 
+```
+
+---
+
+### gridfinityBase 
+
+Generates the bases for bins. Has various different hole styles, and can be subdivided.
+
+** `gridfinityBase (gridx, gridy, length, div_base_x, div_base_y, style_hole)`  **
+
+Parameter | Range | Description
+--- | ----- | ---
+gridx | { n>0 \| n∈R } | number of bases along the x-axis  
+gridy | { n>0 \| n∈R } | number of bases along the y-axis 
+length | { n>0 \| n∈R } | length of one unit of the base. default: 42
+div_base_x | { n>=0 \| n∈Z } | number of divisions per 1 unit of base along the X axis. <br>(default 1, only use integers. 0 means automatically guess the division)
+div_base_y | { n>=0 \| n∈Z } | number of divisions per 1 unit of base along the Y axis. <br>(default 1, only use integers. 0 means automatically guess the division)
+style_hole | { 0, 1, 2, 3 } | the style of holes in the bases <br>     • (0) No holes <br>     • (1) Magnet holes only <br>     • (2) Magnet and screw holes - no printable slit <br>     • (3) Magnet and screw holes - with printable slit
+
+```
+// Example: generate a 3x3 base with a 42mm unit size and clean magnet holes
+gridfinityBase(3, 3, 42, 0, 0, 1);
+```
+
+---
+
+### cutEqual
+
+Generates the "traditional" bin cutters. It is a utility function that creates evenly distributed compartments. 
+
+** `cutEqual (n_divx, n_divy, style_tab, scoop_weight)` **
+
+Parameter | Range | Description
+--- | ----- | ---
+n_divx | { n>0 \| n∈Z }  | number of compartments along X
+n_divy | { n>0 \| n∈Z }  | number of compartments along Y
+style_tab | { 0, 1, 2, 3, 4, 5 } | how the tabs for labels are generated. <br>     • (0) Full tabs across the entire compartment <br>     • (1) automatic tabs <br>     - left aligned tabs on the left edge<br>     - right aligned tabs on right edge<br>     -  center tabs otherwise <br>     • (2) left aligned tabs <br>     • (3) center aligned tabs <br>     • (4) right aligned tabs <br>     • (5) no tabs
+scoop | n>0 \| n∈R | controls the fillet on the bottom of the compartment for easy <br> item removal. 0 is disabled, 1 is full, any other real number will <br> scale from full.
+
+```
+// Example: this generates 9 compartments in a 3x3 grid, and all compartments have a full tab and a scoop
+gridfinityInit(3, 3, height(6), 0, 42) {
+	cutEqual(n_divx = 3, n_divy = 3, style_tab = 0, scoop_weight = 1);
+}
+```
+
+---
+
+### cut
+
+Cuts a single compartment into the bin at the provided location with the provided attributes. The coordinate system for compartments originates (0,0) at the bottom left corner of the bin, where 1 unit is the length of 1 base. Positive X and positive Y are in the same direction as the global coordinate system.
+
+** `cut (x, y, w, h, t, s)` **
+
+Parameter | Range | Description
+--- | ----- | ---
+x | { n>=0 \| n∈R } | X coordinate of the compartment <br>(position of left edge of compartment)
+y | { n>=0 \| n∈R } | Y coordinate of the compartment <br>(position of bottom edge of compartment)
+w | { n>0 \| n∈R } | Width of the compartment, in base units <br>(1 unit = 1 `length`)
+h | { n>0 \| n∈R } | Height of the compartment, in base units <br>(1 unit = 1 `length`)
+t | { 0, 1, 2, 3, 4, 5 } | how the tabs for labels are generated for this compartment. <br>     • (0) Full tabs across the entire compartment <br>     • (1) automatic tabs <br>     - left aligned tabs on the left edge<br>     - right aligned tabs on right edge<br>     -  center tabs otherwise <br>     • (2) left aligned tabs <br>     • (3) center aligned tabs <br>     • (4) right aligned tabs <br>     • (5) no tabs
+s | n>0 \| n∈R | controls the fillet on the bottom of the compartment for easy <br> item removal. 0 is disabled, 1 is full, any other real number will <br> scale from full, only for this specific compartment
+
+```
+// Example:
+// this cuts two compartments that are both 1 wide and 2 high. 
+// One is on the bottom left, and the other is at the top right. 
+gridfinityInit(3, 3, height(6), 0, 42) {
+    cut(0, 0, 1, 2, 0, 1);
+    cut(2, 1, 1, 2, 0, 1);
+}
+```
+
+---
+
+### cut_move
+
+Moves all of its children from the global origin to the center of the area that a compartment would normally fill, and uses them to cut from the bin. This allows you to easily make custom cutouts in the bin.
+
+** `cut_move (x, y, w, h)` **
+
+Parameter | Range | Description
+--- | ----- | ---
+x | { n>=0 \| n∈R } | X coordinate of the area (position of left edge)
+y | { n>=0 \| n∈R } | Y coordinate of the area (position of bottom edge)
+w | { n>0 \| n∈R } | Width of the area, in base units (1 unit = 1 `length`)
+h | { n>0 \| n∈R } | Height of the area, in base units (1 unit = 1 `length`)
+
+```
+// Example:
+// cuts a cylindrical hole of radius 5
+// hole center is located 1/2 units from the right edge of the bin, and 1 unit from the top
+gridfinityInit(3, 3, height(6), 0, 42) {
+    cut_move(x=2, y=1, w=1, h=2) {
+          cylinder(r=5, h=100, center=true);
+    }
+}
+```

docs/constants.md

@@ -0,0 +1,38 @@
+# gridfinity-rebuilt-constants
+
+This file contains dimensions that are critical to the constructiuon of the other models, but are not values that often need to be changed. Thus, they were outsourced to this file such that the rest of the files would retain parity. All values here have the same range, this is positive real numbers. Some can be zero, but that may result in strange or invalid geometry, 
+
+Parameter | Description
+--- | ------
+h_base | height of the base
+r_base| outside rounded radius of bin
+r_c1 | lower base chamfer "radius"
+r_c2 | upper base chamfer "radius"
+h_bot| bottom thiccness of bin
+r_fo1| outside radii 1
+r_fo2| outside radii 2
+r_fo3 | outside radii 3
+r_hole1| screw hole radius
+r_hole2| magnet hole radius
+d_hole| center-to-center distance between holes
+h_hole| magnet hole depth
+h_slit| slit depth (printer layer height)
+r_f1| top edge fillet radius
+r_f2 | internal fillet radius
+d_div | width of divider between compartments 
+d_wall| minimum wall thickness
+d_clear| tolerance fit factor 
+d_tabh| height of tab (yaxis, measured from inner wall)  
+d_tabw| maximum width of tab 
+a_tab| angle of tab   
+bp_h_bot| Baseplate bottom part height (part added with weigthed=true)
+bp_cut_size| Baseplate bottom cutout rectangle size
+bp_cut_depth| Baseplate bottom cutout rectangle depth
+bp_rcut_width| Baseplate bottom cutout finger gap width
+bp_rcut_length| Baseplate bottom cutout finger gap left
+bp_rcut_depth| Baseplate bottom cutout finger gap depth
+d_cs | countersink diameter for baseplate
+r_skel| radius of cutout for skeletonized baseplate
+r_cb| baseplate counterbore radius
+h_cb| baseplate counterbore depth
+h_skel | minimum baseplate thickness (when skeletonized)

docs/index.md

@@ -0,0 +1,22 @@
+## Introduction
+Gridfinity rebuilt aims to remake the brilliant Gridfinity project from [Zack Freedman](https://www.youtube.com/c/ZackFreedman/about) in a more robust and open-source way than the original Fusion 360 files. Many major CAD suites struggle with making parametric models constructed from linear patterns, due to changing fillet edges and seams. Thus, a pure mathematical approach using OpenSCAD can allow a single solution for all possible bin variants. 
+
+The project has expanded into more eccentric models that use modules from the original generator. This wiki aims to document these modules in great detail. 
+
+Models are generated subtractively. First, the solid bin and bases are constructed, and then the compartments and holes are removed. This allows for internal fillets that nearly match the originals. However, they are not exactly perfect. There are some fillets that are too small and too difficult to be worth implementing, as most printers do not have a high enough resolution for it to matter. 
+
+## Getting Started
+For best results, use a version of OpenSCAD with the fast-csg feature. As of writing, this feature is only implemented in the [development snapshots](https://openscad.org/downloads.html). To enable the feature, go to Edit > Preferences > Features > fast-csg. This can speed up rendering from 10 minutes down to a couple of seconds, even for comically large bins. It is not a requirement to use development versions of OpenSCAD. 
+
+Most files will come ready-to-run, so parameters can be changed using OpenSCAD's built-in customizer window, and the bins will automatically generate. However, all modules are packed up nicely, so any module can be imported into other files or have more custom modifications beyond tweaking the parameters. 
+
+## Script Structure
+* Information (Imports / Script Details)
+* Parameters (Shown in Customizer)
+* Implementation (Executing the Parameters)
+* Construction (Script-Specific Modules and Constants)
+* Examples
+
+The two files which do not follow these conventions are `gridfinity-rebuilt-utility` and `gridfinity-rebuilt-constants`. These files are not meant to be exposed to the user, except for special requirements that the normal parameters cannot handle. Their respective wiki pages go into more depth. 
+
+**NOTE: This documentation is a work in progress, just like the rest of the repository, so parts may still be under construction.**

docs/lite.md

@@ -0,0 +1,55 @@
+# gridfinity-rebuilt-lite
+
+Generates stock bins, but with a twist: the bases are hollow. This is unable to be implemented directly into `gridfinity-rebuilt-bins` due to its surprisingly complex construction. It couldn't be a toggle without causing the structure of the script to fundamentally change (and become more complex) so it was moved to a separate file. Notably, there are some parameters missing, as they are incompatible with the lite variation. Additionally, the complex geometry means rendering is fairly slow, and currently causes many CSG errors. 
+
+![Bin](images/lite.gif)
+
+## Script Parameters
+
+Parameter | Range | Description
+--- | ----- | ---
+gridx | { n>0 \| n∈R } | number of bases along the x-axis  
+gridy | { n>0 \| n∈R } | number of bases along the y-axis  
+gridz | { n>0 \| n∈R } | bin height. See bin height information and "gridz_define" below.  
+length | { n>0 \| n∈R } | length of one unit of the base. <br> default: 42 (The Answer to the Ultimate Question of Life, <br>the Universe, and Everything.)
+divx | { n>0 \| n∈Z }  | number of compartments along X
+divy | { n>0 \| n∈Z }  | number of compartments along Y
+enable_zsnap | boolean | automatically snap the bin size to the nearest 7mm increment. <br> default: true
+style_lip | {0, 1, 2} | if you are not stacking the bin, you can disable the top lip <br> to save space. <br>     • (0) Regular lip <br>     • (1) Subtract lip to save space <br>     • (2) Disable lip while retaining height
+gridz_define | { n>0 \| n∈R } | determine what the variable "gridz" applies to based on <br> your use case. default: 0. <br>     • (0) gridz is the height in # of 7mm increments (Zack) <br>     • (1) gridz is the internal height in millimeters <br>     • (2) gridz is the overall external height of the bin in millimeters
+style_tab | { 0, 1, 2, 3, 4, 5 } | how the tabs for labels are generated. <br>     • (0) Full tabs across the entire compartment <br>     • (1) automatic tabs <br>     - left aligned tabs on the left edge<br>     - right aligned tabs on right edge<br>     -  center tabs otherwise <br>     • (2) left aligned tabs <br>     • (3) center aligned tabs <br>     • (4) right aligned tabs <br>     • (5) no tabs
+style_hole | { 0, 1, 2, 3 } | the style of holes in the bases <br>     • (0) No holes <br>     • (1) Magnet holes only <br>     • (2) Magnet and screw holes - no printable slit <br>     • (3) Magnet and screw holes - with printable slit
+div_base_x | { n>=0 \| n∈Z } | number of divisions per 1 unit of base along the X axis. <br>(default 1, only use integers. <br>0 means automatically guess the division)
+div_base_y | { n>=0 \| n∈Z } | number of divisions per 1 unit of base along the Y axis. <br>(default 1, only use integers. <br>0 means automatically guess the division)
+
+<br>
+
+## Modules
+
+---
+
+### gridfinityLite
+
+Wrapper function that calls [`gridfinityInit`](bins.md#gridfinityInit) and [`gridfinityBase`](bins.md#gridfinityBase) functions (hence the sheer quantity of parameters). Like [`gridfinityInit`](bins.md#gridfinityInit), it uses its children as cutters for the compartments. 
+
+**`gridfinityLite(gridx, gridy, gridz, gridz_define, enable_lip, enable_zsnap, length, div_base_x, div_base_y, style_hole)`**
+
+Parameter | Range | Description
+--- | ----- | ---
+gridx | { n>0 \| n∈R } | number of bases along the x-axis  
+gridy | { n>0 \| n∈R } | number of bases along the y-axis  
+gridz | { n>0 \| n∈R } | bin height. See bin height information and "gridz_define" below.  
+gridz_define | { n>0 \| n∈R } | determine what the variable "gridz" applies to based on <br> your use case. default: 0. <br>     • (0) gridz is the height in # of 7mm increments (Zack) <br>     • (1) gridz is the internal height in millimeters <br>     • (2) gridz is the overall external height of the bin in millimeters
+style_lip | {0, 1, 2} | if you are not stacking the bin, you can disable the top lip <br> to save space. <br>     • (0) Regular lip <br>     • (1) Subtract lip to save space <br>     • (2) Disable lip while retaining height
+enable_zsnap | boolean | automatically snap the bin size to the nearest 7mm increment. <br> default: true
+length | { n>0 \| n∈R } | length of one unit of the base. <br> default: 42 (The Answer to the Ultimate Question of Life, <br>the Universe, and Everything.)
+div_base_x | { n>=0 \| n∈Z } | number of divisions per 1 unit of base along the X axis. <br>(default 1, only use integers. <br>0 means automatically guess the division)
+div_base_y | { n>=0 \| n∈Z } | number of divisions per 1 unit of base along the Y axis. <br>(default 1, only use integers. <br>0 means automatically guess the division)
+style_hole | { 0, 1, 2, 3 } | the style of holes in the bases <br>     • (0) No holes <br>     • (1) Magnet holes only <br>     • (2) Magnet and screw holes - no printable slit <br>     • (3) Magnet and screw holes - with printable slit
+
+```
+// Example: generate a 3x3x6 bin with 2x2 compartments, that is hollow
+gridfinityLite(gridx=3, gridy=3, gridz=6, gridz_define=0, enable_lip=true, enable_zsnap=false, length=42, div_base_x=0, div_base_y=0, style_hole=1) {
+    cutEqual(n_divx=2, n_divy=2, style_tab=1, enable_scoop = false);
+}
+```

docs/vase.md

@@ -0,0 +1,75 @@
+# gridfinity-spiral-vase
+
+Some assembly required!
+Adaptation of Gridfinity bins to work with spiral vase mode, as to save filament and print time. A big drawback of using vase mode for Gridfinity bins was that they would be very flimsy, and would lack the features that make Gridfinity such a good organizational tool. The goal of this implementation was to maintain the design philosophy while working under the constraints of vase mode. 
+
+![Bin](images/vase_dividers.gif)
+![Bin](images/vase_base.gif)
+
+## Instructions
+Normal Gridfinity is impossible to convert to vase mode due to the geometry of the bases, meaning most existing vase mode Gridfinity models are limited to 1x1 bins. How this script gets around the impossible is to use two separate pieces. **The bin and bases must be printed separately, and then glued together to form the final bin.** While this is slightly more work, there is an added bonus to this method, as for larger bins you may not need every single grid slot to have a base, you only really need them on the corners, or the edges, with some in the middle for support. Using less bases saves filament and print time.
+
+All parameters are global. The customizer has descriptions for all parameters. It is **essential** that the section *Printer Settings* matches your preferred slicer's settings, otherwise the model will not slice correctly. Additionally, you have to turn on the spiral vase parameter in your slicer. If you do not know what vase mode is, [this](https://www.youtube.com/watch?v=HZSFoFYpBaA) is a helpful video. 
+
+1. Change the *Printer Settings* parameters to match your slicer and printer settings.
+2. Run the `gridfinityVaseBase()` module. This will generate a single spiral-capable base. Export as an STL file. You will need to print multiple of these, so it recommended to fill a base plate with them using the "complete individual objects" option (or equivilant) in your slicer. You only need to do this step initially, and then each time your printer settings change afterwards. 
+3. Change the bin parameters and run `gridfinityVase()` module to generate the main bin. 
+4. Glue bases to the bottom of the bin. I recommend superglue on the corners and the top of the magnet holes. 
+
+How your sliced files should look (cross section shown for 1x1 bin):
+
+![Bin](images/slicer_bin.png)
+![Bin](images/slicer_base.png)
+
+Example sliced files can be found on the [Printables](https://www.printables.com/model/284371-spiral-vase-gridfinity-in-openscad) page. 
+
+## Statistics
+Given how it has become a bit of a [challenge](https://www.printables.com/model/265271-gridfinity-lite-economical-plain-storage-bins) to reduce the weight and print time for these bins, here is a comparison for a large bin:
+
+| Type | Weight | Time |
+|--------------|-----------|------------|
+Plain 4x2x6 Bin | 114.66g | 3h58m
+Vase 4x2x6 Bin with 8 Bases | 68.31g | 2h27m
+Vase 4x2x6 Bin with 4 Bases (only corners) | 56.43g | 1h59m
+
+Clearly, vase mode is very quick and quite lightweight. However, this fundamentally means the bins will be weaker, so keep that in mind. 
+
+## Script Parameters
+
+Parameter | Range | Description
+--- | ----- | ---
+type | { 0 , 1 } | generate the bin (0) or base (1)
+nozzle | { n>0 \| n∈R } | extrusion width in slicer
+layer | { n>0 \| n∈R } | size of layers in slicer
+bottom_layer | { n>0 \| n∈Z } | number of layers on the bottom of the print
+gridx | { n>0 \| n∈R } | number of bases along the x-axis  
+gridy | { n>0 \| n∈R } | number of bases along the y-axis  
+gridz | { n>0 \| n∈R } | bin height. See bin height information and <br> "gridz_define" below.  
+length | { n>0 \| n∈R } | length of one unit of the base. <br> default: 42 (The Answer to the Ultimate Question of <br>Life, the Universe, and Everything.)
+n_divx | { n>0 \| n∈Z }  | number of compartments along X
+enable_holes | boolean | toggle holes inside the base
+enable_zsnap | boolean | automatically snap the bin size to the nearest <br> 7mm increment. default: true
+enable_lip | boolean | if you are not stacking the bin, you can disable the <br>top lip to save space. default: true
+enable_scoop_chamfer | boolean | toggles the chamfer on bottom edge <br> for easy removal of items
+enable_funnel | boolean | toggles funnel on back of tab. <br> acts as a finger grip and pour spout for small parts.
+enable_inset | boolean | toggles an inset on the front of the bin. <br> adds strength when using scoop. 
+enable_pinch | boolean | toggles an outside pinch at the top lip of the bin. <br> adds strength. 
+gridz_define | { n>0 \| n∈R } | determine what the variable "gridz" applies to based on <br> your use case. default: 0. <br>     • (0) gridz is the height in # of 7mm increments (Zack) <br>     • (1) gridz is the internal height in mm <br>     • (2) gridz is the overall external height of the bin in mm
+style_tab | { 0, 1, 2, 3, 4, 5 } | how the tabs for labels are generated. <br>     • (0) Full tabs across the entire compartment <br>     • (1) automatic tabs <br>     - left aligned tabs on the left edge<br>     - right aligned tabs on right edge<br>     -  center tabs otherwise <br>     • (2) left aligned tabs <br>     • (3) center aligned tabs <br>     • (4) right aligned tabs <br>     • (5) no tabs
+style_base | { 0, 1, 2, 3, 4} | specifies the locations for the "X" cutouts for bases. <br>     • (0) all <br>     • (1) corners <br>     • (2) edges <br>     • (3) automatic <br>     • (4) none
+a_tab | { n>0 \| n∈R } | angle of the tab 
+
+## Modules 
+
+### gridfinityVase
+
+Generates the compartment section of the bin. No parameters as it uses the global parameters for construction.  
+
+**`gridfinityVase()`**
+
+
+### gridfinityVaseBase
+
+Generates the base section of the bin. No parameters as it uses the global parameters for construction. It only generates a single base, as all of them are the same. Use your slicer with the "outpuit individual objects" option to print a full sheet of these, or as many as you need to fit your bins. 
+
+**`gridfinityVaseBase()`**

gridfinity-rebuilt-baseplate.scad

@@ -35,14 +35,20 @@ n_screws = 1; // [1:3]
 
 /* [Fit to Drawer] */
 // minimum length of baseplate along x (leave zero to ignore, will automatically fill area if gridx is zero)
-distancex = 0; 
+distancex = 0;
 // minimum length of baseplate along y (leave zero to ignore, will automatically fill area if gridy is zero)
-distancey = 0; 
+distancey = 0;
+
+// where to align extra space along x
+fitx = 0; // [-1:0.1:1]
+// where to align extra space along y
+fity = 0; // [-1:0.1:1]
+
 
 /* [Styles] */
 
 // baseplate styles
-style_plate = 3; // [0: thin, 1:weighted, 2:skeletonized, 3: screw together]
+style_plate = 0; // [0: thin, 1:weighted, 2:skeletonized, 3: screw together, 4: screw together minimal]
 
 // enable magnet hole
 enable_magnet = true; 
@@ -54,12 +60,12 @@ style_hole = 2; // [0:none, 1:contersink, 2:counterbore]
 // ===== IMPLEMENTATION ===== //
 
 color("tomato") 
-gridfinityBaseplate(gridx, gridy, length, distancex, distancey, style_plate, enable_magnet, style_hole);
+gridfinityBaseplate(gridx, gridy, length, distancex, distancey, style_plate, enable_magnet, style_hole, fitx, fity);
 
 
 // ===== CONSTRUCTION ===== //
 
-module gridfinityBaseplate(gridx, gridy, length, dix, diy, sp, sm, sh) {
+module gridfinityBaseplate(gridx, gridy, length, dix, diy, sp, sm, sh, fitx, fity) {
     
     assert(gridx > 0 || dix > 0, "Must have positive x grid amount!");
     assert(gridy > 0 || diy > 0, "Must have positive y grid amount!");
@@ -68,16 +74,20 @@ module gridfinityBaseplate(gridx, gridy, length, dix, diy, sp, sm, sh) {
     gy = gridy == 0 ? floor(diy/length) : gridy; 
     dx = max(gx*length-0.5, dix);
     dy = max(gy*length-0.5, diy);
-    off = (sp==0?0:sp==1?bp_h_bot:h_skel+(sm?h_hole:0)+(sh==0?sp!=3?0:d_screw:sh==1?d_cs:h_cb));
+
+    off = (sp==0?0:sp==1?bp_h_bot:h_skel+(sm?h_hole:0)+(sh==0?(sp!=3&&sp!=4)?0:d_screw:sh==1?d_cs:h_cb));
+
+    offsetx = dix < dx ? 0 : (gx*length-0.5-dix)/2*fitx*-1;
+    offsety = diy < dy ? 0 : (gy*length-0.5-diy)/2*fity*-1;
     
     difference() {
-        translate([0,0,h_base])
+        translate([offsetx,offsety,h_base])
         mirror([0,0,1])
         rounded_rectangle(dx, dy, h_base+off, r_base);
         
         gridfinityBase(gx, gy, length, 1, 1, 0, 0.5, false);
         
-        translate([0,0,h_base-0.6])
+        translate([offsetx,offsety,h_base-0.6])
         rounded_rectangle(dx*2, dy*2, h_base*2, r_base);
         
         pattern_linear(gx, gy, length) {
@@ -86,17 +96,19 @@ module gridfinityBaseplate(gridx, gridy, length, dix, diy, sp, sm, sh) {
             if (sp == 1)
                 translate([0,0,-off])
                 cutter_weight();
-            else if (sp == 2 || sp == 3) {
+            else if (sp == 2 || sp == 3) 
                 linear_extrude(10*(h_base+off), center = true)
                 profile_skeleton();
-            }
+            else if (sp == 4) 
+                translate([0,0,-5*(h_base+off)])
+                rounded_square(length-2*r_c2-2*r_c1, 10*(h_base+off), r_fo3);
             
             translate([0,0,-off]) { 
                 if (sh == 1) cutter_countersink();
                 else if (sh == 2) cutter_counterbore();
             }
         }
-        if (sp == 3) cutter_screw_together(gx, gy, off);    
+        if (sp == 3 || sp ==4) cutter_screw_together(gx, gy, off);    
     }
 
 }

gridfinity-rebuilt-bins.json

@@ -0,0 +1,24 @@
+{
+    "fileFormatVersion": "1",
+    "parameterSets": {
+        "New set 1": {
+            "$fa": "8",
+            "$fs": "0.25",
+            "div_base_x": "0",
+            "div_base_y": "0",
+            "divx": "1",
+            "divy": "1",
+            "enable_zsnap": "false",
+            "gridx": "1",
+            "gridy": "1",
+            "gridz": "6",
+            "gridz_define": "0",
+            "height_internal": "0",
+            "length": "42",
+            "scoop": "1",
+            "style_hole": "3",
+            "style_lip": "0",
+            "style_tab": "1"
+        }
+    }
+}

gridfinity-rebuilt-bins.scad

@@ -43,22 +43,21 @@ divx = 1;
 // number of y Divisions
 divy = 1;
 
-/* [Toggles] */
+/* [Height] */
-// internal fillet for easy part removal
-enable_scoop = true;
-// snap gridz height to nearest 7mm increment
-enable_zsnap = false;
-// how should the top lip act
-style_lip = 0; //[0: Regular lip, 1:remove lip subtractively, 2: remove lip and retain height]
-
-/* [Other] */
 // determine what the variable "gridz" applies to based on your use case
 gridz_define = 0; // [0:gridz is the height of bins in units of 7mm increments - Zack's method,1:gridz is the internal height in millimeters, 2:gridz is the overall external height of the bin in millimeters]
-// the type of tabs
-style_tab = 1; //[0:Full,1:Auto,2:Left,3:Center,4:Right,5:None]
-
 // overrides internal block height of bin (for solid containers). Leave zero for default height. Units: mm
 height_internal = 0; 
+// snap gridz height to nearest 7mm increment
+enable_zsnap = false;
+
+/* [Features] */
+// the type of tabs
+style_tab = 1; //[0:Full,1:Auto,2:Left,3:Center,4:Right,5:None]
+// how should the top lip act
+style_lip = 0; //[0: Regular lip, 1:remove lip subtractively, 2: remove lip and retain height]
+// scoop weight percentage. 0 disables scoop, 1 is regular scoop. Any real number will scale the scoop. 
+scoop = 1; //[0:0.1:1]
 
 /* [Base] */
 style_hole = 3; // [0:no holes, 1:magnet holes only, 2: magnet and screw holes - no printable slit, 3: magnet and screw holes - printable slit]
@@ -75,7 +74,7 @@ color("tomato") {
 gridfinityInit(gridx, gridy, height(gridz, gridz_define, style_lip, enable_zsnap), height_internal, length) {
 
     if (divx > 0 && divy > 0)
-    cutEqual(n_divx = divx, n_divy = divy, style_tab = style_tab, enable_scoop = enable_scoop);
+    cutEqual(n_divx = divx, n_divy = divy, style_tab = style_tab, scoop_weight = scoop);
 }
 gridfinityBase(gridx, gridy, length, div_base_x, div_base_y, style_hole);
 
@@ -87,7 +86,7 @@ gridfinityBase(gridx, gridy, length, div_base_x, div_base_y, style_hole);
 // 3x3 even spaced grid
 /*
 gridfinityInit(3, 3, height(6), 0, 42) {
-	cutEqual(n_divx = 3, n_divy = 3, style_tab = 0, enable_scoop = true);
+	cutEqual(n_divx = 3, n_divy = 3, style_tab = 0, scoop_weight = 0);
 }
 gridfinityBase(3, 3, 42, 0, 0, 1);
 */
@@ -95,13 +94,13 @@ gridfinityBase(3, 3, 42, 0, 0, 1);
 // Compartments can be placed anywhere (this includes non-integer positions like 1/2 or 1/3). The grid is defined as (0,0) being the bottom left corner of the bin, with each unit being 1 base long. Each cut() module is a compartment, with the first four values defining the area that should be made into a compartment (X coord, Y coord, width, and height). These values should all be positive. t is the tab style of the compartment (0:full, 1:auto, 2:left, 3:center, 4:right, 5:none). s is a toggle for the bottom scoop. 
 /*
 gridfinityInit(3, 3, height(6), 0, 42) {
-    cut(x=0, y=0, w=1.5, h=0.5, t=5, s=false);
+    cut(x=0, y=0, w=1.5, h=0.5, t=5, s=0);
-    cut(0, 0.5, 1.5, 0.5, 5, false);
+    cut(0, 0.5, 1.5, 0.5, 5, 0);
-    cut(0, 1, 1.5, 0.5, 5, false);
+    cut(0, 1, 1.5, 0.5, 5, 0);
     
-    cut(0,1.5,0.5,1.5,5,false);
+    cut(0,1.5,0.5,1.5,5,0);
-    cut(0.5,1.5,0.5,1.5,5,false);
+    cut(0.5,1.5,0.5,1.5,5,0);
-    cut(1,1.5,0.5,1.5,5,false);
+    cut(1,1.5,0.5,1.5,5,0);
     
     cut(1.5, 0, 1.5, 5/3, 2);
     cut(1.5, 5/3, 1.5, 4/3, 4);
@@ -112,7 +111,7 @@ gridfinityBase(3, 3, 42, 0, 0, 1);
 // Compartments can overlap! This allows for weirdly shaped compartments, such as this "2" bin. 
 /*
 gridfinityInit(3, 3, height(6), 0, 42)  {
-    cut(0,2,2,1,5,false);
+    cut(0,2,2,1,5,0);
     cut(1,0,1,3,5);
     cut(1,0,2,1,5);
     cut(0,0,1,2);

gridfinity-rebuilt-lite.scad

@@ -33,8 +33,8 @@ divy = 2;
 /* [Toggles] */
 // snap gridz height to nearest 7mm increment
 enable_zsnap = false;
-// enable upper lip for stacking other bins
+// how should the top lip act
-enable_lip = true;
+style_lip = 0; //[0: Regular lip, 1:remove lip subtractively, 2: remove lip and retain height]
 
 /* [Other] */
 // determine what the variable "gridz" applies to based on your use case
@@ -48,23 +48,25 @@ style_hole = 0; // [0:no holes, 1:magnet holes only, 2: magnet and screw holes -
 div_base_x = 0;
 // number of divisions per 1 unit of base along the Y axis. (default 1, only use integers. 0 means automatically guess the right division)
 div_base_y = 0; 
+// thickness of bottom layer
+bottom_layer = 1;
 
 
 // ===== IMPLEMENTATION ===== //
 
 // Input all the cutter types in here
 color("tomato")
-gridfinityLite(gridx, gridy, gridz, gridz_define, enable_lip, enable_zsnap, length, div_base_x, div_base_y, style_hole) {
+gridfinityLite(gridx, gridy, gridz, gridz_define, style_lip, enable_zsnap, length, div_base_x, div_base_y, style_hole) {
-    cutEqual(n_divx = divx, n_divy = divy, style_tab = style_tab, enable_scoop = false);
+    cutEqual(n_divx = divx, n_divy = divy, style_tab = style_tab, scoop_weight = 0);
 }
 
 // ===== CONSTRUCTION ===== //
 
 
-module gridfinityLite(gridx, gridy, gridz, gridz_define, enable_lip, enable_zsnap, length, div_base_x, div_base_y, style_hole) { 
+module gridfinityLite(gridx, gridy, gridz, gridz_define, style_lip, enable_zsnap, length, div_base_x, div_base_y, style_hole) { 
     difference() {
         union() {
-            gridfinityInit(gridx, gridy, height(gridz, gridz_define, enable_lip, enable_zsnap), 0, length)
+            gridfinityInit(gridx, gridy, height(gridz, gridz_define, style_lip, enable_zsnap), 0, length)
             children();
             gridfinityBase(gridx, gridy, length, div_base_x, div_base_y, style_hole);
         }
@@ -79,6 +81,8 @@ module gridfinityLite(gridx, gridy, gridz, gridz_define, enable_lip, enable_zsna
                     }
                     translate([0,0,-1])
                     rounded_rectangle(gridx*length-0.5005-d_wall*2, gridy*length-0.5005-d_wall*2, 1000, r_f2);
+                    translate([0,0,bottom_layer])
+                    rounded_rectangle(gridx*1000, gridy*1000, 1000, r_f2);
                 }
                 translate([0,0,h_base+d_clear])
                 rounded_rectangle(gridx*length-0.5005-d_wall*2, gridy*length-0.5005-d_wall*2, h_base, r_f2);

gridfinity-rebuilt-utility.scad

@@ -15,11 +15,11 @@ function height (z,d=0,l=0,s=true) = (s?((abs(hf(z,d,l))%7==0)?hf(z,d,l):hf(z,d,
 // n_divy:  number of y compartments (ideally, coprime w/ gridy) 
 //          set n_div values to 0 for a solid bin 
 // style_tab:   tab style for all compartments. see cut()
-// enable_scoop:    scoop toggle for all compartments. see cut()
+// scoop_weight:    scoop toggle for all compartments. see cut()
-module cutEqual(n_divx=1, n_divy=1, style_tab=1, enable_scoop=true) {
+module cutEqual(n_divx=1, n_divy=1, style_tab=1, scoop_weight=1) {
     for (i = [1:n_divx]) 
     for (j = [1:n_divy])
-    cut((i-1)*$gxx/n_divx,(j-1)*$gyy/n_divy, $gxx/n_divx, $gyy/n_divy, style_tab, enable_scoop);
+    cut((i-1)*$gxx/n_divx,(j-1)*$gyy/n_divy, $gxx/n_divx, $gyy/n_divy, style_tab, scoop_weight);
 }
 
 // initialize gridfinity
@@ -53,7 +53,7 @@ module gridfinityInit(gx, gy, h, h0 = 0, l) {
 //      0:full, 1:auto, 2:left, 3:center, 4:right, 5:none
 //      Automatic alignment will use left tabs for bins on the left edge, right tabs for bins on the right edge, and center tabs everywhere else. 
 // s:   toggle the rounded back corner that allows for easy removal
-module cut(x=0, y=0, w=1, h=1, t=1, s=true) {
+module cut(x=0, y=0, w=1, h=1, t=1, s=1) {
     translate([0,0,-$dh-h_base])
     cut_move(x,y,w,h)
     block_cutter(clp(x,0,$gxx), clp(y,0,$gyy), clp(w,0,$gxx-x), clp(h,0,$gyy-y), t, s);
@@ -235,7 +235,7 @@ module block_cutter(x,y,w,h,t,s) {
     xlen = w*($gxx*length+d_magic)/$gxx-d_div; 
     
     height = $dh;
-    extent = (s && ycutfirst ? d_wall2-d_wall-d_clear : 0); 
+    extent = (abs(s) > 0 && ycutfirst ? d_wall2-d_wall-d_clear : 0); 
     tab = (zsmall || t == 5) ? (ycutlast?v_len_lip:0) : v_len_tab; 
     ang = (zsmall || t == 5) ? (ycutlast?v_ang_lip:0) : v_ang_tab;
     cut = (zsmall || t == 5) ? (ycutlast?v_cut_lip:0) : v_cut_tab;
@@ -301,7 +301,7 @@ module block_cutter(x,y,w,h,t,s) {
             if (!((zsmall || t == 5) && !ycutlast))
             profile_cutter_tab(height-h_bot, tab, ang);
             
-            if (!s && y == 0)
+            if (!(abs(s) > 0)&& y == 0)
             translate([ylen-extent,0,0])
             mirror([1,0,0])
             profile_cutter_tab(height-h_bot, v_len_lip, v_ang_lip);
@@ -349,7 +349,7 @@ module fillet_cutter(t = 0, c = "goldenrod") {
 }
 
 module profile_cutter(h, l, s) {
-    scoop = s ? (length*(($dh-2)/7+1)/12-r_f2) : 0; 
+    scoop = max(s*$dh/2-r_f2,0); 
     translate([r_f2,r_f2])
     hull() {
         if (l-scoop-2*r_f2 > 0)

gridfinity-spiral-vase.scad

@@ -86,7 +86,7 @@ me = ((gridx*length-0.5)/n_divx)-nozzle*4-r_fo1-12.7-4;
 m = min(d_tabw/1.8 + max(0,me), d_tabw/1.25);
 d_ramp = f2c*(length*((d_height-2)/7+1)/12-r_f2)+d_wall2;
 d_edge = ((gridx*length-0.5)/n_divx-d_tabw-r_fo1)/2; 
-n_st = d_edge < 2 && style_tab != 0 && style_tab != 6 ? 1 : style_tab == 1 && n_divx <= 1? 0 : style_tab; 
+n_st = gridz <= 3 ? 6 : d_edge < 2 && style_tab != 0 && style_tab != 6 ? 1 : style_tab == 1 && n_divx <= 1? 0 : style_tab; 
 
 n_x = (n_st==0?1:n_divx); 
 spacing = (gridx*length-0.5)/(n_divx);
@@ -121,7 +121,7 @@ module gridfinityVase() {
                 cube([gridx*length,d_wall2,d_height-0.2],center=true);
             }
 
-            if (enable_funnel)
+            if (enable_funnel && gridz > 3)
             pattern_linear((n_st==0?n_divx>1?n_divx:gridx:1), 1, (gridx*length-r_fo1)/(n_st==0?n_divx>1?n_divx:gridx:1))
             transform_funnel()
             block_funnel_outside();
@@ -135,7 +135,7 @@ module gridfinityVase() {
             block_tabsupport();
         }
         
-        if (enable_funnel)
+        if (enable_funnel && gridz > 3)
         pattern_linear((n_st==0?n_divx>1?n_divx:gridx:1), 1, (gridx*length-r_fo1)/(n_st==0?n_divx>1?n_divx:gridx:1))
         transform_funnel()
         block_funnel_inside();
@@ -330,7 +330,7 @@ module block_divider_edgecut() {
 }
 
 module transform_funnel() {
-    if (me > 6 && enable_funnel && n_st != 6)
+    if (me > 6 && enable_funnel && gridz > 3 && n_st != 6)
     transform_style()
     render()
     children();
@@ -476,7 +476,7 @@ module block_tabscoop(a=m, b=0, c=0, d=-1) {
         profile_tabscoop(a);
         
         translate([-gridx*length/2,-m,-m])
-        cube([gridx*length,m-d_tabh*cos(a_tab)+0.005+c,d_height*2]);
+        cube([gridx*length,m-d_tabh*cos(a_tab)+0.005+c,d_height*20]);
         
         if (d >= 0)
         translate([0,0,-d_tabh*sin(a_tab)+d_height+m/2+d+2.1])

mkdocs.yml

@@ -0,0 +1,12 @@
+site_name: Gridfinity Rebuilt
+theme: readthedocs
+nav:
+    - Home: index.md
+    - Bins: bins.md
+    - Baseplates: baseplates.md
+    - Lite: lite.md
+    - Vase: vase.md
+    - Constants: constants.md
+plugins:
+  - search
+  - autorefs