From d5ddbc4186e96cc93bfe5bfa345b1421f70071c1 Mon Sep 17 00:00:00 2001
From: Leni Aniva <v@leni.sh>
Date: Mon, 24 Jun 2024 11:05:03 -0700
Subject: [PATCH] feat: Use M12 centre hole for H-S joint

---
 nhf/touhou/houjuu_nue/__init__.py | 46 +++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/nhf/touhou/houjuu_nue/__init__.py b/nhf/touhou/houjuu_nue/__init__.py
index 7fd08e7..ede9d9f 100644
--- a/nhf/touhou/houjuu_nue/__init__.py
+++ b/nhf/touhou/houjuu_nue/__init__.py
@@ -42,8 +42,14 @@ class Parameters:
     hs_joint_radius_inner = 20
     hs_joint_corner_fillet = 5
     hs_joint_corner_cbore_diam = 12
-    hs_joint_corner_cbore_depth = 12
-    hs_joint_corner_inset = 15
+    hs_joint_corner_cbore_depth = 2
+    hs_joint_corner_inset = 12
+
+    hs_joint_axis_diam = 12
+    hs_joint_axis_cbore_diam = 20
+    hs_joint_axis_cbore_depth = 3
+
+
     """
     Radius of the mounting mechanism of the wing root. This is constrained by
     the size of the harness.
@@ -138,19 +144,19 @@ class Parameters:
             radius=self.hs_joint_radius,
             radius_inner=self.hs_joint_radius_inner,
             tooth_height=self.hs_joint_tooth_height,
-            base_height=self.hs_joint_ring_thickness)
-        hirth = (
-            hirth
-            .faces("<Z")
-            .workplane()
-            .transformed(
-                offset=Cq.Vector(0, 0, -self.hs_joint_ring_thickness / 2),
-                rotate=Cq.Vector(90, 0, 0))
-            # This hole will drill only to the centre and not through. This is
-            # intended.
-            .hole(5)
-            .val()
-        )
+            base_height=self.hs_joint_ring_thickness).val()
+        #hirth = (
+        #    hirth
+        #    .faces("<Z")
+        #    .workplane()
+        #    .transformed(
+        #        offset=Cq.Vector(0, 0, -self.hs_joint_ring_thickness / 2),
+        #        rotate=Cq.Vector(90, 0, 0))
+        #    # This hole will drill only to the centre and not through. This is
+        #    # intended.
+        #    .hole(5)
+        #    .val()
+        #)
         conn = self.hs_joint_harness_conn()
         result = (
             Cq.Workplane('XY')
@@ -185,6 +191,16 @@ class Parameters:
             .union(hirth.move(Cq.Location((0, 0, self.hs_joint_base_thickness))), tol=0.1)
             .clean()
         )
+        result = (
+            result.faces("<Z")
+            .workplane()
+            .cboreHole(
+                diameter=self.hs_joint_axis_diam,
+                cboreDiameter=self.hs_joint_axis_cbore_diam,
+                cboreDepth=self.hs_joint_axis_cbore_depth,
+            )
+            .clean()
+        )
         result.faces("<Z").tag("base")
         return result