src/components.scad

@@ -28,9 +28,10 @@ module panel_holes() {
 // for snap-ins, etc.
 module button_24mm_hole() {
 	cylinder(r=small_button_radius, h=100, $fn=50, center=true);
-	// carve out space for snap-ins and screw-in nuts
+	// carve out space for snap-ins, leave 3mm
+	// slagcoin has screw-in nut diameter at 29.5mm, so radius+3 to leave some space
 	// translation is to leave 3mm thickness in the plate without recentering anything
-	translate([0, 0, -25]) cylinder(r=small_button_radius+button_radius_connector_space, h=49, $fn=50, center=true);
+	translate([0, 0, -25]) cylinder(r=small_button_radius+3, h=49, $fn=50, center=true);
 	// space for decorative button surround stuff
 	translate([0, 0, 50]) cylinder(r=small_button_radius*decorative_radius_scale, h=20, $fn=50, center=true);
 	translate([0, 0, 70]) cylinder(r=small_button_radius*jumbo_decorative_radius_scale, h=20, $fn=50, center=true);
@@ -40,9 +41,10 @@ module button_24mm_hole() {
 // for snap-ins, etc.
 module button_30mm_hole() {
 	cylinder(r=big_button_radius, h=100, $fn=50, center=true);
-	// carve out space for snap-ins and screw-in nuts
+	// carve out space for snap-ins, leave 3mm
+	// slagcoin has screw-in nut diameter at 36mm, so radius+6 to leave some space
 	// translation is to leave 3mm thickness in the plate without recentering anything
-	translate([0, 0, -25]) cylinder(r=big_button_radius+button_radius_connector_space, h=49, $fn=50, center=true);
+	translate([0, 0, -25]) cylinder(r=big_button_radius+6, h=49, $fn=50, center=true);
 	// space for decorative button surround stuff
 	translate([0, 0, 50]) cylinder(r=big_button_radius*decorative_radius_scale, h=20, $fn=50, center=true);
 	translate([0, 0, 70]) cylinder(r=big_button_radius*jumbo_decorative_radius_scale, h=20, $fn=50, center=true);

src/panels/inset/lever-and-sega-2p-6-button-panel-with-aux-with-mount.scad

@@ -1,25 +0,0 @@
-/*
- * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-include <parameters.scad>
-include <components.scad>
-
-module lever_and_sega_2p_6_button_panel_with_aux_with_mount() {
-	difference() {
-		union() {
-			panel();
-			translate([45, -58, -panel_z/2]) rotate([0, 0, 13]) pcb_mount();
-		}
-		translate([90, -25, 0]) sega_2p_6_button();
-		translate([-65, 5, 0]) union() {
-			levermountholes();
-			levermountcountersinks();
-		}
-		translate([17, 70, 0]) button_24mm_hole();
-		translate([-17, 70, 0]) button_24mm_hole();
-	}
-}
-
-lever_and_sega_2p_6_button_panel_with_aux_with_mount();

src/panels/overhang/solo-lever-and-sega-2p-6-button-panel.scad

@@ -8,14 +8,13 @@ include <components.scad>
 
 module lever_and_sega_2p_6_button_solo_overhang_panel() {
 	difference() {
+		// base plate
+		union() {
 			panel_with_raised_overhang();
-		translate([90, -25, 0]) sega_2p_6_button();
+			translate([-60, 18, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
-		translate([-65, 5, 0]) union() {
-			levermountholes();
-			levermountcountersinks();
 		}
-		translate([17, 70, 0]) button_24mm_hole();
+		translate([95, -20, 0]) sega_2p_6_button();
-		translate([-17, 70, 0]) button_24mm_hole();
+		translate([-60, 18, 0]) levermountholes();
 	}
 }
 

src/parameters.scad

@@ -23,11 +23,6 @@ small_button_radius = 12 + hole_tolerance;
 // 30mm button
 big_button_radius = 15 + hole_tolerance;
 
-// carve out space around buttons for screw-in nuts
-// slagcoin has screw-in nut diameter at 36mm for 30mm buttons, 29.5 for 24mm buttons
-// radius + value below should leave space for the nut and for fingers to grab the nut
-button_radius_connector_space = 5;
-
 // JLF mount dimensions
 lever_mount_x = 53;
 lever_mount_y = 95;