use wall as diameter and radius on 3030 rounded edges

diff --git a/mk2-haribo-spool-holder.scad b/mk2-haribo-spool-holder.scad
index 1d5fda584c205733f09e2e74547ad9b354f965e0..90fdcde480274718b51357a02e32a97f13c4ee88 100644 (file)
--- a/mk2-haribo-spool-holder.scad
+++ b/mk2-haribo-spool-holder.scad
@@ -11,9 +11,6 @@ diagonal = sqrt(pow(30/2, 2) + pow(30/2, 2));
 opening_width = 8;
 inner_block = 12;
 
-major_block_corner_diameter = 4;
-major_block_corner_radius = major_block_corner_diameter / 2;
-
 corner_block_inner = (30 - 16.5) / 2;
 wall = 2;
 
@@ -22,18 +19,15 @@ $fn = 40;
 module arm_half(){
   square(inner_block / 2);
   rotate(45) {
-    square([diagonal - major_block_corner_radius, wall / 2]); }
+    square([diagonal - wall, wall / 2]); }
   translate([x / 2 - corner_block_inner, y / 2 - corner_block_inner]) {
     square(corner_block_inner - wall); }
-  translate([(opening_width + major_block_corner_diameter) / 2,
-             y/2 - wall]) {
-    square([(x - opening_width - 2 * major_block_corner_diameter) / 2,
-            wall]);
-    translate([0, wall/2]){
-      circle(wall / 2); } }
-  translate([(x - major_block_corner_diameter) / 2,
-             (y - major_block_corner_diameter) / 2]) {
-    circle(major_block_corner_radius); } }
+  translate([opening_width / 2 + wall, y / 2 - wall]) {
+    square([(x - opening_width) / 2 - 2 * wall, wall]);
+    translate([0, wall / 2]){
+      circle(d = wall); } }
+  translate([x / 2 - wall, y / 2 - wall]) {
+    circle(wall); } }
 
 arms = 4;
 for(arm = [0:arms - 1]) {