From e04f30fbe09e3729899f746d842b46ed24765400 Mon Sep 17 00:00:00 2001
From: daniel watson <ozzloy@gmail.com>
Date: Sat, 4 Jun 2016 15:03:49 -0700
Subject: [PATCH] separate out binder clip holder from sonar holder

---
 .../sonar-binder-clip-holder-data.scad        | 46 +++++++++++++------
 3d-printables/sonar-binder-clip-holder.scad   |  7 +++
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/3d-printables/sonar-binder-clip-holder-data.scad b/3d-printables/sonar-binder-clip-holder-data.scad
index 13e4465..f944906 100644
--- a/3d-printables/sonar-binder-clip-holder-data.scad
+++ b/3d-printables/sonar-binder-clip-holder-data.scad
@@ -53,28 +53,44 @@ module sonar_holder_outline_2d(sonar_radius,
   holder_diameter = holder_radius * 2;
   hull() {
     circle(holder_radius);
-    translate([between_sonar_centers, 0]) {
-      circle(holder_radius); }
-    translate([sonar_radius + between_sonar_centers, -holder_radius]) {
-      square([holder_diameter * 2, holder_diameter]); } } }
+    translate([between_sonar_centers - sonar_radius - wall_thickness,
+               -holder_radius]) {
+      square(holder_diameter); } } }
 
-module sonar_binder_clip_holder(sonar_radius,
-                                between_sonar_centers,
-                                between_sonar_centers_variation,
-                                wall_thickness) {
+module sonar_holder(sonar_radius,
+                    between_sonar_centers,
+                    between_sonar_centers_variation,
+                    wall_thickness) {
   difference() {
     sonar_holder_outline_2d(sonar_radius,
                             between_sonar_centers,
                             wall_thickness);
     sonar_sensors_2d(sonar_radius,
                      between_sonar_centers,
-                     between_sonar_centers_variation);
-    translate([sonar_radius +
-               between_sonar_centers +
-               3 * (wall_thickness + sonar_radius),
-               0,
-               0]) {
-      circle(screw_radius); } } }
+                     between_sonar_centers_variation); } }
+
+module binder_clip_holder(binder_clip_holder_length,
+                          screw_radius,
+                          holder_radius){
+  difference() {
+  square([binder_clip_holder_length, holder_radius * 2]);
+  translate([binder_clip_holder_length - holder_radius, holder_radius]) {
+    circle(screw_radius); } } }
+
+module sonar_binder_clip_holder(sonar_radius,
+                                between_sonar_centers,
+                                between_sonar_centers_variation,
+                                wall_thickness) {
+  sonar_holder(sonar_radius,
+               between_sonar_centers,
+               between_sonar_centers_variation,
+               wall_thickness);
+  holder_radius = sonar_radius + wall_thickness;
+  binder_clip_holder_length = 2 * holder_radius;
+  translate([between_sonar_centers + holder_radius, -holder_radius]){
+    binder_clip_holder(binder_clip_holder_length,
+                       screw_radius,
+                       holder_radius); } }
 
 /*
   This file is part of challenge-bot.
diff --git a/3d-printables/sonar-binder-clip-holder.scad b/3d-printables/sonar-binder-clip-holder.scad
index 9f6ad26..bd79585 100644
--- a/3d-printables/sonar-binder-clip-holder.scad
+++ b/3d-printables/sonar-binder-clip-holder.scad
@@ -23,6 +23,13 @@ sonar_binder_clip_holder(sonar_radius,
                          between_sonar_centers_variation,
                          wall_thickness);
 
+holder_radius = sonar_radius + wall_thickness;
+binder_clip_holder_length = 2 * holder_radius;
+translate([0, holder_radius + 2]) {
+  binder_clip_holder(binder_clip_holder_length,
+                     screw_radius,
+                     holder_radius); }
+
 /*
   This file is part of challenge-bot.
 
-- 
2.30.2