From 44a238f454a8a5ac5e7cc9933b667cec7c47206b Mon Sep 17 00:00:00 2001
From: "Brian S. Stephan" <bss@incorporeal.org>
Date: Tue, 20 Feb 2024 12:25:14 -0600
Subject: [PATCH] move the lever mount spacer out of the panels, into separate
 part

this has two effects:

1. thinner and thicker spacers could be printed to accommodate
   preferences without having to reprint panels
2. I'm still testing this a bit, but by not having the spacer and panel
   be the same (partially hollow) part, I think the lever clickiness is
   a bit more pleasing to the ear

the second point is entirely arbitrary, so the first point is the real
benefit, despite me trying this because of the second

Signed-off-by: Brian S. Stephan <bss@incorporeal.org>
---
 src/components.scad                              |  3 +++
 src/misc-lever-mount-sanwa-seimitsu.scad         | 16 ++++++++++++++++
 ...anel-inset-lever-and-dir_arc-plus-w-30mm.scad |  7 ++-----
 src/top-panel-inset-lever.scad                   |  6 ++----
 ...rhang-left-lever-and-dir_arc-plus-w-30mm.scad |  6 ++----
 src/top-panel-overhang-left-lever.scad           |  6 ++----
 6 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 src/misc-lever-mount-sanwa-seimitsu.scad

diff --git a/src/components.scad b/src/components.scad
index 4ced916..d5819b5 100644
--- a/src/components.scad
+++ b/src/components.scad
@@ -151,6 +151,9 @@ module levermountholes() {
 		m4_hole();
 	translate([-20, -42.5, 0])
 		m4_hole();
+}
+
+module levermountcountersinks() {
 	// holes for joystick bolt countersinks
 	translate([20, 42.5, 2])
 		m4_hole_countersink();
diff --git a/src/misc-lever-mount-sanwa-seimitsu.scad b/src/misc-lever-mount-sanwa-seimitsu.scad
new file mode 100644
index 0000000..79989f4
--- /dev/null
+++ b/src/misc-lever-mount-sanwa-seimitsu.scad
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module sanwa_seimitsu_lever_mount() {
+	difference() {
+		levermountbase();
+		levermountholes();
+	}
+}
+
+sanwa_seimitsu_lever_mount();
diff --git a/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad b/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad
index f75e69a..46f2472 100644
--- a/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad
+++ b/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad
@@ -8,13 +8,10 @@ include <components.scad>
 
 module top_panel_inset_lever_and_dir_arc_w_30mm() {
 	difference() {
-		union() {
-			panel();
-			translate([(-panel_x/2)+55, (panel_y/2)-75, -((panel_z/2)+(lever_mount_z/2))])
-				levermountbase();
-		}
+		panel();
 		dir_arc_w_30mm();
 		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountholes();
+		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountcountersinks();
 	}
 }
 
diff --git a/src/top-panel-inset-lever.scad b/src/top-panel-inset-lever.scad
index fbabbd6..282620d 100644
--- a/src/top-panel-inset-lever.scad
+++ b/src/top-panel-inset-lever.scad
@@ -10,12 +10,10 @@ include <components.scad>
 module lever_panel() {
 	difference() {
 		// base plate
-		union() {
-			translate([0,-20,0]) panel();
-			translate([0, 0, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
-		}
+		translate([0,-20,0]) panel();
 		// holes to mount the lever
 		levermountholes();
+		levermountcountersinks();
 	}
 }
 
diff --git a/src/top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad b/src/top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad
index 2990759..c5932c7 100644
--- a/src/top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad
+++ b/src/top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad
@@ -8,13 +8,11 @@ include <components.scad>
 
 module top_panel_left_lever_and_dir_arc_w_30mm() {
 	difference() {
-		union() {
-			panel_with_raised_overhang();
-			translate([(-panel_x/2)+55, (panel_y/2)-75, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
-		}
+		panel_with_raised_overhang();
 		dir_arc_w_30mm();
 		side_chopper();
 		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountholes();
+		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountcountersinks();
 	}
 }
 
diff --git a/src/top-panel-overhang-left-lever.scad b/src/top-panel-overhang-left-lever.scad
index 0f69db0..f20c622 100644
--- a/src/top-panel-overhang-left-lever.scad
+++ b/src/top-panel-overhang-left-lever.scad
@@ -10,12 +10,10 @@ include <components.scad>
 module top_panel_left_lever() {
 	difference() {
 		// base plate
-		union() {
-			panel_with_raised_overhang();
-			translate([0, 0, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
-		}
+		panel_with_raised_overhang();
 		// holes to mount the lever
 		translate([0, 20, 0]) levermountholes();
+		translate([0, 20, 0]) levermountcountersinks();
 		side_chopper();
 	}
 }