add an alternative top plate for buttons

this is a crazy one since I tried to fill the corners by hand.
interesting, but I don't know if I'm actually going to use it... but it
works so committing it

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>)

README.md

@@ -4,6 +4,12 @@ Files for 3D printing an arcade stick.
 
 ![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
 design and became incompatible with that project's components. This should be considered a different project with some
@@ -30,8 +36,12 @@ 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 45mm 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 16mm M4 bolts
     * 8 M4 flange nuts
@@ -50,8 +60,8 @@ This is a rough estimate of the cost to produce one of these sticks, assuming a
 Filament masses from Bambu Studio estimates, using Bambu PLA Basic.
 
 * Left and right frame: **$7.08 USD** (141.84g each, as of 2023-09-12)
-* Left and right top panels: **~$6.74 USD** (~135g each, as of 2023-09-12)
-* Left and right bottom panels: **$5.90 USD** (118.16g 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)
@@ -63,12 +73,11 @@ Filament masses from Bambu Studio estimates, using Bambu PLA Basic.
   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)
-    * You may be tempted to use 16mm M4 bolts for both the top and bottom, but the spacers I have aren't threaded all
-      the way through the shaft, and 16mm bolts won't make it all the way on the bottom panel, but do on the top panel
-      (which is 5mm thicker); be careful I guess
 
 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

TODO.md

@@ -2,9 +2,14 @@
 
 Notes for "next time".
 
+## v3.3
+
+* Try not using roundedcube and instead bezel the top, to get cleaner seams everywhere else
+
 ## v4
 
 * 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

@@ -21,4 +21,5 @@ bss's random thoughts and notes on 3D printing materials.
 
 ## Hatchbox PLA
 
-* Haven't done a lot of this yet, but my wife really likes the blue.
+* **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

@@ -1,21 +1,9 @@
-/* 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>
 use <frame-right.scad>

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]) topplate();
+		translate([0, 0, top_plate_z/2]) cube([top_plate_x-40, top_plate_y-40, top_plate_z], center=true);
+	}
+}
+
+bottom_panel();

src/bottom-panel-left.scad

@@ -1,21 +1,9 @@
-/* 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 <bottom-panel-solo.scad>
 

src/bottom-panel-middle.scad

@@ -1,21 +1,9 @@
-/* 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 <bottom-panel-left.scad>
 use <bottom-panel-right.scad>

src/bottom-panel-no-overhang.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 bottom_panel() {
-	difference() {
-		mirror([0, 0, 1]) topplate();
-		translate([0, 0, top_plate_z/2]) cube([top_plate_x*5/6, top_plate_y*5/6, top_plate_z], center=true);
-	}
-}
-
-bottom_panel();

src/bottom-panel-right.scad

@@ -1,21 +1,9 @@
-/* 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 <bottom-panel-left.scad>
 

src/bottom-panel-solo.scad

@@ -1,27 +1,15 @@
-/* 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 bottom_panel_solo() {
 	difference() {
 		bottom_plate_with_overhang();
-		translate([0, 0, top_plate_z/2]) cube([top_plate_x*5/6, top_plate_y*5/6, top_plate_z], center=true);
+		translate([0, 0, top_plate_z/2]) cube([top_plate_x-40, top_plate_y-40, top_plate_z], center=true);
 	}
 }
 

src/components.scad

@@ -1,86 +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
-// base frame box. reminder: top of inside (including mounts) is chopped by top_plate_z for plates
-frame_x = 233;
-frame_y = 208;
-frame_z = 50;
-
-// depth of the "lip" of the frame that the top plate sets into/supports the overhang
-frame_wall = 8;
-
-// 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
-top_plate_x = frame_x - frame_wall;
-top_plate_y = frame_y - frame_wall;
-top_plate_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)
-top_plate_overhang_amount = frame_wall + 17;
-overhang_top_plate_x = top_plate_x + top_plate_overhang_amount;
-overhang_top_plate_y = top_plate_y + top_plate_overhang_amount;
-
-plate_to_frame_point_x = (top_plate_x/2)-10;
-plate_to_frame_point_y = (top_plate_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 = 12;
-jumbo_decorative_radius = 15;
-
-/* PARTS */
-
 module m4_hole() {
 	cylinder(r=m4_bolt_radius, h=100, $fn=50, center=true);
 }
@@ -111,8 +35,8 @@ module button_24mm_hole() {
 	// 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, h=20, $fn=50, center=true);
-	translate([0, 0, 70]) cylinder(r=small_button_radius+jumbo_decorative_radius, h=20, $fn=50, center=true);
+	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
@@ -124,8 +48,8 @@ module button_30mm_hole() {
 	// 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, h=20, $fn=50, center=true);
-	translate([0, 0, 70]) cylinder(r=big_button_radius+jumbo_decorative_radius, h=20, $fn=50, center=true);
+	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() {
@@ -150,9 +74,42 @@ module neutrik_d_mount() {
 	translate([-9.5, -12, 0]) neutrik_d_screw_hole();
 }
 
-// space for a neutrik D mount or 24mm button
+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, 40], center=true);
+	cube([36.5, 8, frame_z-(top_plate_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() {
@@ -184,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();
@@ -236,7 +193,7 @@ module topplate() {
 
 module bottom_plate_with_overhang() {
 	difference() {
-		overhang_plate();
+		rotate([180, 0, 0]) base_top_plate_with_raised_overhang();
 		rotate([180, 0, 0]) top_plate_holes();
 	}
 }
@@ -251,6 +208,7 @@ module top_plate_with_raised_overhang() {
 module frame_box() {
 	difference() {
 		roundedcube([frame_x, frame_y, frame_z], center=true, radius=3);
+		// cut out the middle to make it a box
 		cube([top_plate_x-(panel_support_width*2), top_plate_y-(panel_support_width*2), frame_z+5], center=true);
 	}
 }
@@ -260,7 +218,7 @@ module frame_mount_column() {
 }
 
 module side_chopper() {
-	translate([frame_x/2+4, 0, 0]) cube([16, 2*(frame_y+top_plate_y), 2*(frame_z+top_plate_z)], center=true);
+	translate([(frame_x-frame_wall)/2, 0, 0]) cube([frame_wall, frame_y, frame_z], center=true);
 }
 
 module frame_connection_holes() {
@@ -291,6 +249,7 @@ module frame() {
 	difference() {
 		base_frame();
 		translate([0, 0, frame_z/2]) scale([1, 1, 2]) base_topplate();
+		translate([0, 0, -frame_z/2]) scale([1, 1, 2]) base_topplate();
 		translate([plate_to_frame_point_x, plate_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([-plate_to_frame_point_x, plate_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([plate_to_frame_point_x, -plate_to_frame_point_y, 0]) frame_hex_bolt_hole();
@@ -311,49 +270,60 @@ module dir_arc_24mm_directionals() {
 
 module dir_arc_24mm_6_button() {
 	dir_arc_24mm_directionals();
-	translate([29.5+26.3+15.5+9.7+2.6, 0, 0]) button_24mm_hole();
-	translate([29.5+26.3+15.5+9.7+2.6+26.9, 10.9, 0]) button_24mm_hole();
-	translate([29.5+26.3+15.5+9.7+2.6+26.9+29.6, 10.9, 0]) button_24mm_hole();
+	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+15.5+9.7+2.6+26.9-1.7, 10.9-30.1, 0]) button_24mm_hole();
-	translate([29.5+26.3+15.5+9.7+2.6+26.9+29.6, 10.9-30.1, 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+15.5+9.7+2.6+2.6, 29.4, 0]) button_24mm_hole();
-	translate([29.5+26.3+15.5+9.7+2.6+26.9+2.6, 40.3, 0]) button_24mm_hole();
+	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([(top_plate_x/2)-28.06, (-top_plate_y/2)+67, 0]) button_30mm_hole();
+	translate([(top_plate_x/2)-28.06, (-top_plate_y/2)+62, 0]) button_30mm_hole();
 }
 
-module dir_arc_30mm() {
-	dir_arc_30mm_thumb_button();
-	translate([-5.4, 52.2, 0]) dir_arc_30mm_thumb_button();
-	translate([-5.4-33.8, 52.2+12.9, 0]) dir_arc_30mm_thumb_button();
-	translate([-5.4-33.8-34.8, 52.2+12.9, 0]) dir_arc_30mm_thumb_button();
+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();
-	translate([-5.4-26.8, 52.2+12.9+34.5, 0]) dir_arc_30mm_thumb_button();
+	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([-5.4-33.8-34.8-33.8, 52.2, 0]) dir_arc_30mm_thumb_button();
+	translate([-33.8-34.8-33.8, 57.2, 0]) dir_arc_30mm_thumb_button();
 }
 
 // Namco Noir (right hand)
 
 module noir_button_p1() {
-	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([35, 145, 0]) button_30mm_hole();
+	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([35, 140, 0]) button_30mm_hole();
 }
 
 module noir_plus_one() {
@@ -374,7 +344,7 @@ module noir_plus_one() {
 // Sega Astro City 2P (right hand)
 
 module sega_2p_p1() {
-	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([28.06, 145, 0]) button_30mm_hole();
+	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([28.06, 140, 0]) button_30mm_hole();
 }
 
 module sega_2p_6_button() {

src/frame-left.scad

@@ -1,21 +1,9 @@
-/* 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() {
@@ -30,22 +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([-30, 101.5, 0]) rotate([270, 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, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
 		translate([-70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([10, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
 		translate([10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 
 		// neutrix button hole
-		translate([70, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
-		translate([70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		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,21 +1,9 @@
-/* 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() {
@@ -31,12 +19,12 @@ 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, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();

src/frame-right.scad

@@ -1,21 +1,9 @@
-/* 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_right_frame() {
@@ -30,22 +18,22 @@ module right_frame() {
 	difference() {
 		base_right_frame();
 		// connection holes to other frames
-		mirror([1, 0, 0]) translate([0, 0, -top_plate_z/2]) frame_connection_holes();
+		mirror([1, 0, 0]) frame_connection_holes();
 
 		// cable routing hole
-		mirror([1, 0, 0]) translate([0, 0, -top_plate_z/2]) frame_cable_routing_hole();
+		mirror([1, 0, 0]) frame_cable_routing_hole();
 
 		// aux button holes
-		translate([30, 101.5, 0]) rotate([270, 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, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
 		translate([70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
-		translate([-10, 101.5, 0]) rotate([270, 0, 0]) button_24mm_hole();
 		translate([-10, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 
 		// neutrix button hole
-		translate([-70, (frame_y/2)-neutrik_panel_thickness, 0]) rotate([90, 0, 0]) neutrik_d_mount();
-		translate([-70, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
+		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-solo.scad

@@ -1,21 +1,9 @@
-/* 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 solo_frame() {
@@ -31,23 +19,14 @@ module solo_frame() {
 		translate([40, (frame_y/2)-neutrik_panel_thickness-4, 0]) frame_cutout();
 
 		// aux button holes
-		translate([-frame_x/2+2.5, 0, 0]) rotate([0, 0, 270])
-			translate([0, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
+		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+2.5, 0, 0]) rotate([0, 0, 270])
-			translate([-40, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
 		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([0, 0, 270])
-			translate([40, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
 		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([0, 0, 90])
-			translate([0, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
+
+		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-2.5, 0, 0]) rotate([0, 0, 90])
-			translate([-40, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
 		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([0, 0, 90])
-			translate([40, 0, 0]) rotate([90, 0, 0]) button_24mm_hole();
 		translate([-(frame_x/2)+neutrik_panel_thickness+4, 40, 0]) rotate([0, 0, 90]) frame_cutout();
 	}
 }

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

@@ -1,30 +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 button_24mm_decorative_plate() {
 	difference() {
-		decorative_add=10;
-		// get a 1mm slice of the bigger button cylinders
-		translate([0, 0, -45]) button_24mm_hole();
-		translate([0, 0, -50]) cube([500, 500, 98], center=true);
-		translate([0, 0, 50]) cube([500, 500, 98], center=true);
+		// 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();
 	}

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([-top_plate_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([top_plate_x/2, 0, -25]) {
+				hull() sega_2p();
+			}
+			hull() {
+				translate([-top_plate_x/2, 0, -25]) dir_arc_30mm_thumb_button();
+				translate([top_plate_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([-top_plate_x/2, 0, -1]) dir_arc_w_30mm();
+		translate([top_plate_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

@@ -1,26 +1,14 @@
-/* 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 dir_arc_plus_w_30mm_and_sega_2p_plus_one_decorative_plate() {
 	difference() {
-		// get a 1mm slice of the bigger button cylinders
+		// get a 2mm slice of the bigger button cylinders
 		union() {
 			translate([-top_plate_x/2, 0, -65]) dir_arc_w_30mm();
 			translate([top_plate_x/2, 0, -65]) sega_2p_plus_one();
@@ -31,8 +19,6 @@ module dir_arc_plus_w_30mm_and_sega_2p_plus_one_decorative_plate() {
 		translate([-top_plate_x/2, 0, -1]) dir_arc_w_30mm();
 		translate([top_plate_x/2, 0, -1]) sega_2p_plus_one();
 	}
-	/* // fill in some space */
-	/* translate([-6, -6, 0]) cube([23, 23, 1], center=true); */
 }
 
 dir_arc_plus_w_30mm_and_sega_2p_plus_one_decorative_plate();

src/misc-decorative-plate-dir_arc-plus-w-30mm.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 dir_arc_plus_w_30mm_decorative_plate() {
 	difference() {
-		// get a 1mm slice of the bigger button cylinders
-		translate([0, 0, -45]) dir_arc_w_30mm();
-		translate([0, 0, -50]) cube([500, 500, 98], center=true);
-		translate([0, 0, 50]) cube([500, 500, 98], center=true);
+		// 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();
 	}

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

@@ -1,30 +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 sega_2p_plus_one_decorative_plate() {
 	difference() {
-		decorative_add=10;
-		// get a 1mm slice of the bigger button cylinders
-		translate([0, 0, -45]) sega_2p_plus_one();
-		translate([0, 0, -50]) cube([500, 500, 98], center=true);
-		translate([0, 0, 50]) cube([500, 500, 98], center=true);
+		// 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();
 	}

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

@@ -1,26 +1,14 @@
-/* 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 lsx_nobi_dustwasher() {
 	difference() {
-		cylinder(r=jumbo_decorative_radius+5+hole_tolerance, h=2, $fn=50, center=true);
+		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);
 	}

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

@@ -1,30 +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 <misc-neutrik-d-plate.scad>
-
-module neutrik_d_plate_20mm() {
-	difference() {
-		neutrik_d_plate();
-		cylinder(r=10+hole_tolerance, h=5, $fn=50, center=true);
-		cube([2.2, 22, 5], center=true);
-	}
-}
-
-neutrik_d_plate_20mm();

src/misc-neutrik-d-plate-24mm-hole.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>
 use <misc-neutrik-d-plate.scad>
 
 module neutrik_d_plate_24mm() {
 	difference() {
 		neutrik_d_plate();
-		cylinder(r=12+hole_tolerance, h=5, $fn=50, center=true);
+		neutrik_d_mount();
 	}
 }
 

src/misc-neutrik-d-plate.scad

@@ -1,21 +1,9 @@
-/* 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 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/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 top_plate_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
+top_plate_x = frame_x - (frame_wall * 2);
+top_plate_y = frame_y - (frame_wall * 2);
+top_plate_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)
+top_plate_overhang_amount = 8.5;
+overhang_top_plate_x = top_plate_x + (frame_wall * 2) + (top_plate_overhang_amount * 2);
+overhang_top_plate_y = top_plate_y + (frame_wall * 2) + (top_plate_overhang_amount * 2);
+
+plate_to_frame_point_x = (top_plate_x/2)-10;
+plate_to_frame_point_y = (top_plate_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-inset-dir_arc-plus-w-30mm-plus-one-with-mount.scad

@@ -1,21 +1,9 @@
-/* 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 <top-panel-inset-dir_arc-plus-w-30mm-plus-one.scad>
 

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

@@ -1,21 +1,9 @@
-/* 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 dir_arc_w_30mm_plus_one_panel() {

src/top-panel-inset-lever-and-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 top_panel_inset_lever_and_dir_arc_w_30mm() {
+	difference() {
+		union() {
+			topplate();
+			translate([(-top_plate_x/2)+55, (top_plate_y/2)-75, -((top_plate_z/2)+(lever_mount_z/2))]) levermountbase();
+		}
+		dir_arc_w_30mm();
+		translate([(-top_plate_x/2)+55, (top_plate_y/2)-75, 0]) levermountholes();
+	}
+}
+
+top_panel_inset_lever_and_dir_arc_w_30mm();

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

@@ -1,21 +1,9 @@
-/* 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 <top-panel-inset-lever.scad>
 

src/top-panel-inset-lever.scad

@@ -1,21 +1,9 @@
-/* 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>
 
 // combine the lever mount and generic plate, with mounting holes

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

@@ -1,21 +1,9 @@
-/* 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 namco_noir_plus_one_panel() {

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

@@ -1,21 +1,9 @@
-/* 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 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, -(top_plate_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() {
+		topplate();
+		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

@@ -1,21 +1,9 @@
-/* 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 sega_2p_plus_one_panel() {

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

@@ -1,21 +1,9 @@
-/* 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 top_panel_left_lever_and_dir_arc_w_30mm() {

src/top-panel-left-lever.scad

@@ -1,21 +1,9 @@
-/* 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>
 
 // combine the lever mount and generic plate, with mounting holes

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

@@ -1,21 +1,9 @@
-/* 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 <top-panel-middle-dir_arc-plus-w-30mm.scad>
 

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

@@ -1,21 +1,9 @@
-/* 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 top_panel_middle_dir_arc_w_30mm() {

src/top-panel-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-right-sega-2p-plus-one-plus-control-with-mount.scad

@@ -1,21 +1,9 @@
-/* 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 <top-panel-right-sega-2p-plus-one-plus-control.scad>
 

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

@@ -1,21 +1,9 @@
-/* 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 top_panel_right_sega_2p_plus_one_plus_control() {

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

@@ -1,21 +1,9 @@
-/* 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 <top-panel-right-sega-2p-plus-one.scad>
 

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

@@ -1,21 +1,9 @@
-/* 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 top_panel_right_sega_2p_plus_one() {

src/top-panel-solo-dir_arc-24mm-6-button.scad

@@ -1,21 +1,9 @@
-/* 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 dir_arc_24mm_6_button_panel() {

src/top-panel-solo-dir_arc-plus-w-24mm-8-button.scad

@@ -1,28 +1,15 @@
-/* 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 dir_arc_plus_w_24mm_8_button_panel() {
 	difference() {
 		top_plate_with_raised_overhang();
-		translate([-71.5, -top_plate_y/2+122.5, 0]) dir_arc_24mm_8_button_compressed();
-		translate([-34.5, 51, 0]) button_24mm_hole();
+		translate([-80.5, top_plate_y/6, 0]) dir_arc_plus_w_24mm_8_button();
 	}
 }
 

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

@@ -1,21 +1,9 @@
-/* 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 top_panel_solo_lever_and_sega_2p_6_button() {