From 6e361e90e00c9b99f4006381a84f7dd4f7fb6eea Mon Sep 17 00:00:00 2001
From: Quinn <quinnvoker@gmail.com>
Date: Wed, 5 Jan 2022 16:41:26 -0800
Subject: [PATCH] Add bevel to square collar

---
 JUQS-collar.scad | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/JUQS-collar.scad b/JUQS-collar.scad
index 37c91a1..394e282 100644
--- a/JUQS-collar.scad
+++ b/JUQS-collar.scad
@@ -26,7 +26,7 @@ rotate([0,0,0]){
    * OCTNR corner test (seems to also match OCTN, nice!)
    * shaft(shaft_r, pivot_depth, [cardinal_throw+1.95,0,45]);
   */
-  juqs(model = CIR, ver = VERSION);
+  juqs(model = SQR, ver = VERSION);
 }
 
 module juqs(model, ver) {
@@ -134,6 +134,26 @@ module sq_pivot (throw, shaft_r, depth, sharpness = 1, throw_extend = 0) {
   } 
 }
 
+module sq_bevel (throw, shaft_r, depth, sharpness = 1, throw_extend = 0, b_height = 1) {
+  h = 50;
+  shaft_r = shaft_r / sharpness;
+  corner_offset = shaft_r * (sharpness - 1) + ((depth + b_height) * tan(throw + throw_extend));
+  translate([0,0,-depth]) {
+    hull() {
+      translate([corner_offset,0,0])
+        cylinder(h = h, r = shaft_r);
+      translate([-corner_offset,0,0])
+        cylinder(h = h, r = shaft_r);
+      rotate([0,0,90]) {
+        translate([corner_offset,0,0])
+          cylinder(h = h, r = shaft_r);
+        translate([-corner_offset,0,0])
+          cylinder(h = h, r = shaft_r); 
+      }
+    }
+  }
+}
+
 module cir_hollow(slope, shaft_r, depth) {
   translate([0,0,-depth]) {
     ci_pivot(slope, shaft_r);
@@ -142,8 +162,10 @@ module cir_hollow(slope, shaft_r, depth) {
 }
 
 module sqr_hollow (slope, shaft_r, depth) {
-  rotate([0,0,45])
+  rotate([0,0,45]) {
     sq_pivot(slope, shaft_r, depth);
+    sq_bevel(slope, shaft_r, depth);
+  };
 };
 
 module oct_hollow (slope, shaft_r, depth) {