From 3cda00d4cd6268170c3d2b92347b76a7766294d5 Mon Sep 17 00:00:00 2001
From: mmcwilliams <hi@mmcwilliams.com>
Date: Thu, 1 Mar 2018 10:38:30 -0500
Subject: [PATCH] Use theirs

---
 .../lomo_bottom_screw/lomo_bottom_screw.scad  | 28 ++++++-------
 models/lomo_top_screw/lomo_top_screw.scad     | 41 ++++++++++---------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/models/lomo_bottom_screw/lomo_bottom_screw.scad b/models/lomo_bottom_screw/lomo_bottom_screw.scad
index 593282c..134f5ad 100644
--- a/models/lomo_bottom_screw/lomo_bottom_screw.scad
+++ b/models/lomo_bottom_screw/lomo_bottom_screw.scad
@@ -3,39 +3,35 @@ include <../../libraries/threads.scad>;
 
 module base () {
     $fn = 100;
-    NUBS = 6;
     union() {
         translate([0, 0, -15])cylinder(r = 8.45, h = 20, center = true);
-        //hex version
-        //translate([0, 0, -24.5]) cylinder(r = 11.1, h = 9.5, center = true, $fn = 6);
-        translate([0, 0, -24.5]) cylinder(r = 19 / 2, h = 9.5, center = true);
-        for (i = [1 : 6]) {
-                rotate([0, 0, i * (360 / NUBS)]) translate([0, 19 / 2, -24.5]) cylinder(r = 3.2 / 2, h = 9.5, center = true);
-        }
+        //translate([0, 0, -24.5])cylinder(r = 11.1, h = 9.5, center = true, $fn = 6);
+		translate([0, 0, -24.5]) cylinder(r = 19 / 2, h = 9.5, center = true); 
     }
 }
 
 module lomo_bottom_screw () {
-    base();
+    //base();
     difference () {
         //outer screw
-        translate([0, 0, -7.1]) metric_thread (diameter=10, pitch=1.5,thread_size = 1.6, length=27.1);
+        translate([0, 0, -7.1]) metric_thread (diameter=10, pitch=1.5, length=27.1);
         //taper top of screw
         translate([0, 0, 19]) difference() {
             cylinder(r = 8, h = 3.5, center = true, $fn = 100);
             cylinder(r1 = 6, r2 = 3, h = 4.5, center = true, $fn = 100);
         }
         //hollow center
-        cylinder(r = 1.85, h = 100, center = true, $fn = 60);
+        cylinder(r = 3.8 / 2, h = 100, center = true, $fn = 60);
     }
 }
 difference() {
     //color("green")
-    //translate([37, -3.5, 0]) import("./lomo_part_fixed.stl");
-    import("./lomo_part_half.stl");
-    //translate([200, 0, 0]) cube([400, 400, 400], center = true);
+	//center
+	//cylinder(r = 3 / 2, h = 100, center = true, $fn = 30);
+    translate([37, -3.25, 0]) import("./lomo_part_fixed.stl");
+    translate([200, 0, 0]) cube([400, 400, 400], center = true);
 }
-translate([0, -0.25, -0.05]) rotate([0, 0, t]) difference() {
-    //color("green") lomo_bottom_screw();
-    //translate([-20, 0, 0])cube([40, 40, 200], center = true);
+rotate([0, 0, t]) difference() {
+    lomo_bottom_screw();
+    translate([-100, 0, 0])cube([200, 200, 200], center = true);
 }
diff --git a/models/lomo_top_screw/lomo_top_screw.scad b/models/lomo_top_screw/lomo_top_screw.scad
index 7a1b484..88b5ec2 100644
--- a/models/lomo_top_screw/lomo_top_screw.scad
+++ b/models/lomo_top_screw/lomo_top_screw.scad
@@ -1,16 +1,11 @@
 t = 0;
 include <../../libraries/threads.scad>;
 
-
 D = 50;
 THICKNESS = 2.5;
 H = 23;
 ROUND = 6;
 
-module handle () {
-    cylinder(r1 = 16 / 2, r2 = 12.6 / 2, h = 54.2, center = true, $fn = 100);     
-}
-
 module lomo_top_screw () {
     difference () {
         translate([0, 0, ROUND + 2.75]) minkowski () {
@@ -23,23 +18,29 @@ module lomo_top_screw () {
         }
         translate([0, 0, H + ROUND - 0.4]) cylinder(r = (D / 2) + 1, h = H * 2, center = true);
         //CUT IN HALF
-        //translate([200, 0, 0]) cube([400, 400, 400], center = true);
+        translate([200, 0, 0]) cube([400, 400, 400], center = true);
         //reference cylinder
         //color("red") translate([0, 0, -H / 4]) cylinder(r = (D / 2), h = H, center = true);
-        //hole
-        translate([20, 0, -20]) cylinder(r = 3 / 2, h = 20, center = true, $fn = 60);
     }
-    
-     //handle
-    translate([0, 0, 12]) handle();
-     //screw
-    translate([0, 0, -37]) {
-        translate([0, 0, 1] ) metric_thread (diameter=13.8, pitch=1.5,thread_size = 1.6, length = 21);
-         translate([0, 0, 21.5 / 2]) cylinder(r = 12.2 / 2, h = 21.5, center = true, $fn = 100);
-    }
-    
+    /*
+    //spindle
+    translate([0, 0, 4]) cylinder(r1 = 12 / 2, r2 = 9 / 2, h = 40, center = true, $fn = 60);
+    //spindle top
+    translate([0, 0, 27]) difference () {
+        minkowski() {
+            cylinder(r = 5 / 2, h = 20, center = true, $fn = 60);
+            sphere(r = 2, center = true, $fn = 60);
+        }
+        for (i = [0: 5]) {
+            rotate([0, 0, i * (360 / 6)]) translate([4.7, 0, 0]) cylinder(r = 1, h = 30, center = true, $fn = 20);
+        }
+    }*/
+	//handle
+	translate([0, 0, -14.5]) {
+		cylinder(r1 = 16/ 2, r2 = 13 / 2, h = 54.5, $fn = 100);
+	}
+	//screw
+	translate([0, 0, -36]) metric_thread (diameter=13.8, pitch=1.5, length=20.5);
 }
-//translate([0, 0, -45]) rotate([0, 180, 0]) import("../lomo_bottom_screw/lomo_part_half.stl");
-//rotate([0, 0, t]) lomo_top_screw();
 
-metric_thread (diameter=13.8, pitch=1.5,thread_size = 1.6, length = 21);
\ No newline at end of file
+rotate([0, 0, t]) lomo_top_screw();
\ No newline at end of file