From b1eeb69f75e2d65996a3698697c396a16c0e6b30 Mon Sep 17 00:00:00 2001 From: Thomas Baumann <101976611+twbaumann@users.noreply.github.com> Date: Sun, 3 Apr 2022 18:19:14 +0200 Subject: [PATCH] Add PCO-1810 thread * Update PCO_thread.csv * Added PCO-1810 to THREAD_TABLE.scad and tests/test_table.awk --- THREAD_TABLE.scad | 2 ++ design/PCO_thread.csv | 2 ++ tests/test_table.awk | 34 ++++++++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/THREAD_TABLE.scad b/THREAD_TABLE.scad index 2452a1f..0e6faee 100644 --- a/THREAD_TABLE.scad +++ b/THREAD_TABLE.scad @@ -1113,6 +1113,8 @@ THREAD_TABLE = [["G1/16-ext", [0.907, 3.1631, 6.3625, [[0, -0.4252], [0, 0.4252] ["M590x6-int", [6, -295.6700, 590.6700, [[0, 2.9434], [0, -2.9434], [3.7150, -0.7985], [3.7150, 0.7985]]]], ["M600x6-ext", [6, 295.9850, 592.7000, [[0, -2.6201], [0, 2.6201], [3.8150, 0.4175], [3.8150, -0.4175]]]], ["M600x6-int", [6, -300.6700, 600.6700, [[0, 2.9434], [0, -2.9434], [3.7150, -0.7985], [3.7150, 0.7985]]]], +["PCO-1810-ext", [3.18, 12.055, 24.51, [[0, -1.13], [0, 1.13], [1.66, 0.5258], [1.66, -0.5258]]]], +["PCO-1810-int", [3.18, -14.045, 27.69, [[0, 1.0423], [0, -1.0423], [1.38, -0.54], [1.38, 0.54]]]], ["PCO-1881-ext", [2.7, 11.52381, 24.2, [[0, -0.987894698], [0, 0.987894698], [2.17619, 0.604173686], [2.17619, -0.195826314]]]], ["PCO-1881-int", [2.7, -14.406, 27.66, [[0, 1.212894698], [0, -0.762894698], [1.656, -0.470897218], [1.656, 0.610159990]]]], ["UNC-#1-ext", [0.396875, 0.6907, 1.3848, [[0, -0.1488], [0, 0.1488], [0.2148, 0.0248], [0.2148, -0.0248]]]], diff --git a/design/PCO_thread.csv b/design/PCO_thread.csv index 17cf516..a934172 100644 --- a/design/PCO_thread.csv +++ b/design/PCO_thread.csv @@ -1,3 +1,5 @@ # Designator,Pitch,Rrot,Dsupport,r0,z0,r1,z1,r2,z2,r3,z3 +PCO-1810-ext,3.18,12.055,24.51,0,-1.13,0,1.13,1.66,0.5258,1.66,-0.5258 +PCO-1810-int,3.18,-14.045,27.69,0,1.0423,0,-1.0423,1.38,-0.54,1.38,0.54 PCO-1881-ext,2.7,11.52381,24.2,0,-0.987894698,0,0.987894698,2.17619,0.604173686,2.17619,-0.195826314 PCO-1881-int,2.7,-14.406,27.66,0,1.212894698,0,-0.762894698,1.656,-0.470897218,1.656,0.610159990 diff --git a/tests/test_table.awk b/tests/test_table.awk index 469d692..43de342 100644 --- a/tests/test_table.awk +++ b/tests/test_table.awk @@ -137,7 +137,37 @@ BEGIN { NR_OF_TESTS += 2; } -/PCO.+-ext/ { +/PCO-1810-ext/ { + # PCO-1810 threads have +/-70 deg slopes, horizontal crest / valley + parse(); + m1 = slope(v0, v3) / deg; + m2 = slope(v2, v1) / deg; + if (m1 > 70 + dphi || m1 < 70 - dphi \ + || m2 < -70 - dphi || m2 > -70 + dphi) { + print designator " FAIL: " m1 ", " m2 " deg"; + PASS = 0; + } + test_horizontal(); + tested = 1; + NR_OF_TESTS += 2; +} + +/PCO-1810-int/ { + # PCO-1810 threads have +/-70 deg slopes, horizontal crest / valley + parse(); + m1 = slope(v3, v0) / deg; + m2 = slope(v1, v2) / deg; + if (m1 > -70 + dphi || m1 < -70 - dphi \ + || m2 < 70 - dphi || m2 > 70 + dphi) { + print designator " FAIL: " m1 ", " m2 " deg"; + PASS = 0; + } + test_horizontal(); + tested = 1; + NR_OF_TESTS += 2; +} + +/PCO-1881-ext/ { # PCO-1881 threads have slopes of -80 deg (on the load side) and 70 deg # (on the other side) + horizontal crest / valley parse(); @@ -153,7 +183,7 @@ BEGIN { NR_OF_TESTS += 2; } -/PCO.+-int/ { +/PCO-1881-int/ { # PCO-1881 threads have slopes of 80 deg (on the load side) and -70 deg # (on the other side) + horizontal crest / valley parse();