From 7a0e7665a15038f0bdbd817bbada7d5703daeb46 Mon Sep 17 00:00:00 2001
From: daniel watson <ozzloy@gmail.com>
Date: Sat, 20 Jan 2018 23:12:34 -0800
Subject: [PATCH] finish 3030 spool holder

---
 mk2-haribo-spool-holder.scad | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/mk2-haribo-spool-holder.scad b/mk2-haribo-spool-holder.scad
index 0b8c55f..930a0ce 100644
--- a/mk2-haribo-spool-holder.scad
+++ b/mk2-haribo-spool-holder.scad
@@ -48,7 +48,9 @@ module 3030_profile(){
 
 module 3030_sleeve_profile(){
   difference() {
-    square(40, true);
+    minkowski() {
+      square(30, true);
+      circle(5); }
     minkowski() {
       3030_profile();
       circle(0.2);} } }
@@ -59,7 +61,6 @@ module fillet(r) {
        children(); } } }
 
 module upper_arm_profile(){
-  square(40, true);
 
   a = [20, -20];
   b = [34.1, 0];
@@ -82,8 +83,10 @@ module forearm_profile() {
 
 module shoulder_hull() {
   hull() {
-    translate([-20, -20, 0]) {
-      cube([40, 40, 35]); }
+    translate([-15, -15, 5]) {
+      minkowski(){
+        cube([30, 30, 25]);
+        sphere(5); } }
     difference() {
       upper_arm_hull();
       translate([-30, 30, -10]) {
@@ -126,11 +129,21 @@ module hand_hull() {
       linear_extrude(height = 5) {
         hand_profile(); } } } }
 
-shoulder_hull();
-upper_arm_hull();
-elbow_hull();
-forearm_hull();
-hand_hull();
+module 3030_spool_holder() {
+  difference() {
+    union() {
+      shoulder_hull();
+      upper_arm_hull();
+      elbow_hull();
+      forearm_hull();
+      hand_hull(); }
+    translate([0, 0, -1]) {
+      linear_extrude(height = 40) {
+        minkowski() {
+          3030_profile();
+          circle(0.2); } } } } }
+
+3030_spool_holder();
 
 module original_forearm_profile() {
   %projection(true) {
-- 
2.30.2