better component/parameter names to match panel naming

sed -i 's/top_plate/panel/g' *.scad
sed -i 's/plate_to_frame/panel_to_frame/g' *.scad

Signed-off-by: Brian S. Stephan <bss@incorporeal.org>

CONTRIBUTING.md

@@ -0,0 +1,35 @@
+# Contributing Guidelines
+
+The Buildable Stick System is made available under the GPLv3 (or later) license. Contributions are welcome via pull
+requests. This document outlines the process to get your contribution accepted.
+
+## Sign Offs/Custody of Contributions
+
+I do not request the copyright of contributions be assigned to me or to the project, and I require no provision that I
+be allowed to relicense your contributions. My personal oath is to maintain inbound=outbound in my open source projects,
+and the expectation is authors are responsible for their contributions.
+
+I am following the the [Developer Certificate of Origin (DCO)](https://developercertificate.org/), also available at
+`DCO.txt`. The DCO is a way for contributors to certify that they wrote or otherwise have the right to license their
+code contributions to the project. Contributors must sign-off that they adhere to these requirements by adding a
+`Signed-off-by` line to their commit message, and/or, for frequent contributors, by signing off on their entry in
+`MAINTAINERS.md`.
+
+This process is followed by a number of open source projects, most notably the Linux kernel. Here's the gist of it:
+
+```
+[Your normal Git commit message here.]
+
+Signed-off-by: Random J Developer <random@developer.example.org>
+```
+
+`git help commit` has more info on adding this:
+
+```
+-s, --signoff
+    Add Signed-off-by line by the committer at the end of the commit log
+    message. The meaning of a signoff depends on the project, but it typically
+    certifies that committer has the rights to submit this work under the same
+    license and agrees to a Developer Certificate of Origin (see
+    http://developercertificate.org/ for more information).
+```

DCO.txt

@@ -0,0 +1,34 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.

MAINTAINERS.md

@@ -0,0 +1,10 @@
+# Maintainers
+
+This file contains information about people permitted to make major decisions and direction on the project.
+
+## Contributing Under the DCO
+
+By adding your name and email address to this section, you certify that all of your subsequent contributions to the
+Buildable Stick System are made under the terms of the Developer's Certificate of Origin 1.1, available at `DCO.txt`.
+
+* Brian S. Stephan (<bss@incorporeal.org>)

Makefile

@@ -1,11 +1,14 @@
-SRCDIR = ./src
-all: $(SRCDIR)/*
-	mkdir -p build
+SRC_FILES := $(wildcard ./src/*.scad)
+SRC_FILES := $(filter-out ./src/blown-up-demo.scad, $(SRC_FILES))
+SRC_FILES := $(filter-out ./src/components.scad, $(SRC_FILES))
+SRC_FILES := $(filter-out ./src/roundedcube.scad, $(SRC_FILES))
+all: $(SRC_FILES)
+	mkdir -p ./build
 	for file in $^ ; do \
 		openscad -o $${file}.stl $${file} ; \
-		mv $${file}.stl build ; \
+		mv $${file}.stl ./build/ ; \
 	done
+	zip ./build/buildable-stick-system-`git describe --dirty`-stls.zip ./build/*
 
 clean:
-	rm build/*.stl
-	rmdir build
+	rm -rf ./build

README.md

@@ -2,7 +2,13 @@
 
 Files for 3D printing an arcade stick.
 
-![An example of stick components displayed in OpenSCAD](docs/three-panel-example.png)
+![An example of stick components displayed in OpenSCAD](docs/two-panel-example-v3.png)
+
+[OpenSCAD-based illustration of how the components for an overhang panel-based stick fit together.]
+
+![A photo of a completed stick](docs/finished-v3.1.jpg)
+
+[Photo of a completed inset panel-based stick.]
 
 Originally an attempt to make a couple customized STL files for the [OpenStickCommunity Fightstick
 Case](https://github.com/OpenStickCommunity/Hardware/tree/main/Fightstick%20Case), the changes ballooned to fit my
@@ -30,29 +36,60 @@ What you'll need beyond these objects:
   Board](https://github.com/OpenStickCommunity/Hardware/tree/main/RP2040%20Advanced%20Breakout%20Board))
     * 4 M3 8mm hex bolts to secure the PCB to a panel
 * Per frame and plate combo:
-    * 4 40mm M4 hex brass standoffs
-    * 8 12-16mm M4 countersunk hex bolts
+    * 4 45mm M4 hex brass standoffs (or equivalent)
+    * 8 M4 countersunk hex bolts
+        * Overhang plates should use 12-16mm length bolts since they are taller
+        * Inset plates should probably use 8-12mm bolts --- some standoffs aren't threaded the whole way, making 16mm
+          too long to go flush
+        * If making the 45mm standoffs from multiple smaller ones, make sure they have enough length to take your bolts!
 * Per frame connection point:
-    * 8 25mm M4 bolts
+    * 8 16mm M4 bolts
     * 8 M4 flange nuts
 * For a lever:
     * 4 12-16mm M4 countersunk hex bolts
     * 4 M4 flange nuts
+* For Neutrik D connections:
+    * 2 10mm M3 hex bolts
+    * 2 M3 flange nuts
 * Buttons and levers as desired
 * Wiring as required
 
-### Issues and Limitations
+## Rough Costs
 
-This is a living repository, and as such, there are likely issues with the objects, known or otherwise. Be aware:
+This is a rough estimate of the cost to produce one of these sticks, assuming a usual 2-frame design and layout.
+Filament masses from Bambu Studio estimates, using Bambu PLA Basic.
 
-* The top panel is 5mm tall and doesn't have an inset; snap-in buttons likely do not fit.
-* A composition error made the frame 5mm shorter than intended and wasn't noticed until I printed everything:
-    * Some levers don't have enough clearance in the case.
-    * Buttons with traditional quick connects are a *very* tight fit, you will probably need to bend pins.
-* The PCB mount position was very tight on the buttons panel; it will probably have to be moved.
-* Support for the top plate was removed from the frame due to overhang issues, and now the top plate can bow slightly
-  with pressure; a new solution needs to be found.
+* Left and right frame: **$7.08 USD** (141.84g each, as of 2023-09-12)
+* Left and right (overhang) top panels: **~$6.74 USD** (~135g each, as of 2023-09-12)
+* Left and right (overhang) bottom panels: **$5.90 USD** (118.16g each, as of 2023-09-12)
+* Miscellaneous mounting plates, decorative plates, etc.: **~$1.00 USD** (~40g, as of 2023-09-12)
+* 8 16mm M4 bolts to connect the frames: **$0.72 USD** (you can get a pack of 100 on Amazon for $9, as of 2023-09-12)
+* 8 M4 flange nuts to connect the frames: **$0.68 USD** (you can get a pack of 100 on Amazon for $8.50, as of 2023-09-12)
+* 4 10mm M3 bolts to connect Neutrik D plates to frames: **$0.40 USD** (you can get a pack of 100 on Amazon for $10, as
+  of 2023-09-12)
+* 4 M3 flange nuts to connect Neutrik D plates to frames: **$0.34 USD** (you can get a pack of 100 on Amazon for $8.50,
+  as of 2023-09-12)
+* 8 45mm M4 spacers to connect panels to frames: **$2.40 USD** (you can get a pack of 10 on AliExpress for $3, as of
+  2023-09-12)
+    * You could 3D print these too, but you're probably better off with brass ones as they give some weight to the
+      stick anyway
+    * You can also use a shorter length with longer bolts, or combine multiple spacers, if either of those yield better
+      prices
+* 8 16mm M4 bolts to connect top plates to frames: **$0.72 USD** (you can get a pack of 100 on Amazon for $9, as of
+* 8 12mm M4 bolts to connect bottom plates to frames: **$0.72 USD** (you can get a pack of 100 on Amazon for $9, as of
+  2023-09-12)
 
+With an enclosure coming in around $26, depending on your choices --- say, ~$30 for TheTrain's RP2040 Advanced Breakout
+Board, ~$60 for Sanwa buttons and a lever, and ~$20 for miscellaneous connectors and wiring --- you can put a
+full-featured controller with an open source foundation together for around $135.
+
+## Miscellany
+
+See the `/docs/` directory for more thoughts too scattered for this document.
+
+## Issues and Limitations
+
+This is a living repository, and as such, there are likely issues with the objects, known or otherwise.
 These issues may be fixed in the future; see `TODO.md` for details.
 
 ## Development and Contributing

TODO.md

@@ -2,17 +2,14 @@
 
 Notes for "next time".
 
-## v2
+## v3.3
+
+* Try not using roundedcube and instead bezel the top, to get cleaner seams everywhere else
+
+## v4
 
-* I need at least 5mm, maybe 10mm, more height, to fit some of my levers like the Nobi Bullet
-    * I couldn't even fit a JLF without the compensations in v1 on the bottom panel
-    * I had to bend the pins a bit on Crown SDB-202s, too
-* Top plates are 1-2mm too thick for snap-ins, maybe have a variant with a couple shaved off like with the bottom plate
-  workaround
-* The plates bow a bit on the top when pressure is applied, because there's no support from the frame up there ---
-  adding 5mm to the frame should leave a couple mm for support to get added back
-* PCB mount on `top-panel-dir_arc-plus-w-30mm-plus-one-with-mount.scad` doesn't leave room for a USB cable on the right
-  hand side
-* The panels' connection points could probably be a bit thinner to accommodate more bolts. A 20mm bolt barely clears the
-  two panels and I don't like that kind of bolt connection.
 * Engraving some cosmetic stuff? Or maybe a place to mount other plates?
+* Try making it so top plates are bolted in from the side of the frame rather than the top
+    * I'm thinking of abandoning this, because it makes the frame more complicated to have a portion of a column rather
+      than the full column, but I'll keep it here for a bit longer
+* Try making frames out of four pieces connected at joints on the hex posts, rather than one large piece?

docs/materials.md

@@ -0,0 +1,25 @@
+# Materials
+
+bss's random thoughts and notes on 3D printing materials.
+
+## Bambu Lab PLA
+
+### Basic
+
+* In general, nice texture, but under direct light, you can see a bit of the infill pattern through the walls. Not super
+  distracting, but it's there.
+
+#### White
+
+* Walls are practically translucent, you can almost always see the infill. Do not use for major components.
+* Looks perfectly good for thin things like the Neutrik plates, decorative pieces, that kind of thing.
+
+### Matte
+
+* I don't like the texture as much, but they do produce nice non-primary color colorways, and you don't see the infill.
+* Seems like their plastic treatment leaves some plate residue, so be better about cleaning it or you'll get ghosts.
+
+## Hatchbox PLA
+
+* **Blue:** very blue. Wife likes it.
+* **White:** more opaque than the Bambu PLA mentioned above, makes a pretty decent (still slightly translucent) frame.

src/blown-up-demo.scad

@@ -0,0 +1,27 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <frame-left.scad>
+use <frame-right.scad>
+use <top-panel-left-lever-and-dir_arc-plus-w-30mm.scad>
+use <top-panel-right-sega-2p-plus-one-plus-control-with-mount.scad>
+use <bottom-panel-left.scad>
+use <bottom-panel-right.scad>
+use <misc-decorative-plate-24mm-button.scad>
+use <misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one.scad>
+use <misc-dustwasher-lsx-nobi.scad>
+
+color("#C12E1F") translate([-panel_x/2-25, 0, frame_z/2+75]) top_panel_left_lever_and_dir_arc_w_30mm();
+color("#C12E1F") translate([panel_x/2+25, 0, frame_z/2+75]) top_panel_right_sega_2p_plus_one_plus_control_with_mount();
+color("black") translate([-frame_x/2+5-25, 0, -2.5]) left_frame();
+color("black") translate([frame_x/2+25, 0, -2.5]) right_frame();
+color("#C12E1F") translate([-panel_x/2-25, 0, -5-frame_z/2-75]) bottom_panel_left();
+color("#C12E1F") translate([panel_x/2+25, 0, -5-frame_z/2-75]) bottom_panel_right();
+
+color("black") translate([0, 0, 3+frame_z/2+150]) dir_arc_plus_w_30mm_and_sega_2p_plus_one_decorative_plate();
+color("black") translate([-195, 25, 3+frame_z/2+150]) lsx_nobi_dustwasher();
+color("black") translate([panel_x, 25, 3+frame_z/2+150]) button_24mm_decorative_plate();

src/bottom-panel-concave.scad

@@ -1,29 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-use <bottom-panel.scad>
-
-module bottom_panel_concave() {
-	difference() {
-		bottom_panel();
-		translate([0, 0, top_plate_z/2]) cube([top_plate_x*2/3, top_plate_y*2/3, top_plate_z], center=true);
-	}
-}
-
-bottom_panel_concave();

src/bottom-panel-inset.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 bottom_panel() {
+	difference() {
+		mirror([0, 0, 1]) panel();
+		translate([0, 0, panel_z/2]) cube([panel_x-40, panel_y-40, panel_z], center=true);
+	}
+}
+
+bottom_panel();

src/bottom-panel-overhang-left.scad

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <bottom-panel-solo.scad>
+
+module bottom_panel_left() {
+	difference() {
+		bottom_panel_solo();
+		// chop the right edge off
+		side_chopper();
+	}
+}
+
+bottom_panel_left();

src/bottom-panel-overhang-middle.scad

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <bottom-panel-left.scad>
+use <bottom-panel-right.scad>
+
+module bottom_panel_middle() {
+	intersection() {
+		bottom_panel_left();
+		bottom_panel_right();
+	}
+}
+
+bottom_panel_middle();

src/bottom-panel-overhang-right.scad

@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <bottom-panel-left.scad>
+
+module bottom_panel_right() {
+	rotate([0, 0, 180]) bottom_panel_left();
+}
+
+bottom_panel_right();

src/bottom-panel-overhang-solo.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 bottom_panel_solo() {
+	difference() {
+		rotate([180, 0, 0]) base_panel_with_raised_overhang();
+		rotate([180, 0, 0]) panel_holes();
+	}
+}
+
+bottom_panel_solo();

src/bottom-panel.scad

@@ -1,25 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-
-module bottom_panel() {
-	mirror([0, 0, 1]) topplate();
-}
-
-bottom_panel();

src/components.scad

@@ -1,61 +1,10 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 include <roundedcube.scad>
 
-/* QUASI-CONSTANTS */
-
-// adjustments
-hole_tolerance = 0.15;
-
-// M3
-m3_screw_selftap_radius = 1.3;
-
-// M4
-m4_bolt_radius = 2 + hole_tolerance;
-m4_bolt_countersink_radius = 6.1 + hole_tolerance;
-m4_bolt_hex_exterior_radius = 3.6 + hole_tolerance;
-
-// 24mm button
-small_button_radius = 12 + hole_tolerance;
-
-// 30mm button
-big_button_radius = 15 + hole_tolerance;
-
-// JLF mount dimensions
-lever_mount_x = 53;
-lever_mount_y = 95;
-lever_mount_z = 2;
-
-// case dimensions
-frame_x = 183;
-frame_y = 208;
-frame_z = 45;			// reminder: inside (including mounts) is chopped by top_plate_z for plates
-top_plate_x = 175;
-top_plate_y = 200;
-top_plate_z = 5;
-
-// neutrik D screw holes
-neutrik_d_screw_radius = 1.6 + hole_tolerance;
-neutrik_d_radius = 12 + hole_tolerance;
-
-/* PARTS */
-
 module m4_hole() {
 	cylinder(r=m4_bolt_radius, h=100, $fn=50, center=true);
 }
@@ -64,12 +13,43 @@ module m4_hole_countersink() {
 	cylinder(r1=m4_bolt_radius, r2=m4_bolt_countersink_radius, h=3.2, $fn=50, center=true);
 }
 
-module button_24mm_hole() {
-	cylinder(r=small_button_radius, h=100, $fn=50, center=true);
+module panel_holes() {
+	// holes for mount bolts
+	translate([panel_to_frame_point_x, panel_to_frame_point_y, 0]) m4_hole();
+	translate([panel_to_frame_point_x, -panel_to_frame_point_y, 0]) m4_hole();
+	translate([-panel_to_frame_point_x, panel_to_frame_point_y, 0]) m4_hole();
+	translate([-panel_to_frame_point_x, -panel_to_frame_point_y, 0]) m4_hole();
+	// holes for mount bolt countersinks
+	translate([panel_to_frame_point_x, panel_to_frame_point_y, 2]) m4_hole_countersink();
+	translate([panel_to_frame_point_x, -panel_to_frame_point_y, 2]) m4_hole_countersink();
+	translate([-panel_to_frame_point_x, panel_to_frame_point_y, 2]) m4_hole_countersink();
+	translate([-panel_to_frame_point_x, -panel_to_frame_point_y, 2]) m4_hole_countersink();
 }
 
+// button hole, with extra wide bits for various uses (cutting out space
+// 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, leave 3mm
+	// slagcoin has screw-in nut diameter at 29.5mm, 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=small_button_radius+6, 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);
+}
+
+// button hole, with extra wide bits for various uses (cutting out space
+// 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, 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+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);
 }
 
 module frame_hex_bolt_hole() {
@@ -94,6 +74,44 @@ module neutrik_d_mount() {
 	translate([-9.5, -12, 0]) neutrik_d_screw_hole();
 }
 
+module rocker_20mm_mount() {
+	cylinder(r=10+hole_tolerance, h=5, $fn=50, center=true);
+	cube([2.2, 22, 5], center=true);
+	translate([9.5, 12, 0]) neutrik_d_screw_hole();
+	translate([-9.5, -12, 0]) neutrik_d_screw_hole();
+}
+
+// space for a neutrik D mount or 24mm button - Z is to cut the whole inside without affecting panel lip
+module frame_cutout() {
+	cube([36.5, 8, frame_z-(panel_z*2)], center=true);
+}
+
+// bank of three 24mm buttons, commonly on a frame face
+module aux_control_three_button_cluster() {
+	translate([-40, 0, 0]) button_24mm_hole();
+	translate([0, 0, 0]) button_24mm_hole();
+	translate([40, 0, 0]) button_24mm_hole();
+}
+
+module m2_mount_post() {
+	difference() {
+		cylinder(r=m2_screw_selftap_radius*2.25, h=3, $fn=6, center=true);
+		cylinder(r=m2_screw_selftap_radius, h=3*2, $fn=50, center=true);
+	}
+}
+
+module oled_ssd1306_mount() {
+	translate([11.5, 12, 0]) m2_mount_post();
+	translate([11.5, -12, 0]) m2_mount_post();
+	translate([-11.5, 12, 0]) m2_mount_post();
+	translate([-11.5, -12, 0]) m2_mount_post();
+}
+
+module oled_ssd1306_mount_cutout() {
+	translate([0, 1.9, 0]) cube([25, 14, 5], center=true);
+	translate([0, 0, -1.0]) cube([35, 35, 4], center=true);
+}
+
 module m3_mount_post() {
 	difference() {
 		cylinder(r=m3_screw_selftap_radius*4, h=8, $fn=6, center=true);
@@ -123,7 +141,7 @@ module levermountbase() {
 // should work with JLF, JLW, LS-32, LS-33, LS-40, LS-55, LS-56
 module levermountholes() {
 	// joystick hole
-	cylinder(r=12, h=5.1, $fn=50, center=true);
+	cylinder(r=lever_plate_hole, h=5.1, $fn=50, center=true);
 	// holes for joystick bolts
 	translate([20, 42.5, 0])
 		m4_hole();
@@ -144,38 +162,47 @@ module levermountholes() {
 		m4_hole_countersink();
 }
 
-module base_topplate() {
-	cube([top_plate_x, top_plate_y, top_plate_z], center=true);
+module base_panel() {
+	cube([panel_x, panel_y, panel_z], center=true);
 }
 
-module topplate() {
+module panel() {
 	difference() {
-		base_topplate();
-		// holes for mount bolts
-		translate([77.5, 90, 0])
-			m4_hole();
-		translate([77.5, -90, 0])
-			m4_hole();
-		translate([-77.5, 90, 0])
-			m4_hole();
-		translate([-77.5, -90, 0])
-			m4_hole();
-		// holes for mount bolt countersinks
-		translate([77.5, 90, 2])
-			m4_hole_countersink();
-		translate([77.5, -90, 2])
-			m4_hole_countersink();
-		translate([-77.5, 90, 2])
-			m4_hole_countersink();
-		translate([-77.5, -90, 2])
-			m4_hole_countersink();
+		base_panel();
+		panel_holes();
+	}
+}
+
+module overhang_plate() {
+	roundedcube([overhang_panel_x, overhang_panel_y, panel_z], center=true, radius=1);
+}
+
+// this takes the base_panel and makes it a small frame, putting a larger top plate
+module base_panel_with_raised_overhang() {
+	// make a frame out of the top plate (and keep the main plate on the center plane)
+	translate([0, 0, -5]) difference() {
+		base_panel();
+		cube([panel_x-(panel_support_width*2), panel_y-(panel_support_width*2), panel_z*2], center=true);
+	}
+	translate([panel_to_frame_point_x, panel_to_frame_point_y, -2.5]) resize([0, 0, 10]) frame_mount_column();
+	translate([-(panel_to_frame_point_x), panel_to_frame_point_y, -2.5]) resize([0, 0, 10]) frame_mount_column();
+	translate([panel_to_frame_point_x, -(panel_to_frame_point_y), -2.5]) resize([0, 0, 10]) frame_mount_column();
+	translate([-(panel_to_frame_point_x), -(panel_to_frame_point_y), -2.5]) resize([0, 0, 10]) frame_mount_column();
+	overhang_plate();
+}
+
+module panel_with_raised_overhang() {
+	difference() {
+		base_panel_with_raised_overhang();
+		panel_holes();
 	}
 }
 
 module frame_box() {
 	difference() {
 		roundedcube([frame_x, frame_y, frame_z], center=true, radius=3);
-		cube([frame_x-26, frame_y-26, frame_z+5], center=true);
+		// cut out the middle to make it a box
+		cube([panel_x-(panel_support_width*2), panel_y-(panel_support_width*2), frame_z+5], center=true);
 	}
 }
 
@@ -183,20 +210,21 @@ module frame_mount_column() {
 	cube([20, 20, frame_z], center=true);
 }
 
-module frame_side_chopper() {
-	translate([frame_x/2, 0, 0]) cube([8, 2*(frame_y+top_plate_y), 2*(frame_z+top_plate_z)], center=true);
+module side_chopper() {
+	translate([(frame_x-frame_wall)/2+panel_overhang_amount, 0, 0])
+		cube([frame_wall+panel_overhang_amount*2, overhang_panel_y, frame_z], center=true);
 }
 
 module frame_connection_holes() {
-	translate([frame_x/2, (frame_y/4)+10, (frame_z/4)]) rotate([0, 90, 0]) m4_hole();
-	translate([frame_x/2, (frame_y/4)+10, -(frame_z/4)]) rotate([0, 90, 0]) m4_hole();
-	translate([frame_x/2, (frame_y/4)-10, (frame_z/4)]) rotate([0, 90, 0]) m4_hole();
-	translate([frame_x/2, (frame_y/4)-10, -(frame_z/4)]) rotate([0, 90, 0]) m4_hole();
+	translate([frame_x/2, (frame_y/4)+15, (frame_z/4)]) rotate([0, 90, 0]) m4_hole();
+	translate([frame_x/2, (frame_y/4)+15, -(frame_z/4)]) rotate([0, 90, 0]) m4_hole();
+	translate([frame_x/2, (frame_y/4)-15, (frame_z/4)]) rotate([0, 90, 0]) m4_hole();
+	translate([frame_x/2, (frame_y/4)-15, -(frame_z/4)]) rotate([0, 90, 0]) m4_hole();
 
-	translate([frame_x/2, -((frame_y/4)+10), (frame_z/4)]) rotate([0, 90, 0]) m4_hole();
-	translate([frame_x/2, -((frame_y/4)+10), -(frame_z/4)]) rotate([0, 90, 0]) m4_hole();
-	translate([frame_x/2, -((frame_y/4)-10), (frame_z/4)]) rotate([0, 90, 0]) m4_hole();
-	translate([frame_x/2, -((frame_y/4)-10), -(frame_z/4)]) rotate([0, 90, 0]) m4_hole();
+	translate([frame_x/2, -((frame_y/4)+15), (frame_z/4)]) rotate([0, 90, 0]) m4_hole();
+	translate([frame_x/2, -((frame_y/4)+15), -(frame_z/4)]) rotate([0, 90, 0]) m4_hole();
+	translate([frame_x/2, -((frame_y/4)-15), (frame_z/4)]) rotate([0, 90, 0]) m4_hole();
+	translate([frame_x/2, -((frame_y/4)-15), -(frame_z/4)]) rotate([0, 90, 0]) m4_hole();
 }
 
 module frame_cable_routing_hole() {
@@ -205,56 +233,91 @@ module frame_cable_routing_hole() {
 
 module base_frame() {
 	frame_box();
-	translate([(top_plate_x/2)-10, (top_plate_y/2)-10, 0])
-		frame_mount_column();
-	translate([-((top_plate_x/2)-10), (top_plate_y/2)-10, 0])
-		frame_mount_column();
-	translate([(top_plate_x/2)-10, -((top_plate_y/2)-10), 0])
-		frame_mount_column();
-	translate([-((top_plate_x/2)-10), -((top_plate_y/2)-10), 0])
-		frame_mount_column();
+	translate([panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_mount_column();
+	translate([-panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_mount_column();
+	translate([panel_to_frame_point_x, -(panel_to_frame_point_y), 0]) frame_mount_column();
+	translate([-panel_to_frame_point_x, -(panel_to_frame_point_y), 0]) frame_mount_column();
 }
 
 module frame() {
 	difference() {
 		base_frame();
-		translate([0, 0, frame_z/2]) scale([1, 1, 2]) base_topplate();
-		translate([(top_plate_x/2)-10, (top_plate_y/2)-10, 0])
-			frame_hex_bolt_hole();
-		translate([-((top_plate_x/2)-10), (top_plate_y/2)-10, 0])
-			frame_hex_bolt_hole();
-		translate([(top_plate_x/2)-10, -((top_plate_y/2)-10), 0])
-			frame_hex_bolt_hole();
-		translate([-((top_plate_x/2)-10), -((top_plate_y/2)-10), 0])
-			frame_hex_bolt_hole();
-
-		// thin up the mount point to accommodate snap-ins, ethercon adapter
-		translate([0, 10, 10]) cube([120, 180, 60], center=true);
+		translate([0, 0, frame_z/2]) scale([1, 1, 2]) base_panel();
+		translate([0, 0, -frame_z/2]) scale([1, 1, 2]) base_panel();
+		translate([panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
+		translate([-panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
+		translate([panel_to_frame_point_x, -panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
+		translate([-panel_to_frame_point_x, -panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
 	}
 }
 
 /* LAYOUTS */
 
-module dir_arc_30mm_button_l() {
-	translate([68, 132, 0]) button_30mm_hole();
+// Directional Arc (both hands)
+
+module dir_arc_24mm_directionals() {
+	button_24mm_hole();
+	translate([29.5, 0, 0]) button_24mm_hole();
+	translate([29.5+26.3, -12.9, 0]) button_24mm_hole();
+	translate([29.5+26.3+15.5, -65.2, 0]) button_30mm_hole();
+}
+
+module dir_arc_24mm_6_button() {
+	dir_arc_24mm_directionals();
+	translate([29.5+26.3+27.8, 0, 0]) button_24mm_hole();
+	translate([29.5+26.3+27.8+26.9, 10.9, 0]) button_24mm_hole();
+	translate([29.5+26.3+27.8+26.9+29.6, 10.9, 0]) button_24mm_hole();
+	translate([29.5+26.3+15.5+9.7, -29.4, 0]) button_24mm_hole();
+	translate([29.5+26.3+27.8+26.9-1.7, 10.9-30.1, 0]) button_24mm_hole();
+	translate([29.5+26.3+27.8+26.9+29.6-0.2, 10.9-30.1, 0]) button_24mm_hole();
+}
+
+module dir_arc_24mm_8_button() {
+	dir_arc_24mm_6_button();
+	translate([29.5+26.3+27.8+26.9+29.6+29.5, 7.1, 0]) button_24mm_hole();
+	translate([29.5+26.3+27.8+26.9+29.6+29.5-0.3, -23.9, 0]) button_24mm_hole();
+}
+
+// 6 button plus the normal fourth column for 8 button actually on a third row
+module dir_arc_24mm_8_button_compressed() {
+	dir_arc_24mm_6_button();
+	translate([29.5+26.3+27.8+2.6, 29.4, 0]) button_24mm_hole();
+	translate([29.5+26.3+27.8+26.9+2.6, 40.3, 0]) button_24mm_hole();
+}
+
+module dir_arc_plus_w_24mm_8_button() {
+	dir_arc_24mm_8_button();
+	translate([36, 28, 0]) button_24mm_hole();
+}
+
+// Directional Arc (left hand)
+
+module dir_arc_30mm_thumb_button() {
+	// just my guesstimate on this one, but note that this is the same position as sega 2p (just mirrored)
+	translate([(panel_x/2)-28.06, (-panel_y/2)+62, 0]) button_30mm_hole();
+}
+
+module dir_arc_30mm_finger_buttons() {
+	translate([0, 57.2, 0]) dir_arc_30mm_thumb_button();
+	translate([-33.8, 57.2+12.9, 0]) dir_arc_30mm_thumb_button();
+	translate([-33.8-34.8, 57.2+12.9, 0]) dir_arc_30mm_thumb_button();
 }
 
 module dir_arc_w_30mm() {
-	dir_arc_30mm_button_l();
-	translate([35, 0, 0]) dir_arc_30mm_button_l();
-	translate([35+33.5, -12.9, 0]) dir_arc_30mm_button_l();
-	translate([35+7, 34.5, 0]) dir_arc_30mm_button_l();
-	// just my guesstimate on this one, but note that this is the same position as sega 2p (just mirrored)
-	translate([top_plate_x-33.06, 145-19-9-11-19-9-11, 0]) button_30mm_hole();
+	dir_arc_30mm_thumb_button();
+	dir_arc_30mm_finger_buttons();
+	translate([-26.8, 57.2+12.9+34.5, 0]) dir_arc_30mm_thumb_button();
 }
 
 module dir_arc_w_30mm_plus_one() {
 	dir_arc_w_30mm();
-	translate([-33.5, -12.9, 0]) dir_arc_30mm_button_l();
+	translate([-33.8-34.8-33.8, 57.2, 0]) dir_arc_30mm_thumb_button();
 }
 
+// Namco Noir (right hand)
+
 module noir_button_p1() {
-	translate([40, 145, 0]) button_30mm_hole();
+	translate([-panel_x/2, -panel_y/2, 0]) translate([35, 140, 0]) button_30mm_hole();
 }
 
 module noir_plus_one() {
@@ -272,21 +335,30 @@ module noir_plus_one() {
 	translate([-3.47-3.47, -78, 0]) noir_button_p1();
 }
 
+// Sega Astro City 2P (right hand)
+
 module sega_2p_p1() {
-	translate([33.06, 145, 0]) button_30mm_hole();
+	translate([-panel_x/2, -panel_y/2, 0]) translate([28.06, 140, 0]) button_30mm_hole();
 }
 
-module sega_2p_plus_one() {
+module sega_2p_6_button() {
 	// via slagcoin
 	sega_2p_p1();
 	translate([30.5, 11+9, 0]) sega_2p_p1();
 	translate([30.5+36, 11+9, 0]) sega_2p_p1();
-	translate([30.5+36+36, 11, 0]) sega_2p_p1();
 	translate([0, -19-9-11, 0]) sega_2p_p1();
 	translate([30.5, -19, 0]) sega_2p_p1();
 	translate([30.5+36, -19, 0]) sega_2p_p1();
-	translate([30.5+36+36, -19-9, 0]) sega_2p_p1();
+}
 
-	// just my guesstimate on this one, but note that this is the same position as sega 2p
+module sega_2p() {
+	sega_2p_6_button();
+	translate([30.5+36+36, 11, 0]) sega_2p_p1();
+	translate([30.5+36+36, -19-9, 0]) sega_2p_p1();
+}
+
+module sega_2p_plus_one() {
+	sega_2p();
+	// just my guesstimate on this one
 	translate([0, -19-9-11-19-9-11, 0]) sega_2p_p1();
 }

src/frame-left.scad

@@ -1,28 +1,16 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+include <parameters.scad>
 include <components.scad>
 
 module base_left_frame() {
 	difference() {
 		frame();
 		// chop the right edge off
-		frame_side_chopper();
+		side_chopper();
 	}
 }
 
@@ -30,15 +18,22 @@ module left_frame() {
 	difference() {
 		base_left_frame();
 		// connection holes to other frames
-		translate([0, 0, -top_plate_z/2]) frame_connection_holes();
+		frame_connection_holes();
 
 		// cable routing hole
-		translate([0, 0, -top_plate_z/2]) frame_cable_routing_hole();
+		frame_cable_routing_hole();
 
 		// aux button holes
-		translate([0, 100, 0]) rotate([90, 0, 0]) button_24mm_hole();
-		translate([-40, 100, 0]) rotate([90, 0, 0]) button_24mm_hole();
-		translate([40, 100, 0]) rotate([90, 0, 0]) button_24mm_hole();
+		translate([-30, 101.5, 0]) rotate([270, 0, 0]) aux_control_three_button_cluster();
+		translate([-30, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([-70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+
+		// neutrix button hole
+		translate([frame_center_to_neutrik, (frame_y/2)-neutrik_panel_thickness, 0])
+			rotate([90, 0, 0]) neutrik_d_mount();
+		translate([frame_center_to_neutrik, (frame_y/2)-neutrik_panel_thickness-4, 0])
+			frame_cutout();
 	}
 }
 

src/frame-middle.scad

@@ -1,29 +1,17 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+include <parameters.scad>
 include <components.scad>
 
 module base_middle_frame() {
 	difference() {
 		frame();
 		// chop the left and right edge off
-		frame_side_chopper();
-		mirror([1, 0, 0]) frame_side_chopper();
+		side_chopper();
+		mirror([1, 0, 0]) side_chopper();
 	}
 }
 
@@ -31,17 +19,20 @@ module middle_frame() {
 	difference() {
 		base_middle_frame();
 		// connection holes to other frames
-		translate([0, 0, -top_plate_z/2]) frame_connection_holes();
-		translate([0, 0, -top_plate_z/2]) mirror([1, 0, 0]) frame_connection_holes();
+		frame_connection_holes();
+		mirror([1, 0, 0]) frame_connection_holes();
 
 		// cable routing holes
-		translate([0, 0, -top_plate_z/2]) frame_cable_routing_hole();
-		translate([0, 0, -top_plate_z/2]) mirror([1, 0, 0]) frame_cable_routing_hole();
+		frame_cable_routing_hole();
+		mirror([1, 0, 0]) frame_cable_routing_hole();
 
 		// neutrik mounts for connector, switches
-		translate([0, 100, 0]) rotate([90, 0, 0]) neutrik_d_mount();
-		translate([-40, 100, 0]) rotate([90, 0, 0]) neutrik_d_mount();
-		translate([40, 100, 0]) rotate([90, 0, 0]) neutrik_d_mount();
+		translate([0, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
+		translate([0, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([-40, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
+		translate([-40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([40, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
+		translate([40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 	}
 }
 

src/frame-right.scad

@@ -1,26 +1,40 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+include <parameters.scad>
 include <components.scad>
-use <frame-left.scad>
+
+module base_right_frame() {
+	difference() {
+		frame();
+		// chop the left edge off
+		mirror([1, 0, 0]) side_chopper();
+	}
+}
 
 module right_frame() {
-	mirror([1, 0, 0]) left_frame();
+	difference() {
+		base_right_frame();
+		// connection holes to other frames
+		mirror([1, 0, 0]) frame_connection_holes();
+
+		// cable routing hole
+		mirror([1, 0, 0]) frame_cable_routing_hole();
+
+		// aux button holes
+		translate([30, 101.5, 0]) rotate([270, 0, 0]) aux_control_three_button_cluster();
+		translate([30, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([-10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+
+		// neutrix button hole
+		translate([-frame_center_to_neutrik, (frame_y/2)-neutrik_panel_thickness, 0])
+			rotate([90, 0, 0]) neutrik_d_mount();
+		translate([-frame_center_to_neutrik, (frame_y/2)-neutrik_panel_thickness-4, 0])
+			frame_cutout();
+	}
 }
 
 right_frame();

src/frame-solo.scad

@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module solo_frame() {
+	difference() {
+		frame();
+
+		// neutrik mounts for connector, switches
+		translate([0, (frame_y/2)-2.5, 0]) rotate([90, 0, 0]) neutrik_d_mount();
+		translate([0, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([-40, (frame_y/2)-2.5, 0]) rotate([90, 0, 0]) neutrik_d_mount();
+		translate([-40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		translate([40, (frame_y/2)-2.5, 0]) rotate([90, 0, 0]) neutrik_d_mount();
+		translate([40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+
+		// aux button holes
+		translate([-frame_x/2+2.5, 0, 0]) rotate([90, 0, 270]) aux_control_three_button_cluster();
+		translate([(frame_x/2)-neutrik_panel_thickness-4, 0, 0]) rotate([0, 0, 90]) frame_cutout();
+		translate([(frame_x/2)-neutrik_panel_thickness-4, -40, 0]) rotate([0, 0, 90]) frame_cutout();
+		translate([(frame_x/2)-neutrik_panel_thickness-4, 40, 0]) rotate([0, 0, 90]) frame_cutout();
+
+		translate([frame_x/2+2.5, 0, 0]) rotate([90, 0, 270]) aux_control_three_button_cluster();
+		translate([-(frame_x/2)+neutrik_panel_thickness+4, 0, 0]) rotate([0, 0, 90]) frame_cutout();
+		translate([-(frame_x/2)+neutrik_panel_thickness+4, -40, 0]) rotate([0, 0, 90]) frame_cutout();
+		translate([-(frame_x/2)+neutrik_panel_thickness+4, 40, 0]) rotate([0, 0, 90]) frame_cutout();
+	}
+}
+
+solo_frame();

src/misc-decorative-plate-24mm-button.scad

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module button_24mm_decorative_plate() {
+	difference() {
+		// get a 2mm slice of the bigger button cylinders
+		translate([0, 0, -55]) button_24mm_hole();
+		translate([0, 0, -100]) cube([500, 500, 198], center=true);
+		translate([0, 0, 100]) cube([500, 500, 198], center=true);
+		// cut out the normal holes
+		translate([0, 0, -1]) button_24mm_hole();
+	}
+}
+
+button_24mm_decorative_plate();

src/misc-decorative-plate-aux-connectors-neutrik-and-rocker-cluster.scad

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <misc-neutrik-d-plate.scad>
+
+module aux_connectors_two_neutrik_cluster_decorative_plate() {
+	difference() {
+		hull() {
+			translate([-50, 0, 0]) neutrik_d_plate();
+			translate([50, 0, 0]) neutrik_d_plate();
+		}
+		translate([(frame_x/2)-frame_center_to_neutrik-frame_wall, 0, 0]) rocker_20mm_mount();
+		translate([-((frame_x/2)-frame_center_to_neutrik-frame_wall), 0, 0]) neutrik_d_mount();
+	}
+}
+
+aux_connectors_two_neutrik_cluster_decorative_plate();

src/misc-decorative-plate-aux-control-three-button-cluster.scad

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <misc-neutrik-d-plate.scad>
+
+module aux_control_three_button_cluster_decorative_plate() {
+	difference() {
+		hull() {
+			translate([-50, 0, 0]) neutrik_d_plate();
+			translate([50, 0, 0]) neutrik_d_plate();
+		}
+		translate([0, 0, -10]) aux_control_three_button_cluster();
+	}
+}
+
+aux_control_three_button_cluster_decorative_plate();

src/misc-decorative-plate-dir_arc-plus-w-24mm-8-button.scad

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module dir_arc_plus_w_24mm_8_button_decorative_plate() {
+	difference() {
+		// get a 2mm slice of the bigger button cylinders
+		translate([0, 0, -55]) dir_arc_plus_w_24mm_8_button();
+		translate([0, 0, -100]) cube([500, 500, 198], center=true);
+		translate([0, 0, 100]) cube([500, 500, 198], center=true);
+		// cut out the normal holes
+		translate([0, 0, -1]) dir_arc_plus_w_24mm_8_button();
+	}
+}
+
+dir_arc_plus_w_24mm_8_button_decorative_plate();

src/misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one-plates.scad

@@ -0,0 +1,50 @@
+/*
+ * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+decorative_radius_scale = 1.5;
+jumbo_decorative_radius_scale = 0;
+include <components.scad>
+
+module dir_arc_plus_w_30mm_and_sega_2p_plus_one_decorative_plate_of_plates() {
+	difference() {
+		// get a 2mm slice of the bigger button cylinders
+		union() {
+			translate([-panel_x/2, 0, -25]) {
+				hull() union() {
+					dir_arc_30mm_finger_buttons();
+					translate([-26.8, 57.2+12.9+34.5, 0]) dir_arc_30mm_thumb_button();
+				}
+			}
+			translate([panel_x/2, 0, -25]) {
+				hull() sega_2p();
+			}
+			hull() {
+				translate([-panel_x/2, 0, -25]) dir_arc_30mm_thumb_button();
+				translate([panel_x/2, -19-9-11-19-9-11, -25]) sega_2p_p1();
+			}
+			difference() {
+				translate([-60, -8, 0]) cube(60, center=true);
+				translate([-98.35, -39.25, 0]) cylinder(h=50, r=48, $fn=50, center=true);
+			}
+			difference() {
+				translate([43.35, -10.30, 0]) cube(50, center=true);
+				translate([68.35, -35.30, 0]) cylinder(h=50, r=18, $fn=50, center=true);
+			}
+			difference() {
+				translate([-10, 55, 0]) cube(43, center=true);
+				translate([-5.15, 76.25, 0]) cylinder(h=50, r=27, $fn=50, center=true);
+			}
+			translate([-7, 0, 0]) cube(80, center=true);
+		}
+		translate([0, 0, -100]) cube([500, 500, 198], center=true);
+		translate([0, 0, 100]) cube([500, 500, 198], center=true);
+		// cut out the normal holes
+		translate([-panel_x/2, 0, -1]) dir_arc_w_30mm();
+		translate([panel_x/2, 0, -1]) sega_2p_plus_one();
+	}
+}
+
+dir_arc_plus_w_30mm_and_sega_2p_plus_one_decorative_plate_of_plates();

src/misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one.scad

@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module dir_arc_plus_w_30mm_and_sega_2p_plus_one_decorative_plate() {
+	difference() {
+		// get a 2mm slice of the bigger button cylinders
+		union() {
+			translate([-panel_x/2, 0, -65]) dir_arc_w_30mm();
+			translate([panel_x/2, 0, -65]) sega_2p_plus_one();
+		}
+		translate([0, 0, -100]) cube([500, 500, 198], center=true);
+		translate([0, 0, 100]) cube([500, 500, 198], center=true);
+		// cut out the normal holes
+		translate([-panel_x/2, 0, -1]) dir_arc_w_30mm();
+		translate([panel_x/2, 0, -1]) sega_2p_plus_one();
+	}
+}
+
+dir_arc_plus_w_30mm_and_sega_2p_plus_one_decorative_plate();

src/misc-decorative-plate-dir_arc-plus-w-30mm.scad

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module dir_arc_plus_w_30mm_decorative_plate() {
+	difference() {
+		// get a 2mm slice of the bigger button cylinders
+		translate([0, 0, -55]) dir_arc_w_30mm();
+		translate([0, 0, -100]) cube([500, 500, 198], center=true);
+		translate([0, 0, 100]) cube([500, 500, 198], center=true);
+		// cut out the normal holes
+		translate([0, 0, -1]) dir_arc_w_30mm();
+	}
+}
+
+dir_arc_plus_w_30mm_decorative_plate();

src/misc-decorative-plate-sega-2p-6-button.scad

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module sega_2p_6_button_decorative_plate() {
+	difference() {
+		// get a 2mm slice of the bigger button cylinders
+		translate([0, 0, -55]) sega_2p_6_button();
+		translate([0, 0, -100]) cube([500, 500, 198], center=true);
+		translate([0, 0, 100]) cube([500, 500, 198], center=true);
+		// cut out the normal holes
+		translate([0, 0, -1]) sega_2p_6_button();
+	}
+}
+
+sega_2p_6_button_decorative_plate();

src/misc-decorative-plate-sega-2p-plus-one.scad

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module sega_2p_plus_one_decorative_plate() {
+	difference() {
+		// get a 2mm slice of the bigger button cylinders
+		translate([0, 0, -55]) sega_2p_plus_one();
+		translate([0, 0, -100]) cube([500, 500, 198], center=true);
+		translate([0, 0, 100]) cube([500, 500, 198], center=true);
+		// cut out the normal holes
+		translate([0, 0, -1]) sega_2p_plus_one();
+	}
+}
+
+sega_2p_plus_one_decorative_plate();

src/misc-dustwasher-jlf.scad

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module jlf_dustwasher() {
+	difference() {
+		cylinder(r=lever_plate_hole*decorative_radius_scale, h=2, $fn=50, 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=50, center=true);
+	}
+}
+
+jlf_dustwasher();

src/misc-dustwasher-lsx-nobi.scad

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module lsx_nobi_dustwasher() {
+	difference() {
+		cylinder(r=lever_plate_hole*decorative_radius_scale, h=2, $fn=50, 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=50, center=true);
+	}
+}
+
+lsx_nobi_dustwasher();

src/misc-neutrik-d-plate-24mm-hole.scad

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <misc-neutrik-d-plate.scad>
+
+module neutrik_d_plate_24mm() {
+	difference() {
+		neutrik_d_plate();
+		neutrik_d_mount();
+	}
+}
+
+neutrik_d_plate_24mm();

src/misc-neutrik-d-plate.scad

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module neutrik_d_plate() {
+	difference() {
+		cube([30, 35, 2], center=true);
+		translate([9.5, 12, 0]) neutrik_d_screw_hole();
+		translate([-9.5, -12, 0]) neutrik_d_screw_hole();
+	}
+}
+
+neutrik_d_plate();

src/misc-rocker-20mm-plate.scad

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <misc-neutrik-d-plate.scad>
+
+module rocker_plate_20mm() {
+	difference() {
+		neutrik_d_plate();
+		rocker_20mm_mount();
+	}
+}
+
+rocker_plate_20mm();

src/misc-spdt-neutrik-d-plate.scad

@@ -1,31 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-
-module spdt_neutrik_d_plate() {
-	difference() {
-		cube([30, 35, 2], center=true);
-		translate([9.5, 12, 0]) neutrik_d_screw_hole();
-		translate([-9.5, -12, 0]) neutrik_d_screw_hole();
-		cylinder(r=10+hole_tolerance, h=5, $fn=50, center=true);
-		cube([2.2, 22, 5], center=true);
-	}
-}
-
-spdt_neutrik_d_plate();

src/parameters.scad

@@ -0,0 +1,71 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+// adjustments
+hole_tolerance = 0.15;
+
+// M2
+m2_screw_selftap_radius = 0.95;
+
+// M3
+m3_screw_selftap_radius = 1.3;
+
+// M4
+m4_bolt_radius = 2 + hole_tolerance;
+m4_bolt_countersink_radius = 6.1 + hole_tolerance;
+m4_bolt_hex_exterior_radius = 3.6 + hole_tolerance;
+
+// 24mm button
+small_button_radius = 12 + hole_tolerance;
+
+// 30mm button
+big_button_radius = 15 + hole_tolerance;
+
+// JLF mount dimensions
+lever_mount_x = 53;
+lever_mount_y = 95;
+lever_mount_z = 2;
+
+// standard lever hole
+lever_plate_hole = 12;
+
+// case dimensions
+// base frame box. reminder: top of inside (including mounts) is chopped by panel_z for plates
+frame_x = 233;
+frame_y = 208;
+frame_z = 55;
+
+frame_center_to_neutrik = 70;
+
+// depth of the "lip" of the frame that the top plate sets into/supports the overhang
+frame_wall = 4;
+
+// per neutrik (mm)
+neutrik_panel_thickness = 3;
+
+// top plate, which can either be the whole plate ("inset") or the mounting frame for a plate that overhangs
+panel_x = frame_x - (frame_wall * 2);
+panel_y = frame_y - (frame_wall * 2);
+panel_z = 5;
+
+// how much the top plate x/y is expanded to overhang the frame
+// note that this is relative to the top plate (so the wall is added back)
+panel_overhang_amount = 8.5;
+overhang_panel_x = panel_x + (frame_wall * 2) + (panel_overhang_amount * 2);
+overhang_panel_y = panel_y + (frame_wall * 2) + (panel_overhang_amount * 2);
+
+panel_to_frame_point_x = (panel_x/2)-10;
+panel_to_frame_point_y = (panel_y/2)-10;
+
+// frame interior that supports the top plates
+panel_support_width = 5;
+
+// neutrik D screw holes
+neutrik_d_screw_radius = 1.6 + hole_tolerance;
+neutrik_d_radius = 12 + hole_tolerance;
+
+// additional button radius for decorative panels, etc.
+decorative_radius_scale = 1.75;
+jumbo_decorative_radius_scale = 2;

src/top-panel-dir_arc-plus-w-30mm-plus-one-with-mount.scad

@@ -1,27 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-use <top-panel-dir_arc-plus-w-30mm-plus-one.scad>
-
-module dir_arc_w_30mm_plus_one_panel_with_mount() {
-	dir_arc_w_30mm_plus_one_panel();
-	translate([65, 55, -(top_plate_z/2) - 3]) pcb_mount();
-}
-
-dir_arc_w_30mm_plus_one_panel_with_mount();

src/top-panel-dir_arc-plus-w-30mm-plus-one.scad

@@ -1,28 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-
-module dir_arc_w_30mm_plus_one_panel() {
-	difference() {
-		translate([top_plate_x/2, top_plate_y/2, 0]) topplate();
-		dir_arc_w_30mm_plus_one();
-	}
-}
-
-dir_arc_w_30mm_plus_one_panel();

src/top-panel-inset-dir_arc-plus-w-30mm-plus-one-with-mount.scad

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <top-panel-inset-dir_arc-plus-w-30mm-plus-one.scad>
+
+module dir_arc_w_30mm_plus_one_panel_with_mount() {
+	dir_arc_w_30mm_plus_one_panel();
+	translate([-15, -40, -(panel_z/2) - 3]) rotate([0, 0, -15]) pcb_mount();
+}
+
+dir_arc_w_30mm_plus_one_panel_with_mount();

src/top-panel-inset-dir_arc-plus-w-30mm-plus-one.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 dir_arc_w_30mm_plus_one_panel() {
+	difference() {
+		panel();
+		dir_arc_w_30mm_plus_one();
+	}
+}
+
+dir_arc_w_30mm_plus_one_panel();

src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+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();
+		}
+		dir_arc_w_30mm();
+		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountholes();
+	}
+}
+
+top_panel_inset_lever_and_dir_arc_w_30mm();

src/top-panel-inset-lever-with-mount.scad

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <top-panel-inset-lever.scad>
+
+module lever_panel_with_mount() {
+	lever_panel();
+	translate([0, -panel_y/2+25, -(panel_z/2) - 3]) pcb_mount();
+}
+
+lever_panel_with_mount();

src/top-panel-inset-lever.scad

@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+// combine the lever mount and generic plate, with mounting holes
+module lever_panel() {
+	difference() {
+		// base plate
+		union() {
+			translate([0,-20,0]) panel();
+			translate([0, 0, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
+		}
+		// holes to mount the lever
+		levermountholes();
+	}
+}
+
+lever_panel();

src/top-panel-inset-namco-noir-plus-one.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 namco_noir_plus_one_panel() {
+	difference() {
+		panel();
+		noir_plus_one();
+	}
+}
+
+namco_noir_plus_one_panel();

src/top-panel-inset-namco-noir-plus-two.scad

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module namco_noir_plus_two_panel() {
+	difference() {
+		panel();
+		noir_plus_one();
+		translate([32.94-3.47-3.47, -78+7.37+4.49, 0]) noir_button_p1();
+	}
+}
+
+namco_noir_plus_two_panel();

src/top-panel-inset-sega-2p-plus-one-plus-control-with-mount.scad

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <top-panel-inset-sega-2p-plus-one-plus-control.scad>
+
+module top_panel_inset_sega_2p_plus_one_plus_control_with_mount() {
+	top_panel_inset_sega_2p_plus_one_plus_control();
+	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
+}
+
+top_panel_inset_sega_2p_plus_one_plus_control_with_mount();

src/top-panel-inset-sega-2p-plus-one-plus-control.scad

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module top_panel_inset_sega_2p_plus_one_plus_control() {
+	difference() {
+		panel();
+		sega_2p_plus_one();
+		rotate([0, 0, 180]) side_chopper();
+		translate([89, 30, 0]) button_24mm_hole();
+	}
+}
+
+top_panel_inset_sega_2p_plus_one_plus_control();

src/top-panel-inset-sega-2p-plus-one.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 sega_2p_plus_one_panel() {
+	difference() {
+		panel();
+		sega_2p_plus_one();
+	}
+}
+
+sega_2p_plus_one_panel();

src/top-panel-left-lever.scad

@@ -1,40 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-
-// combine the lever mount and generic plate, with mounting holes
-module left_lever_panel() {
-	difference() {
-		// base plate
-		union() {
-			translate([20,-20,0])
-				topplate();
-			translate([0, 0, -((top_plate_z/2)+(lever_mount_z/2))]) levermountbase();
-		}
-		// holes to mount the lever
-		levermountholes();
-	}
-}
-
-module left_lever_panel_with_mount() {
-	left_lever_panel();
-	translate([0, -top_plate_y/2+25, -(top_plate_z/2) - 3]) pcb_mount();
-}
-
-left_lever_panel_with_mount();

src/top-panel-lever-with-mount.scad

@@ -1,27 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-use <top-panel-lever.scad>
-
-module lever_panel_with_mount() {
-	lever_panel();
-	translate([0, -top_plate_y/2+25, -(top_plate_z/2) - 3]) pcb_mount();
-}
-
-lever_panel_with_mount();

src/top-panel-lever.scad

@@ -1,36 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-
-// combine the lever mount and generic plate, with mounting holes
-module lever_panel() {
-	difference() {
-		// base plate
-		union() {
-			translate([0,-20,0])
-				topplate();
-			translate([0, 0, -((top_plate_z/2)+(lever_mount_z/2))])
-				levermountbase();
-		}
-		// holes to mount the lever
-		levermountholes();
-	}
-}
-
-lever_panel();

src/top-panel-namco-noir-plus-one.scad

@@ -1,28 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-
-module namco_noir_plus_one_panel() {
-	difference() {
-		translate([top_plate_x/2, top_plate_y/2, 0]) topplate();
-		noir_plus_one();
-	}
-}
-
-namco_noir_plus_one_panel();

src/top-panel-namco-noir-plus-two.scad

@@ -1,29 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-
-module namco_noir_plus_two_panel() {
-	difference() {
-		translate([top_plate_x/2, top_plate_y/2, 0]) topplate();
-		noir_plus_one();
-		translate([32.94-3.47-3.47, -78+7.37+4.49, 0]) noir_button_p1();
-	}
-}
-
-namco_noir_plus_two_panel();

src/top-panel-overhang-left-lever-and-dir_arc-plus-w-30mm.scad

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+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();
+		}
+		dir_arc_w_30mm();
+		side_chopper();
+		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountholes();
+	}
+}
+
+top_panel_left_lever_and_dir_arc_w_30mm();

src/top-panel-overhang-left-lever.scad

@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+// combine the lever mount and generic plate, with mounting holes
+module top_panel_left_lever() {
+	difference() {
+		// base plate
+		union() {
+			translate([0,-20,0]) panel_with_raised_overhang();
+			translate([0, 0, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
+		}
+		// holes to mount the lever
+		levermountholes();
+		side_chopper();
+	}
+}
+
+top_panel_left_lever();

src/top-panel-overhang-middle-dir_arc-plus-w-30mm-with-mount.scad

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <top-panel-middle-dir_arc-plus-w-30mm.scad>
+
+module top_panel_middle_dir_arc_w_30mm_with_mount() {
+	top_panel_middle_dir_arc_w_30mm();
+	translate([-15, -40, -(panel_z/2) - 3]) rotate([0, 0, -45]) pcb_mount();
+}
+
+top_panel_middle_dir_arc_w_30mm_with_mount();

src/top-panel-overhang-middle-dir_arc-plus-w-30mm.scad

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module top_panel_middle_dir_arc_w_30mm() {
+	difference() {
+		panel_with_raised_overhang();
+		dir_arc_w_30mm();
+		rotate([0, 0, 180]) side_chopper();
+		side_chopper();
+	}
+}
+
+top_panel_middle_dir_arc_w_30mm();

src/top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount-with-oled.scad

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <top-panel-right-sega-2p-plus-one-plus-control-with-mount.scad>
+
+module top_panel_right_sega_2p_plus_one_plus_control_with_mount_with_oled() {
+	difference() {
+		top_panel_right_sega_2p_plus_one_plus_control_with_mount();
+		translate([75, 77.5, 0]) oled_ssd1306_mount_cutout();
+	}
+	translate([75, 77.5, 0.5]) oled_ssd1306_mount();
+}
+
+top_panel_right_sega_2p_plus_one_plus_control_with_mount_with_oled();

src/top-panel-overhang-right-sega-2p-plus-one-plus-control-with-mount.scad

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <top-panel-right-sega-2p-plus-one-plus-control.scad>
+
+module top_panel_right_sega_2p_plus_one_plus_control_with_mount() {
+	top_panel_right_sega_2p_plus_one_plus_control();
+	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
+}
+
+top_panel_right_sega_2p_plus_one_plus_control_with_mount();

src/top-panel-overhang-right-sega-2p-plus-one-plus-control.scad

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module top_panel_right_sega_2p_plus_one_plus_control() {
+	difference() {
+		panel_with_raised_overhang();
+		sega_2p_plus_one();
+		rotate([0, 0, 180]) side_chopper();
+		translate([89, 30, 0]) button_24mm_hole();
+	}
+}
+
+top_panel_right_sega_2p_plus_one_plus_control();

src/top-panel-overhang-right-sega-2p-plus-one-with-mount.scad

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <top-panel-right-sega-2p-plus-one.scad>
+
+module top_panel_right_sega_2p_plus_one_with_mount() {
+	top_panel_right_sega_2p_plus_one();
+	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
+}
+
+top_panel_right_sega_2p_plus_one_with_mount();

src/top-panel-overhang-right-sega-2p-plus-one.scad

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module top_panel_right_sega_2p_plus_one() {
+	difference() {
+		panel_with_raised_overhang();
+		sega_2p_plus_one();
+		rotate([0, 0, 180]) side_chopper();
+	}
+}
+
+top_panel_right_sega_2p_plus_one();

src/top-panel-overhang-solo-dir_arc-24mm-6-button.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 dir_arc_24mm_6_button_panel() {
+	difference() {
+		panel_with_raised_overhang();
+		translate([-71.5, -panel_y/2+122.5, 0]) dir_arc_24mm_6_button();
+	}
+}
+
+dir_arc_24mm_6_button_panel();

src/top-panel-overhang-solo-dir_arc-plus-w-24mm-8-button.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 dir_arc_plus_w_24mm_8_button_panel() {
+	difference() {
+		panel_with_raised_overhang();
+		translate([-80.5, panel_y/6, 0]) dir_arc_plus_w_24mm_8_button();
+	}
+}
+
+dir_arc_plus_w_24mm_8_button_panel();

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

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: © 2023 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+
+module top_panel_solo_lever_and_sega_2p_6_button() {
+	difference() {
+		// base plate
+		union() {
+			panel_with_raised_overhang();
+			translate([-60, 18, -((panel_z/2)+(lever_mount_z/2))]) levermountbase();
+		}
+		translate([95, -20, 0]) sega_2p_6_button();
+		translate([-60, 18, 0]) levermountholes();
+	}
+}
+
+top_panel_solo_lever_and_sega_2p_6_button();

src/top-panel-sega-2p-plus-one.scad

@@ -1,28 +0,0 @@
-/* Copyright Brian Stephan 2023
- *
- * This file is part of the Buildable Stick System.
- *
- * The Buildable Stick System is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * The Buildable Stick System is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * the Buildable Stick System. If not, see <https://www.gnu.org/licenses/>.
- */
-
-include <components.scad>
-
-module sega_2p_plus_one_panel() {
-	difference() {
-		translate([top_plate_x/2, top_plate_y/2, 0]) topplate();
-		sega_2p_plus_one();
-	}
-}
-
-sega_2p_plus_one_panel();