X-Git-Url: http://challenge-bot.com/repos/?p=challenge-bot;a=blobdiff_plain;f=3d-printables%2Fwire-jig.scad;fp=3d-printables%2Fwire-jig.scad;h=3d1187ee8e6f61969247ad2f904e3a35ed5d4306;hp=dabde952366e44901e8218d84c4b82ee273131bf;hb=180a0f6f6e33818372b49e01931ce8264f838cbc;hpb=cff668ccc47afea555fd5be790181e14bf9471d9

diff --git a/3d-printables/wire-jig.scad b/3d-printables/wire-jig.scad
index dabde95..3d1187e 100644
--- a/3d-printables/wire-jig.scad
+++ b/3d-printables/wire-jig.scad
@@ -4,29 +4,23 @@
 // https://gitorious.org/ozzloy/challenge-bot
 // https://github.com/waynegramlich/challenge-bot
 
-$fn = 20;
-
-wire_channel_width = 6;
-wire_channel_height = 6;
+include <wire-jig-dimensions.scad>
+use <nut.scad>
 
-wire_diameter_measured = 1.17;
-wire_diameter_fudge = 0.5;
-wire_diameter = wire_diameter_measured + wire_diameter_fudge;
-wire_radius = wire_diameter / 2;
-
-wire_lengths = [10, //strip wire this much
-                35, //short breadboard wire
-                63, //ground to ground
-                120, //arduino breadboard wire
-                180 //motor wire
-               ];
+$fn = 20;
 
 module wire_channel_groove_2d(width, height, wire_radius) {
   difference() {
     square([width, height]);
-    translate([width / 2, height]) {
-      circle(r = wire_radius); } } }
+    translate([width / 2, height / 2]) {
+      rotate(a = 90, v = [0, 0, 1]){
+        nut_2d(wire_diameter); } } } }
 
+/*
+wire_channel_groove_2d(wire_channel_width,
+                       wire_channel_height,
+                       wire_radius);
+                       */
 
 module wire_channel_groove(width, height, wire_radius, length){
   rotate(a = 90, v = [1, 0, 0]){
@@ -34,8 +28,8 @@ module wire_channel_groove(width, height, wire_radius, length){
       wire_channel_groove_2d(width, height, wire_radius); } } }
 
 for(ii = [0:len(wire_lengths) - 1]) {
-  translate([wire_channel_width * ii, 0, 0]) {
-    wire_channel_groove(wire_channel_width,
+  translate([ wire_channel_width * ii, 0, 0]) {
+    #wire_channel_groove(wire_channel_width,
                         wire_channel_height,
                         wire_radius,
                         wire_lengths[ii]); } }