From 072675e9708ce2d253521fef4b14bf04bacaf918 Mon Sep 17 00:00:00 2001
From: Quinn <quinnvoker@gmail.com>
Date: Wed, 27 Apr 2022 11:14:25 -0700
Subject: [PATCH] Cleanup for release

---
 collar_types.scad      |  1 -
 juqs_alpha_collar.scad | 30 ----------------------
 juqs_collar.scad       | 56 ++++++++++++++++++++++++++++--------------
 3 files changed, 37 insertions(+), 50 deletions(-)
 delete mode 100644 juqs_alpha_collar.scad

diff --git a/collar_types.scad b/collar_types.scad
index dad395a..774c9e0 100644
--- a/collar_types.scad
+++ b/collar_types.scad
@@ -2,7 +2,6 @@ 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";
diff --git a/juqs_alpha_collar.scad b/juqs_alpha_collar.scad
deleted file mode 100644
index fc2f334..0000000
--- a/juqs_alpha_collar.scad
+++ /dev/null
@@ -1,30 +0,0 @@
-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 = [
-  [12, "A"],
-  [12 / sqrt(2 / 1.4), "AN"]
-];
-
-juqs(model = OCTN, collar = STEPPED, throw_type = throw_types[0], shaft_r = (7.2/2)/cos(180/$fn), pivot_depth = 8.05);
-
-/*
-translate([0,0,-8.05])
-  rotate([throw_types[0][0],0,0])
-    cylinder(h=100, r=(7.2/2)/cos(180/$fn));
-*/
\ No newline at end of file
diff --git a/juqs_collar.scad b/juqs_collar.scad
index 8ab2602..df253c0 100644
--- a/juqs_collar.scad
+++ b/juqs_collar.scad
@@ -5,33 +5,51 @@ include<collar_types.scad>;
 
 $fn = 100;
 
+VERSION = "V3.1";
 collar_r = 34.7/2;
-shaft_r = (9/2)/cos(180/$fn);
-//shaft_r = 9/2;
+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;
 
+/*
+  Update the following line to change which kind of collar is being rendered.
+  Available model values: 
+    CIR (circle) 
+    SQR (square)
+    OCT (octagon),
+    OCTR (octagon with round notches, seimitsu octo-like)
+    OCTN (octagon with deep corners, nobi pro-like)
+    SQRN (square with cardinal notches, nobi standard-like)
+  Available collar values:
+    SHORT (standard short or "chopped" collar)
+    FULL (standard full collar)
+    STEPPED (stepped collar, like Bandit F3)
+    FLAT (flat collar, like alphas)
+    ISLAND (unique, almost-full collar. only beveled part of top protrudes when using AFS case)
+  For different throw types, change number in brackets (throw_types[x]):
+    0 ("S": Emulates full throw of standard sanjuks v6 circle gate)
+    1 ("SQ": Reduces throw for SQR model, corners will have same throw as "S" but cardinals are short)
+    2 ("SN": Similar to "SQ", but slightly larger. Tuned for OCTN model)
+*/
+juqs(model = OCTN, collar = FULL, throw_type= throw_types[2], production = false);
+
+/* 
+  change shaft_r to match radius of shaft you wish to use. for example, a 10mm shaft:
+  shaft_r = (10/2)/cos(180/$fn);
+*/
+shaft_r = (9/2)/cos(180/$fn);
+
+/*
+  throw types are arrays with two values:
+    - the max desired cardinal throw angle (diagonal throw is dependent on gate shape)
+    - a string to use as an identifier, embossed on bottom of collar if not production mode
+*/
 throw_types = [
   [10, "S"],
   [10 / sqrt(2), "SQ"],
   [10 / sqrt(2 / 1.4), "SN"]
 ];
 
-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 = "V3.1";
-
-//hollow(OCTN, throw_types[2][0], shaft_r, pivot_depth);
-
-juqs(model = OCTN, collar = FULL, throw_type= throw_types[2], production = true);
-
-/*
-color("red")
-  translate([0,0,-pivot_depth])
-    rotate([throw_types[2][0],0,0])
-      cylinder(h = 100, r = shaft_r);
-*/
-
 module juqs(model = CIR, ver = VERSION, collar = SHORT, throw_type = throw_types[0], shaft_r = shaft_r, pivot_depth = pivot_depth, production = false) {
   throw = throw_type[0];
   collar_h = collar[0];