From 3abca14fd1398de93282f7177aeebcaeb5afb897 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Sep 2012 14:37:36 +0100
Subject: [PATCH] doveclip introduce DoveClipPariSane_width; abolish
 DoveClip_width; NFC

---
 doveclip.scad      | 7 ++++---
 filamentspool.scad | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doveclip.scad b/doveclip.scad
index a58859c..6e9bb1d 100644
--- a/doveclip.scad
+++ b/doveclip.scad
@@ -34,8 +34,6 @@ module DoveClipPin(h=height) {
 
 function DoveClip_depth() =
   basethick + nomrad*2 + toothheight;
-function DoveClip_width() =
-  nomrad*2 + jawthick*2 + toothgap;
 
 module DoveClipEnd(baseextend=1, h=7) {
   cubex = nomrad*2 + jawthick*2;
@@ -52,7 +50,7 @@ module DoveClipEnd(baseextend=1, h=7) {
 }
 
 module DoveClipPair(baseextend=1, h=7) {
-  delta = DoveClip_width();
+  delta =  nomrad*2 + jawthick*2 + toothgap;
   for (x=[-delta/2,delta/2])
     translate([x,0,0])
       DoveClipEnd(baseextend=baseextend, h=h);
@@ -74,3 +72,6 @@ module DoveClipPairSane(baseextend=0, h=7, count=2) {
     translate([0, DoveClip_depth(), 0])
     DoveClipPairBase(baseextend=baseextend, h=h, count=count);
 }
+
+function DoveClipPairSane_width(count=2) =
+  2 * (nomrad + jawthick + ((nomrad*2 + jawthick) * (count-1)/2));
diff --git a/filamentspool.scad b/filamentspool.scad
index 487d853..6b35646 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -197,7 +197,7 @@ module Hub(){ ////toplevel
     translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
   }
   hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
-  holewidth = DoveClip_width() - hubstemwidth*2;
+  holewidth = DoveClipPairSane_width() - hubstemwidth*2;
   for (ang=[0,120,240])
     rotate([0,0,ang]) {
       difference() {
-- 
2.30.2