From 07fce488a4cf226110dff59f98a3abef746f9f99 Mon Sep 17 00:00:00 2001
From: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz>
Date: Mon, 7 May 2018 11:24:29 +0200
Subject: [PATCH] more mods to the glider joiners

---
 dual-horn.scad          | 10 +++++++---
 fin-joiner.scad         | 30 ++++++++++++++++++------------
 madstab-joiner-end.scad | 13 +++++++------
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/dual-horn.scad b/dual-horn.scad
index 62d1181..9ee5bd4 100644
--- a/dual-horn.scad
+++ b/dual-horn.scad
@@ -9,11 +9,12 @@ tip_hole = 2;
 tip_d = tip_hole+2*wall;
 tube_d = 2.0 + 0.5;
 tube_off = 1;
+tube_h = 1.5;
 
 foam_w = 3;
 side_w = 0.5;
 side_l = horn_l - 7;
-side_h = 8;
+side_h = 10;
 
 
 module body() {
@@ -25,8 +26,11 @@ module body() {
 			cube([foam_w, horn_l, wall]);
 	}
 	// side
-	translate([foam_w/2-side_w, -horn_l+tip_d/2, 0])
+	translate([-foam_w/2, -horn_l+tip_d/2, 0])
 		cube([side_w, side_l, side_h]);
+	// tube
+	translate([0, tube_off, 0])
+		cylinder(r = tube_d/2 + wall, h = tube_h);
 }
 
 difference() {
@@ -36,6 +40,6 @@ difference() {
 			cylinder(r = tip_hole/2, h = wall+2*eps);
 	// tube hole
 	translate([0, tube_off, -eps])
-		cylinder(r = tube_d/2, h = wall+2*eps, $fn = 6);
+		cylinder(r = tube_d/2, h = tube_h+2*eps, $fn = 6);
 }
 
diff --git a/fin-joiner.scad b/fin-joiner.scad
index 1e00257..f295762 100644
--- a/fin-joiner.scad
+++ b/fin-joiner.scad
@@ -4,16 +4,17 @@ infty = 200;
 wall = 1.5;
 thin_wall = 0.6;
 
-stab_tube_d = 3.0 + 0.5;
-stab_tube_l = 25;
+stab_tube_d = 2.0 + 0.5;
+stab_tube_l = 15;
 
-stab_tube_off = 3;
-pulley_d = 10;
+stab_tube_off = 4;
+stab_tube_wall = 1.0;
+pulley_d = 8;
 
 fuse_tube_d = 8.0;
 fuse_tube_l = 12;
 
-slot_w = 3;
+slot_w = 4;
 
 base_d = 15;
 base_h = 0.6;
@@ -24,9 +25,9 @@ module body() {
 
 	// stab tube
 	hull() {
-		translate([fuse_tube_d/2 + wall + stab_tube_off, 0, stab_tube_d/2+wall])
+		translate([fuse_tube_d/2 + wall + stab_tube_off, 0, stab_tube_d/2+stab_tube_wall])
 		rotate([0, 90, 0])
-			cylinder(r = stab_tube_d/2+wall, h = stab_tube_l);
+			cylinder(r = stab_tube_d/2+stab_tube_wall, h = stab_tube_l);
 		translate([fuse_tube_d/2 + wall + stab_tube_off, -stab_tube_d/2, 0])
 			cube([stab_tube_l, stab_tube_d, eps]);
 	}
@@ -34,13 +35,13 @@ module body() {
 	hull() {
 		// stab tube tip
 		translate([fuse_tube_d/2 + wall + stab_tube_off + stab_tube_l - eps,
-			-thin_wall/2, stab_tube_d + 1.5*wall])
+			-thin_wall/2, stab_tube_d + 1.5*stab_tube_wall])
 			cube([eps, thin_wall, eps]);
 		// fuse tube tip
 		translate([fuse_tube_d/2 + wall/2, -thin_wall/2, fuse_tube_l - eps])
 			cube([eps, thin_wall, eps]);
-		translate([fuse_tube_d/2 + wall/2, -3*wall/2, stab_tube_d+1.5*wall])
-			cube([eps, 3*wall, eps]);
+		translate([fuse_tube_d/2 + wall/2, -3*stab_tube_wall/2, stab_tube_d+1.5*stab_tube_wall])
+			cube([eps, 3*stab_tube_wall, eps]);
 	}
 }
 
@@ -53,8 +54,13 @@ difference() {
 	translate([-fuse_tube_d, -slot_w/2, -eps])
 		cube([fuse_tube_d, slot_w, fuse_tube_l + 2*eps]);
 	// stab tube
-	translate([0, 0, stab_tube_d/2+wall])
+	translate([0, 0, stab_tube_d/2+stab_tube_wall])
 	rotate([0, 90, 0])
-		cylinder(r = stab_tube_d/2, h = stab_tube_l + stab_tube_off + fuse_tube_d/2 + wall + eps );
+		cylinder(r = stab_tube_d/2, h = stab_tube_l + stab_tube_off + fuse_tube_d/2 + wall + eps, $fn = 6);
+	// pulley
+	translate([fuse_tube_d/2+wall, 0, stab_tube_d/2+stab_tube_wall])
+	rotate([0, 90, 0])
+	rotate([0, 0, 90])
+		cylinder(r = pulley_d/2, h = stab_tube_off, $fn = 6);
 }
 
diff --git a/madstab-joiner-end.scad b/madstab-joiner-end.scad
index d82285b..e72d989 100644
--- a/madstab-joiner-end.scad
+++ b/madstab-joiner-end.scad
@@ -4,14 +4,15 @@ infty = 200;
 wall = 1.5;
 thin_wall = 0.6;
 
-stab_tube_d = 3.0 + 0.5;
+stab_tube_d = 2.0 + 0.5;
 stab_tube_d2 = stab_tube_d;
 stab_tube_l = 20;
+stab_tube_wall = 1;
 
 fuse_tube_d = 8.0;
 fuse_tube_l = 12;
 
-slot_w = 3;
+slot_w = 3.5;
 
 base_d = 15;
 base_h = 0.6;
@@ -29,9 +30,9 @@ module body() {
 	hull() {
 		translate([-fuse_tube_d/2-wall, fuse_tube_l/2-eps, 0])
 			cube([stab_tube_l, stab_tube_d2+2*eps, eps]);
-		translate([-fuse_tube_d/2-wall, fuse_tube_l/2+stab_tube_d2/2, stab_tube_d2/2+wall])
+		translate([-fuse_tube_d/2-wall, fuse_tube_l/2+stab_tube_d2/2, stab_tube_d2/2+stab_tube_wall])
 		rotate([0, 90, 0])
-			cylinder(r = stab_tube_d2/2+wall+eps, h = stab_tube_l);
+			cylinder(r = stab_tube_d2/2+stab_tube_wall+eps, h = stab_tube_l);
 	}
 }
 
@@ -46,9 +47,9 @@ difference() {
 		cube([slot_w, fuse_tube_l + 2*eps, fuse_tube_d/2+wall+eps]);
 
 	// stab tube
-	translate([-fuse_tube_d/2-wall-eps, fuse_tube_l/2 + stab_tube_d2/2, stab_tube_d2/2 +wall])
+	translate([-fuse_tube_d/2-wall-eps, fuse_tube_l/2 + stab_tube_d2/2, stab_tube_d2/2 +stab_tube_wall])
 	rotate([0, 90, 0])
-		cylinder(r = stab_tube_d2/2, h = stab_tube_l + 2*eps);
+		cylinder(r = stab_tube_d2/2, h = stab_tube_l + 2*eps, $fn = 6);
 }
 
 // endpoint stopper
-- 
2.43.0