X-Git-Url: http://challenge-bot.com/repos/?p=challenge-bot;a=blobdiff_plain;f=3d-printables%2Fsonar-table-top-holder-data.scad;h=ae4e17b346651c8b6912411eda2a30698d4522c8;hp=e349b7b1da0613a9c0600b7d855928638dea65d9;hb=ce941be740b45737d19eaa5c726b2f99efabe0b9;hpb=3d90aff00bdea5d4a525d006d5390f9c5a25c635

diff --git a/3d-printables/sonar-table-top-holder-data.scad b/3d-printables/sonar-table-top-holder-data.scad
index e349b7b..ae4e17b 100644
--- a/3d-printables/sonar-table-top-holder-data.scad
+++ b/3d-printables/sonar-table-top-holder-data.scad
@@ -1,8 +1,11 @@
+/*
+  Copyright (C) 2015 Daniel Watson
+  See the end of the file for license conditions.
+*/
 // challenge-bot
 // GNU AGPLv3 (or later at your option)
-// project available at these locations:
-// https://gitorious.org/ozzloy/challenge-bot
-// https://github.com/waynegramlich/challenge-bot
+// project available here:
+// https://challenge-bot.com/
 
 /*
   this holds an hc-sr04 sonar sensor to a 3/16 inch deck.
@@ -14,8 +17,6 @@
 
 $fn = 60;
 
-include <oshw-data.scad>
-
 // 3/16 inch in mm deck_depth = 4.7625;
 // 1/4 inch in mm = 6.35
 // subtract a little to be a squeeze fit
@@ -24,7 +25,7 @@ deck_depth = 4.7625 - 0.4;
 //  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, so add some
-sonar_diameter = 15.82 + 0.4;
+sonar_diameter = 15.82 + 0.5;
 sonar_radius = sonar_diameter / 2;
 sonar_height = 13.8;
 between_sonar_centers = sonar_diameter + 10.82;
@@ -46,17 +47,16 @@ module sonar_holder_2d() {
 
 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]); } }
+    hull() {
+      cylinder(r = sonar_radius, h = sonar_height);
+      // for the variance with which the physical sonar cylinders are placed
+      translate([ -between_sonar_centers_variance, 0, 0]) {
+        cylinder(r = sonar_radius, h = sonar_height); } } }
   translate([-between_sonar_centers / 2, 0, 0]) {
     cylinder(r = sonar_radius, h = sonar_height); } }
 
 module sonar_holder() {
-  elbow_length = deck_depth - 0.5;
+  elbow_length = deck_depth - 0.2;
   rounded_corner_radius = buffer;
   difference() {
     cube([sonar_holder_length, sonar_holder_width, sonar_holder_depth]);
@@ -75,8 +75,8 @@ module sonar_holder() {
         polygon([[                 0, 0],
                  [sonar_holder_depth, 0],
                  [sonar_holder_depth, sonar_holder_width / 2],
-                 [                 0,
-                                   sonar_holder_width / 2 + sonar_holder_depth]]); }
+                 [                 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,
@@ -87,31 +87,6 @@ module sonar_holder() {
                    [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;
-  deck_holder_height = sonar_holder_depth * 2 + deck_depth;
-  linear_extrude(height = deck_holder_width) {
-    difference() {
-      square([deck_holder_length, deck_holder_height]);
-      translate([sonar_holder_depth, sonar_holder_depth]) {
-        square(deck_depth); }
-      translate([deck_holder_height, sonar_holder_depth]) {
-        square([deck_holder_length - (deck_holder_height), deck_depth]); } } }
-  translate([deck_holder_length - oshw_dy * 0.05, 0, deck_holder_width / 2])
-  scale([0.1, 1, 0.1])
-  rotate(v = [1, 0, 0], a = 90)
-  rotate(90)
-  linear_extrude(height = 0.5)
-  oshw();
-  translate([deck_holder_length - oshw_dy * 0.05,
-             deck_holder_height + 0.5,
-             deck_holder_width / 2])
-  rotate(v = [1, 0, 0], a = 90)
-  rotate(90)
-  scale([0.1, 0.1, 1])
-  linear_extrude(height = 0.5)
-  oshw(); }
-
 module corner_rounder_2d(radius, corner_name = "top-left") {
   rotate_for_corner = (corner_name == "top-left") ? 0 :
                       ((corner_name == "top-right") ? -90 :
@@ -127,3 +102,20 @@ module corner_rounder_2d(radius, corner_name = "top-left") {
 module corner_rounder(radius, height, corner_name = "top-left") {
   linear_extrude(height = height) {
     corner_rounder_2d(radius, corner_name); } }
+
+/*
+  This file is part of challenge-bot.
+
+  Challenge-bot is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  GNU Affero Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with challenge-bot.  If not, see <http://www.gnu.org/licenses/>.
+*/