harmonize and get rid of unused variables

diff --git a/3d-printables/sonar-table-top-holder.scad b/3d-printables/sonar-table-top-holder.scad
index e3535d90a52afa6d7050eee0df699e9ad3c824f3..d34c694c7c675f18516a3c0c345b81c63cb52878 100644 (file)
--- a/3d-printables/sonar-table-top-holder.scad
+++ b/3d-printables/sonar-table-top-holder.scad
@@ -10,64 +10,63 @@ $fn = 60;
 // 1/4 inch in mm = 6.35
 // subtract a little to be a squeeze fit
 deck_depth = 4.7625 - 0.4;
-sonar_plate_width = 20;
 // sonar sensor measurements taken with calipers:
 //  10.82 in between, 42.33 outside, 15.82 diameter
 // measured diameter of 15.82 with calipers,
-//  but when printed ends up being too small
-sonar_sensor_radius = 15.82 / 2 + 0.3;
-sonar_sensor_height = 13.8;
-between_sensor_centers = sonar_sensor_radius * 2 + 10.82;
-between_sensor_centers_variance = 2;
+//  but when printed ends up being too small, so add some
+sonar_diameter = 15.82 + 0.6;
+sonar_radius = sonar_diameter / 2;
+sonar_height = 13.8;
+between_sonar_centers = sonar_diameter + 10.82;
+// the sonar cylinders are placed on the pcb at slightly different positions
+//  from one sensor to the next, so this allows for that variance.
+between_sonar_centers_variance = 2;
+// keep at least this much plastic surrounding the sonar cylinder on all sides
 buffer = 3;
-sonar_plate_length =
-  buffer + between_sensor_centers + sonar_sensor_radius + buffer;
-sonar_holder_length = sonar_plate_length + 10;
-sonar_holder_width = sonar_plate_width + 3;
+sonar_holder_length = buffer + between_sonar_centers + sonar_diameter + buffer;
+sonar_holder_width = buffer + sonar_diameter + buffer;
 // sonar_holder_depth is deck_depth minus a little bit to make arm fit
 //  into deck holder
 sonar_holder_depth = deck_depth - 0.8;
 
 deck_holder_length = sonar_holder_depth * 2 + deck_depth + 15;
 
-module sensors(){
-  translate([between_sensor_centers / 2, 0, 0]){
-    cylinder(r = sonar_sensor_radius, h = sonar_sensor_height);}
-  translate([between_sensor_centers / 2 - between_sensor_centers_variance,
-             0,
-             0]){
-    cylinder(r = sonar_sensor_radius, h = sonar_sensor_height);
-    translate([0, -sonar_sensor_radius, 0]){
-      cube([between_sensor_centers_variance,
-            sonar_sensor_radius * 2,
-            sonar_sensor_height]);}}
-  translate([-between_sensor_centers / 2, 0, 0]){
-    cylinder(r = sonar_sensor_radius, h = sonar_sensor_height);}}
+module sonars(){
+  translate([between_sonar_centers / 2, 0, 0]){
+    cylinder(r = sonar_radius, h = sonar_height);}
+  // for the variance with which the physical sonar cylinders are placed
+  translate([between_sonar_centers / 2 - between_sonar_centers_variance, 0, 0]){
+    cylinder(r = sonar_radius, h = sonar_height);
+    translate([0, -sonar_radius, 0]){
+      cube([between_sonar_centers_variance, sonar_diameter, sonar_height]);}}
+  translate([-between_sonar_centers / 2, 0, 0]){
+    cylinder(r = sonar_radius, h = sonar_height);}}
 
-module sensor_holder(){
-  arm_depth = sonar_holder_depth;
+module sonar_holder(){
   elbow_length = deck_depth + 0.8;
   difference(){
     cube([sonar_holder_length, sonar_holder_width, sonar_holder_depth]);
     translate([sonar_holder_length / 2, sonar_holder_width / 2, -0.05]){
-      sensors();}}
-  translate([sonar_holder_length - 1, 0, 0]){
-    cube([elbow_length + arm_depth + 1, deck_depth, arm_depth]);
-    translate([elbow_length + 1, 0, 0]){
-      linear_extrude(height = arm_depth){
+      sonars();}}
+  translate([sonar_holder_length, 0, 0]){
+    cube([elbow_length,
+          deck_depth,
+          sonar_holder_depth]);
+    translate([elbow_length, 0, 0]){
+      linear_extrude(height = sonar_holder_depth){
         polygon([[0, 0],
-                 [arm_depth, 0],
-                 [arm_depth, sonar_holder_width / 2],
-                 [0, sonar_holder_width / 2 + arm_depth]]);}
-      translate([0, (sonar_holder_width + arm_depth) / 2, 0]){
-        cube([arm_depth / 2,
-              (sonar_holder_width - arm_depth) / 2 + 0.8,
-              arm_depth]);}
+                 [sonar_holder_depth, 0],
+                 [sonar_holder_depth, sonar_holder_width / 2],
+                 [0, sonar_holder_width / 2 + sonar_holder_depth]]);}
+      translate([0, (sonar_holder_width + sonar_holder_depth) / 2, 0]){
+        cube([sonar_holder_depth / 2,
+              (sonar_holder_width - sonar_holder_depth) / 2 + 0.8,
+              sonar_holder_depth]);}
       translate([-1.7, sonar_holder_width + 0.8, 0]){
-        linear_extrude(height = arm_depth){
+        linear_extrude(height = sonar_holder_depth){
           polygon([[0, 0],
-                   [arm_depth / 2 + 1.7, 4],
-                   [arm_depth / 2 + 1.7, 0]]);}}}}}
+                   [sonar_holder_depth / 2 + 1.7, 4],
+                   [sonar_holder_depth / 2 + 1.7, 0]]);}}}}}
 
 module deck_holder(){
   deck_holder_width = sonar_holder_width - deck_depth;
@@ -80,6 +79,6 @@ module deck_holder(){
         square([deck_holder_length - (sonar_holder_depth * 2 + deck_depth),
                 deck_depth]);}}}}
 
-translate([0, sonar_holder_depth * 2 + deck_depth + 2, 0]){
-  sensor_holder();}
 deck_holder();
+translate([0, sonar_holder_depth * 2 + deck_depth + 2, 0]){
+  sonar_holder();}