From 767100ffaa825d9f51f64d65011f69fb6bffbdfe Mon Sep 17 00:00:00 2001
From: Tomas Mudrunka <tomas.mudrunka@gmail.com>
Date: Fri, 25 Oct 2024 00:48:07 +0200
Subject: [PATCH] planter4 fix

---
 openscad/planter4.scad | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/openscad/planter4.scad b/openscad/planter4.scad
index 0ac34dc..1fb3ddf 100644
--- a/openscad/planter4.scad
+++ b/openscad/planter4.scad
@@ -1,24 +1,27 @@
 module planter_cavity(void=0, da=70, db=83) {
 	translate([0,0,15]) difference() {
-		cylinder(d1=da, d2=db, h=83, $fn=12);
-		if(void) translate([0,0,void/2]) cylinder(d1=da-void, d2=db-void, h=83, $fn=12);
+		intersection() {
+			cylinder(d1=da, d2=db, h=83, $fn=12);
+			cylinder(d1=da-5, d2=db*2, h=83, $fn=12);
+		}
+		if(void) translate([0,0,-15+1.5]) scale([0.95,0.95,1]) planter_cavity();
 	}
 }
 
 module planter() {
 	difference() {
 		union() {
-		translate([0,0,15]) for (h = [0 : 1 : 2] ){
-			translate([0,0,h*31.5])
-			for (r = [0 : 40 : 360] ){
-				rotate([90,90,r+20*(h%2)])
-				difference() {
-					translate([0,0,40]) cylinder(d2=35, d1=66, h=10, $fn=6);
-					translate([0,0,49.2]) cylinder(d1=20, d2=100, h=10, $fn=6);
+			translate([0,0,15]) for (h = [0 : 1 : 2] ){
+				translate([0,0,h*31.5])
+				for (r = [0 : 40 : 360] ){
+					rotate([90,90,r+20*(h%2)])
+					difference() {
+						translate([0,0,40]) cylinder(d2=35, d1=66, h=10, $fn=6);
+						translate([0,0,49.2]) cylinder(d1=20, d2=100, h=10, $fn=6);
+					}
 				}
 			}
-		}
-		cylinder(d=90, h=94);
+			cylinder(d=90, h=94);
 	    }
 
 		translate([0,0,-50]) cylinder(d=140, h=50);
@@ -34,7 +37,7 @@ difference() {
 		//translate([0,0,0.1]) cylinder(d=110, h=100);
 		translate([0,0,90]) cylinder(d=103, h=7);
 		translate([0,0,0.001]) rotate([0,0,90])
-			scale([1.04,1.04,1.001]) planter();
+			scale([1.03,1.03,1.001]) planter();
 		translate([-60,0,97/2]) cube([3,7,97], center=true);
 		translate([ 60,0,97/2]) cube([3,7,97], center=true);
 		translate([  0,0,97/2]) cube([120,4,96.99], center=true);
-- 
2.30.2