X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=3d-printables%2Fdeck-holder-data.scad;h=3a28dc4edc1333fe2df237c77d182af46089d383;hb=6861cdfff4baf9b5fe8d3ca98534c39488b2ffc2;hp=3ac45f62b1ff14ecf4bc1287b894122d0e8c464b;hpb=25cd00a6b1d4f62e856346393972298f01dbabe3;p=challenge-bot

diff --git a/3d-printables/deck-holder-data.scad b/3d-printables/deck-holder-data.scad
index 3ac45f6..3a28dc4 100644
--- a/3d-printables/deck-holder-data.scad
+++ b/3d-printables/deck-holder-data.scad
@@ -17,7 +17,7 @@
 
 $fn = 60;
 
-include <oshw-data.scad>
+include <open-source-hardware-logo-data.scad>
 
 // 3/16 inch in mm deck_depth = 4.7625;
 // 1/4 inch in mm = 6.35
@@ -39,25 +39,6 @@ buffer = 3;
 sonar_holder_length = buffer + between_sonar_centers + sonar_diameter + buffer;
 sonar_holder_width = buffer + sonar_diameter + buffer;
 
-// 3/16 inch in mm deck_depth = 4.7625;
-// 1/4 inch in mm = 6.35
-// subtract a little to be a squeeze fit
-deck_depth = 4.7625 - 0.4;
-// 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, so add some
-sonar_diameter = 15.82 + 0.4;
-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_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;
@@ -65,6 +46,7 @@ sonar_holder_depth = deck_depth - 0.7875;
 deck_holder_length = sonar_holder_depth * 2 + deck_depth + 15;
 
 module deck_holder() {
+  oshw_height = 0.75;
   deck_holder_width = sonar_holder_width - deck_depth;
   deck_holder_height = sonar_holder_depth * 2 + deck_depth;
   linear_extrude(height = deck_holder_width) {
@@ -72,6 +54,25 @@ module deck_holder() {
       square([deck_holder_length, deck_holder_height]);
       translate([sonar_holder_depth - 0.15, sonar_holder_depth - 0.15]) {
 
+        square(deck_depth + 0.3); }
+      translate([deck_holder_height, sonar_holder_depth - 0.3]) {
+        square([deck_holder_length - (deck_holder_height),
+                deck_depth + 0.6]); } } }
+  translate([deck_holder_length - deck_holder_width / 2,
+             0,
+             deck_holder_width / 2]) {
+    rotate(v = [1, 0, 0], a = 90) {
+      rotate(90) {
+        open_source_hardware_logo(deck_holder_width / 2,
+                                  oshw_height); } } }
+  translate([deck_holder_length - deck_holder_width / 2,
+             deck_holder_height + oshw_height,
+             deck_holder_width / 2]) {
+    rotate(v = [1, 0, 0], a = 90) {
+      rotate(90) {
+        open_source_hardware_logo(deck_holder_width / 2,
+                                  oshw_height); } } } }
+
 /*
   This file is part of challenge-bot.
 
@@ -88,21 +89,3 @@ module deck_holder() {
   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/>.
 */
-        square(deck_depth + 0.3); }
-      translate([deck_holder_height, sonar_holder_depth - 0.3]) {
-        square([deck_holder_length - (deck_holder_height),
-                deck_depth + 0.6]); } } }
-  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(); }