X-Git-Url: http://challenge-bot.com/repos/?p=challenge-bot;a=blobdiff_plain;f=3d-printables%2Fdeck-holder-data.scad;h=c6a0cced65dd85d0cbf0da90807de0f0c8e6dfdf;hp=2526c9e4b39ad25fc57d1b9b4fee654f38402c3a;hb=78a38e00ac608e1cc096c3e3eefccfb3be721587;hpb=e7a438f996bdaff34b9795b7dbe64e1aba1cf2bd

diff --git a/3d-printables/deck-holder-data.scad b/3d-printables/deck-holder-data.scad
index 2526c9e..c6a0cce 100644
--- a/3d-printables/deck-holder-data.scad
+++ b/3d-printables/deck-holder-data.scad
@@ -14,7 +14,8 @@
 
 $fn = 60;
 
-use <oshw.scad>
+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
@@ -34,14 +35,6 @@ between_sonar_centers_variance = 2;
 buffer = 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.7875;
-
-deck_holder_length = sonar_holder_depth * 2 + deck_depth + 15;
-
-oshw_dy = 120.366;
-oshw_dx = 133.888;
 
 // 3/16 inch in mm deck_depth = 4.7625;
 // 1/4 inch in mm = 6.35
@@ -68,47 +61,6 @@ sonar_holder_depth = deck_depth - 0.7875;
 
 deck_holder_length = sonar_holder_depth * 2 + deck_depth + 15;
 
-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 sonar_holder() {
-  elbow_length = deck_depth;
-  rounded_corner_radius = buffer;
-  difference() {
-    cube([sonar_holder_length, sonar_holder_width, sonar_holder_depth]);
-    translate([sonar_holder_length / 2, sonar_holder_width / 2, -0.05]) {
-      sonars(); }
-    translate([sonar_holder_length - rounded_corner_radius,
-               sonar_holder_width - rounded_corner_radius,
-               0]) {
-      corner_rounder(rounded_corner_radius, sonar_holder_depth); } }
-  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],
-                 [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 = sonar_holder_depth) {
-          polygon([[                           0, 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;
   deck_holder_height = sonar_holder_depth * 2 + deck_depth;
@@ -134,12 +86,3 @@ module deck_holder() {
   scale([0.1, 0.1, 1])
   linear_extrude(height = 0.5)
   oshw(); }
-
-module corner_rounder_2d(radius) {
-  difference() {
-    square(radius);
-    circle(radius); } }
-
-module corner_rounder(radius, height) {
-  linear_extrude(height = height) {
-    corner_rounder_2d(radius); } }