From 1e05d8b98a6d83354d51f2c903bd0c7242c504f5 Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Wed, 28 Dec 2022 19:18:09 -0500
Subject: [PATCH] Use common submodule

---
 .gitmodules |   3 ++
 common      |   1 +
 common.scad | 117 ----------------------------------------------------
 takeup.scad |   2 +-
 4 files changed, 5 insertions(+), 118 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 common
 delete mode 100644 common.scad

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..18f70a7
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "common"]
+	path = common
+	url = https://git.sixteenmillimeter.com/modules/common.git
diff --git a/common b/common
new file mode 160000
index 0000000..05b4010
--- /dev/null
+++ b/common
@@ -0,0 +1 @@
+Subproject commit 05b4010f2b90dbb62c52b18f857e8494bfe2ea4e
diff --git a/common.scad b/common.scad
deleted file mode 100644
index 9782ad3..0000000
--- a/common.scad
+++ /dev/null
@@ -1,117 +0,0 @@
-IN = 25.4;
-
-
-echo("common.scad - rounded_cube()");
-module rounded_cube (cube_arr = [1, 1, 1], d = 0, center = false) {
-    off_x = 0;
-    off_y = 0;
-    r = d/2;
-    union () {
-        cube([cube_arr[0] - d, cube_arr[1], cube_arr[2]], center = center);
-        cube([cube_arr[0], cube_arr[1] - d, cube_arr[2]], center = center);
-        translate ([1 * (cube_arr[0] / 2) - r , 1 * (cube_arr[1] / 2)- r, 0]) cylinder(r = r, h = cube_arr[2], center = center);
-        translate ([-1 * (cube_arr[0] / 2) + r, -1 * (cube_arr[1] / 2) + r, 0]) cylinder(r = r, h = cube_arr[2], center = center);
-        translate ([1 * (cube_arr[0] / 2) - r, -1 * (cube_arr[1] / 2) + r, 0]) cylinder(r = r, h = cube_arr[2], center = center);
-        translate ([-1 * (cube_arr[0] / 2) + r, 1 * (cube_arr[1] / 2)- r, 0]) cylinder(r = r, h = cube_arr[2], center = center);
-    }
-}
-
-echo("common.scad - trap_cube()");
-module trap_cube(height = 19, top_x = 30, top_y = 34, bottom_x = 45, bottom_y = 65, wall_thickness = 2) {
-    difference(){
-        hull(){
-            translate([0,0,height])
-                cube([top_x, top_y, 0.1], center=true);
-                cube([bottom_x, bottom_y, 0.1], center=true);
-            }
-
-        hull(){
-            translate([0,0,height])
-                cube([top_x - wall_thickness, top_y - wall_thickness, 0.1], center=true);
-                cube([bottom_x - wall_thickness, bottom_y - wall_thickness, 0.1], center=true);
-        }
-    }
-}
-
-echo("common.scad - R()");
-function R (diameter) = diameter / 2.0;
-
-echo("common.scad - m3_nut");
-module m3_nut (H = 5) {
-    cylinder(r=R(6.6), h=H, center=true, $fn=6);
-}
-
-module opto_endstop () {
-    difference(){
-        union(){
-            // base PCB
-            color("green") cube([33.0,1.6,10.5]);
-            // add the switch module
-            translate([8.4,1.6,10.5/2-6.4/2]) optoswitch();
-            // connector
-            translate([0.2,-7,0]) color("white") cube([5.8,7,10.5]);
-            // led
-            translate([3.5,1.6,10.5/2-1.5/2]) color("red") cube([2,0.7,1.5]);
-        }
-        translate([8.4,0,10.5/2-6.4/2]) {
-            for ( hole = [2.75,24.5-2.75] ){
-                rotate([90,0,0]) translate([hole,6.4/2,-4]) cylinder(r=1.5, h=4.5,$fn=40);
-            }
-        }
-    }
-}
-
-// switch module
-module optoswitch() {
-    difference(){
-        union (){
-            color("gray") cube([24.5,3.5,6.4]);
-            color("gray")translate([6.63,0,0]) cube([4.45,11.3,6.3]);
-            color("gray")translate([13.63,0,0]) cube([4.45,11.3,6.3]);
-        }
-        for ( hole = [2.75,24.5-2.75] ){
-           rotate([90,0,0]) translate([hole,6.4/2,-4]) cylinder(r=1.5, h=4.5,$fn=40);
-        }    
-    }
- }
- 
- module hex (diag = 10, h = 1) {
-    cylinder(r = diag / 2, h = h, center = true, $fn = 6);
-}
-
-//NEMA17 Stepper
-module NEMA17 ( H = 33 ) { //alt = 47.5
-    difference () {
-        cube([42, 42, H], center = true);
-        for (i = [0 : 3]) {
-            rotate([0, 0, (i * 90) + 45]) translate([29.7, 0, 0]) cube([5.5, 5.5, H + 1], center = true);
-        }
-        translate([31/2, 31/2, (H/2)-1.9]) cylinder(r = R(3), h = 4, center = true, $fn=30);
-        translate([-31/2, 31/2, (H/2)-1.9]) cylinder(r = R(3), h = 4, center = true, $fn=30);
-        translate([31/2, -31/2, (H/2)-1.9]) cylinder(r = R(3), h = 4, center = true, $fn=30);
-        translate([-31/2, -31/2, (H/2)-1.9]) cylinder(r = R(3), h = 4, center = true, $fn=30);
-    }
-    //pad
-    translate([0, 0, (H/2) + (1.9/2)]) {
-        cylinder(r = R(22), h = 1.9, center = true, $fn = 100);
-    }
-    //shaft
-    translate([0, 0, (H/2) + (22.75/2)]) {
-        difference () {
-            cylinder(r = R(5), h = 22.75, center = true, $fn = 30);
-            translate([0, 4.5, 4.7]) cube([5, 5, 22.75], center = true);
-        }
-        
-    } 
-}
-
-//Geartisan Worm Gear Motor - JSX40-370
-module geared_motor () {
-    cube([46, 32, 21], center = true);
-    translate([(46 / 2) + (30 / 2), 0, 1.5]) rotate([0, 90, 0]) cylinder(r = 24 / 2, h = 30, center = true, $fn = 80);
-    translate([-(46 / 2) + 14.5, 0, -18.5]) rotate([0, 0, 90]) motor_shaft();
-    //pad
-    translate([-(46 / 2) + 14.5, 0, -(1 / 2) - 10.5]) cylinder(r = 13 / 2, h = 1, center = true, $fn = 60);
-    //mount pads
-    translate([-0.5, 0, -(1.5 / 2) - 10.5]) motor_mounts();
-}
\ No newline at end of file
diff --git a/takeup.scad b/takeup.scad
index 32a9866..a9c0d6c 100755
--- a/takeup.scad
+++ b/takeup.scad
@@ -1,4 +1,4 @@
-include <common.scad>;
+include <common/common.scad>;
 include <daylight_spool_mount.scad>;
 
 COUPLING_D = 37;