From 3c1dadc917e508e7d2c31394222c51c59727d7f5 Mon Sep 17 00:00:00 2001
From: "Brian S. Stephan" <bss@incorporeal.org>
Date: Sun, 9 Mar 2025 15:34:21 -0500
Subject: [PATCH] improve on the dustwashers' fit

the hole is a bit tighter now, made possible by having a bevel on the
inside for the lever to move

Signed-off-by: Brian S. Stephan <bss@incorporeal.org>
---
 src/misc/dustwasher-jlf.scad      | 6 +++---
 src/misc/dustwasher-lsx-nobi.scad | 6 +++---
 src/parameters.scad               | 9 +++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/misc/dustwasher-jlf.scad b/src/misc/dustwasher-jlf.scad
index a8b3483..9e1200d 100644
--- a/src/misc/dustwasher-jlf.scad
+++ b/src/misc/dustwasher-jlf.scad
@@ -8,9 +8,9 @@ include <components.scad>
 
 module jlf_dustwasher() {
 	difference() {
-		cylinder(r=lever_plate_hole*decorative_radius_scale, h=2, $fn=100, center=true);
-		// 5.25 = 4.55 (diameter of shaft is 9.10mm) + .25 to let it take an angle
-		cylinder(r=4.8, h=2.1, $fn=100, center=true);
+		cylinder(r=jlf_dustwasher_radius, h=2, $fn=100, center=true);
+		cylinder(r1=jlf_shaft_inner_radius, r2=jlf_shaft_inner_radius+shaft_position_tolerance,
+			h=2.1, $fn=100, center=true);
 	}
 }
 
diff --git a/src/misc/dustwasher-lsx-nobi.scad b/src/misc/dustwasher-lsx-nobi.scad
index abc17dc..3a9ce4c 100644
--- a/src/misc/dustwasher-lsx-nobi.scad
+++ b/src/misc/dustwasher-lsx-nobi.scad
@@ -8,9 +8,9 @@ include <components.scad>
 
 module lsx_nobi_dustwasher() {
 	difference() {
-		cylinder(r=lever_plate_hole*decorative_radius_scale, h=2, $fn=100, center=true);
-		// 5.25 = 5 (diameter of shaft is 10mm) + .25 to let it take an angle
-		cylinder(r=5.25+hole_tolerance, h=2.1, $fn=100, center=true);
+		cylinder(r=lsx_nobi_dustwasher_radius, h=2, $fn=100, center=true);
+		cylinder(r1=lsx_nobi_shaft_inner_radius, r2=lsx_nobi_shaft_inner_radius+shaft_position_tolerance,
+			h=2.1, $fn=100, center=true);
 	}
 }
 
diff --git a/src/parameters.scad b/src/parameters.scad
index e3dd4a9..b8d82ab 100644
--- a/src/parameters.scad
+++ b/src/parameters.scad
@@ -119,6 +119,15 @@ slash_inner_displacement = 10;
 slash_width = 15;
 slash_height = frame_z-panel_z*3;
 
+// dustwasher parameters
+jlf_dustwasher_radius = 19;
+jlf_shaft_inner_radius = 4.55;
+
+lsx_nobi_dustwasher_radius = jlf_dustwasher_radius;
+lsx_nobi_shaft_inner_radius = 5;
+
+shaft_position_tolerance = 2;
+
 // stand dimensions to display a stick
 stand_x = 5;
 stand_y = frame_z;