Add 2-piece adapter and alpha collar

alpha_adaptor.scad

@@ -1,4 +1,6 @@
 use<juqs_collar.scad>;
+$fn = 100;
+
 /*
 measurements
 
@@ -20,52 +22,74 @@ screw_hole_bevel_h = 1.8
 screw_hole_padding_lower = 1.8
 */
 
-alpha_adaptor();
+lower();
 
 module alpha_adaptor() {
-  $fn = 100;
   difference(){
     union(){
       lower();
       translate([0, 0, 3.6])
         upper();
     }
-    screw_holes();
     cylinder(h = 10, r = 35 / 2);
     translate([0,0,7.6 - 2.8])
       base(b = 0);
   }
 }
 
-module upper(){
+module upper(h = 4, size = 59.6, r = 3.5){
-  rounded_rect(h = 4, size = 59.6, r = 2);
+  difference() {
+    rounded_rect(h = h, size = size, r = r);
+    screw_holes();
+    center_hole();
+    translate([0,0,h - 2.8])
+      base(b = 0);
+    guide_posts();
+  }
 }
 
-module lower(){
+module lower(h = 3.6, size = 52.6, r = 15){
-  rounded_rect(h=3.6, size = 52.6, r = 13);
+  difference() {
+    union(){
+      rounded_rect(h = h, size = size, r = r);
+      guide_posts();
+    }
+    screw_holes();
+    center_hole();
+  }
 }
 
-module screw_holes(r = 4.8 / 2){
+module center_hole() {
-  offset = 52.6 / 2 - 1.8 - r;
+  cylinder(h = 10, r = 35 / 2);
+}
+
+module guide_posts(h = 7.6, r = 4.8 / 2) {
+  rotate([0,0,45])
+    screw_holes(h = 7.6, r1 = r, r2 = r);
+}
+
+module screw_holes(h = 10, r1 = 4.8 / 2, r2 = 5.6 / 2, pos = 52.6 / 2 - 1.8){
+  offset = pos - r1;
+  chamfer_height = r2 - r1;
   translate([offset, 0, 0]){
-    cylinder(h = 10, r = r);
+    cylinder(h = h, r = r1);
-    translate([0, 0 ,7.6 - 1.8])
+    translate([0, 0 , 7.6 - chamfer_height])
-      cylinder(h = 1.8, r1 = r, r2 = 8.2 / 2);
+      cylinder(h = chamfer_height, r1 = r1, r2 = r2);
   }
   translate([-offset, 0, 0]){
-    cylinder(h = 10, r = r);
+    cylinder(h = h, r = r1);
-    translate([0, 0 ,7.6 - 1.8])
+    translate([0, 0 ,7.6 - chamfer_height])
-      cylinder(h = 1.8, r1 = r, r2 = 8.2 / 2);
+      cylinder(h = chamfer_height, r1 = r1, r2 = r2);
   }
   translate([0, offset, 0]){
-    cylinder(h = 10, r = r);
+    cylinder(h = h, r = r1);
-    translate([0, 0 ,7.6 - 1.8])
+    translate([0, 0 ,7.6 - chamfer_height])
-      cylinder(h = 1.8, r1 = r, r2 = 8.2 / 2);
+      cylinder(h = chamfer_height, r1 = r1, r2 = r2);
   }
   translate([0, -offset, 0]){
-    cylinder(h = 10, r = r);
+    cylinder(h = h, r = r1);
-    translate([0, 0 ,7.6 - 1.8])
+    translate([0, 0 ,7.6 - chamfer_height])
-      cylinder(h = 1.8, r1 = r, r2 = 8.2 / 2);
+      cylinder(h = chamfer_height, r1 = r1, r2 = r2);
   }
 }
 

collar_types.scad

@@ -0,0 +1,14 @@
+SHORT = [8.7, [1.6, 0.5], false];
+FULL = [18, [4.6, 0.5], false];
+STEPPED = [8.7, [2.6, 0.5], true];
+FLAT = [2.1 + 2.8, [0.5, 0.5], false];
+FLUSH = [8.7 + 5.8, [2.6, 0.5], false];
+ISLAND = [8.7 + 5.8 + 1, [2.6, 0.5], false];
+
+CIR = "CIR";
+SQR = "SQR";
+OCT = "OCT";
+OCTR = "OCTR";
+OCTN = "OCTN";
+SQRN = "SQRN";
+

juqs_alpha_collar.scad

@@ -0,0 +1,24 @@
+include<collar_types.scad>
+use<juqs_collar.scad>;
+$fn = 100;
+
+/*
+  Measurements
+
+  grommet_z = 6.5
+  collar_base_to_grommet_z = 7.6 - 2.8 = 4.8
+  pivot depth = 6.5 / 2 + 4.8 = 8.05
+
+  shaft_d = 7.2
+
+  stock_collar_upper_d = 12.5
+
+  stock_collar_height = 2.1
+*/
+
+throw_types = [
+  [10.425, "A"],
+  [10.425 / sqrt(2 / 1.4), "AN"]
+];
+
+juqs(model = OCTN, collar = STEPPED, throw_type = throw_types[1], shaft_r = (7.2/2)/cos(180/$fn));

juqs_collar.scad

@@ -1,23 +1,17 @@
 include<round_gates.scad>;
 include<shape_gate.scad>;
 include<shapes.scad>;
+include<collar_types.scad>;
 
 $fn = 100;
 
 collar_r = 34.7/2;
-//short_collar = 8.7;
-short_collar = [8.7, [1.6, 0.5], false];
-//full_collar = 18;
-full_collar = [18, [4.6, 0.5], false];
-stepped_collar = [8.7, [2.6, 0.5], true];
-flush_collar = [8.7 + 5.8, [2.6, 0.5], false];
-island_collar = [8.7 + 5.8 + 1, [2.6, 0.5], false];
 shaft_r = (9/2)/cos(180/$fn);
 //shaft_r = 9/2;
 
 throw_types = [
-  [10, "B"],
+  [10, "S"],
-  [10 / sqrt(2), "S"],
+  [10 / sqrt(2), "SQ"],
   [10 / sqrt(2 / 1.4), "SN"]
 ];
 
@@ -25,18 +19,11 @@ grommet_dist = 6.8; //distance the grommet sits below this component
 grommet_depth = 6.4; //thickness of grommet (when compressed)
 pivot_depth = grommet_dist + grommet_depth / 2;
 
-VERSION = "V2.8";
+VERSION = "V2.9";
 
-CIR = "CIR";
+juqs(model = OCTN, collar = ISLAND, throw_type= throw_types[2]);
-SQR = "SQR";
-OCT = "OCT";
-OCTR = "OCTR";
-OCTN = "OCTN";
-SQRN = "SQRN";
 
-juqs(model = OCTN, ver = VERSION, collar = island_collar, throw_type= throw_types[2]);
+module juqs(model = CIR, ver = VERSION, collar = SHORT, throw_type = throw_types[0], shaft_r = shaft_r, pivot_depth = pivot_depth) {
-
-module juqs(model, ver, collar = short_collar, throw_type = throw_types[0]) {
   throw = throw_type[0];
   collar_h = collar[0];
   bevel = collar[1];
@@ -76,7 +63,7 @@ module juqs(model, ver, collar = short_collar, throw_type = throw_types[0]) {
             translate([0, 10.6, 0])
               text(str("JUQS"), font=font, size=fontsize, halign = "center");
             translate([0, -14.75, 0])
-              text(str(VERSION, " ", throw_type[1]),font=font, size=fontsize, halign = "center");
+              text(str(ver, " ", throw_type[1]),font=font, size=fontsize, halign = "center");
           }
         };
       }