From 88defae291084a89867ada3a3aa57607c03f453d Mon Sep 17 00:00:00 2001
From: "Jan \"Yenya\" Kasprzak" <kas@fi.muni.cz>
Date: Tue, 23 Apr 2019 10:43:32 +0200
Subject: [PATCH] printed objects

---
 dual-horn.scad                   |  4 ++--
 fin-joiner.scad                  |  7 ++++++-
 madstab-joiner-end.scad          |  9 ++++++++-
 pulley-elliptical.scad           | 22 +++++++++++++++++-----
 servo-tube-holder-half-side.scad |  2 +-
 tube-firewall.scad               | 12 +++++++++---
 6 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/dual-horn.scad b/dual-horn.scad
index ed67cc9..eaa94ed 100644
--- a/dual-horn.scad
+++ b/dual-horn.scad
@@ -4,15 +4,15 @@ infty = 200;
 wall = 1;
 
 horn_w = 10;
-horn_l = 15;
+horn_l = 35;
 tip_hole = 2;
 tip_d = tip_hole+2*wall;
 tube_d = 2.0 + 0.7;
 tube_off = 1;
 tube_h = 1.5;
 
-foam_w = 3;
 side_w = 1.2;
+foam_w = 3 + side_w;
 side_l = horn_l - 7;
 side_h = 10;
 
diff --git a/fin-joiner.scad b/fin-joiner.scad
index 53e0711..843846c 100644
--- a/fin-joiner.scad
+++ b/fin-joiner.scad
@@ -12,7 +12,7 @@ stab_tube_wall = 1.0;
 pulley_d = 8;
 
 fuse_tube_d = 8.0 + 0.2;
-fuse_tube_l = 12;
+fuse_tube_l = 25;
 
 slot_w = 4;
 
@@ -62,5 +62,10 @@ difference() {
 	rotate([0, 90, 0])
 	rotate([0, 0, 90])
 		cylinder(r = pulley_d/2, h = stab_tube_off, $fn = 6);
+	// bottom side
+	translate([-fuse_tube_d/2-wall, 0, pulley_d/2 + stab_tube_d + 1.5*stab_tube_wall])
+	rotate ([0, 30, 0])
+	translate([-infty, -infty/2, -infty/2])
+		cube(infty);
 }
 
diff --git a/madstab-joiner-end.scad b/madstab-joiner-end.scad
index e72d989..390499d 100644
--- a/madstab-joiner-end.scad
+++ b/madstab-joiner-end.scad
@@ -1,7 +1,7 @@
 eps = 0.01;
 infty = 200;
 
-wall = 1.5;
+wall = 2.0;
 thin_wall = 0.6;
 
 stab_tube_d = 2.0 + 0.5;
@@ -34,6 +34,13 @@ module body() {
 		rotate([0, 90, 0])
 			cylinder(r = stab_tube_d2/2+stab_tube_wall+eps, h = stab_tube_l);
 	}
+	// side support
+	hull() {
+		translate([fuse_tube_d/2 - eps, -fuse_tube_l/2, 0])
+			cube([eps, eps, thin_wall]);
+		translate([fuse_tube_d/2 - eps, fuse_tube_l/2-eps, 0])
+			cube([stab_tube_l - fuse_tube_d - wall, eps, thin_wall]);
+	}
 }
 
 difference() {
diff --git a/pulley-elliptical.scad b/pulley-elliptical.scad
index 8dc2ba9..66b3f1b 100644
--- a/pulley-elliptical.scad
+++ b/pulley-elliptical.scad
@@ -9,6 +9,11 @@ height = 2.5;           // height of the rim
 slot_w = 1.5;
 side_hole_d = 2.0;
 
+thin_wall = 1;
+lever_l = 45;
+lever_h = 15.5;
+foam_h = 3;
+
 module half(d_x, y_scale, height) {
 	hull($fn = 128) {
 		scale([1, (d_x*y_scale+height)/(d_x+height), 1])
@@ -25,18 +30,25 @@ module pulley(d_x, y_scale, height, center_hole_d) {
 			half(d_x, y_scale, height);
 			translate([0, 0, height]) scale([1, 1, -1])
 				half(d_x, y_scale, height);
+			// lever
+			hull() {
+				translate([-lever_h, 0, 0])
+					cube([lever_h, eps, thin_wall]);
+				translate([-foam_h, -lever_l, 0])
+					cube([foam_h, eps, thin_wall]);
+			}
 		}
 		translate([0, 0, -eps])
 			cylinder(r = center_hole_d/2, h = height + 2*eps);
 		translate([-slot_w/2, d_x*y_scale/2, -eps])
 			cube([slot_w, height, height + 2*eps]);
-//		translate([0, center_hole_d/2 + (d_x*y_scale/2-center_hole_d/2)/2, -eps])
-//			cylinder(r = side_hole_d/2, h = height + 2*eps);
+		translate([0, center_hole_d/2 + (d_x*y_scale/2-center_hole_d/2)/2, -eps])
+			cylinder(r = side_hole_d/2, h = height + 2*eps);
 	}
 }
 
-pulley(d_x = 6, y_scale = 2.5, height=2.5, center_hole_d = 2.5);
+pulley(d_x = 30, y_scale = 0.4, height=3, center_hole_d = 2.5);
 
-translate([0, 20, 0])
-pulley(d_x = 35, y_scale = 0.4, height=2.5, center_hole_d = 8);
+// translate([0, 20, 0])
+// pulley(d_x = 35, y_scale = 0.4, height=2.5, center_hole_d = 8);
 
diff --git a/servo-tube-holder-half-side.scad b/servo-tube-holder-half-side.scad
index bbf44d3..77f725b 100644
--- a/servo-tube-holder-half-side.scad
+++ b/servo-tube-holder-half-side.scad
@@ -11,7 +11,7 @@ clip_w = servo_side_l + wall;
 slot_w = 3;
 
 servo_w = 12.5+0.5;
-servo_zoff = 20 + 2.0-tube_d/2-servo_w/2; // od stredu trubice po osu otaceni
+servo_zoff = 14.5 + 2.0-tube_d/2-servo_w/2; // od stredu trubice po osu otaceni
 servo_slot_z = 2.5 + 0.1;
 servo_xoff = -servo_slot_z/2;
 servo_screw_hole = 1.6;
diff --git a/tube-firewall.scad b/tube-firewall.scad
index 8c3533c..be83a36 100644
--- a/tube-firewall.scad
+++ b/tube-firewall.scad
@@ -6,13 +6,15 @@ base_d = 26;
 screw_d1 = 19;
 screw_d2 = 16;
 screw_hole = 3.5;
-base_wall = 1.5;
+base_wall = 2.0;
 
 motor_angle = 4;
 
-tube_d = 8+0.2;
+tube_d = 8+0.3;
 tube_h = 20;
-tube_wall = 1;
+tube_wall = 1.5;
+cable_slot_w = 5;
+cable_slot_h = 3;
 
 module body() {
 	// base
@@ -56,6 +58,10 @@ difference() {
 	rotate([0, motor_angle, 0])
 	translate([0, 0, -infty/2])
 		cylinder(r = tube_d/2, h = infty);
+	// cable slot
+	rotate([0, 0, -45])
+	translate([-cable_slot_w/2, base_d/2-cable_slot_h, -eps])
+		cube([cable_slot_w, 2*cable_slot_h, infty]);
 }
 
 
-- 
2.43.5