src/components.scad

@@ -23,9 +23,6 @@ include <roundedcube.scad>
 // adjustments
 hole_tolerance = 0.15;
 
-// M2
-m2_screw_selftap_radius = 0.95;
-
 // M3
 m3_screw_selftap_radius = 1.3;
 
@@ -158,25 +155,6 @@ module frame_cutout() {
 	cube([36.5, 8, 40], center=true);
 }
 
-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);
@@ -333,30 +311,19 @@ module dir_arc_24mm_directionals() {
 
 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+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+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();
+	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();
 }
 
 // 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();
+	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();
 }
 
 // Directional Arc (left hand)

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

@@ -1,33 +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_plus_w_24mm_8_button_decorative_plate() {
-	difference() {
-		decorative_add=10;
-		// get a 1mm slice of the bigger button cylinders
-		translate([0, 0, -45]) dir_arc_plus_w_24mm_8_button();
-		translate([0, 0, -50]) cube([500, 500, 98], center=true);
-		translate([0, 0, 50]) cube([500, 500, 98], 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-sega-2p-6-button.scad

@@ -1,33 +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_6_button_decorative_plate() {
-	difference() {
-		decorative_add=10;
-		// get a 1mm slice of the bigger button cylinders
-		translate([0, 0, -45]) sega_2p_6_button();
-		translate([0, 0, -50]) cube([500, 500, 98], center=true);
-		translate([0, 0, 50]) cube([500, 500, 98], center=true);
-		// cut out the normal holes
-		translate([0, 0, -1]) sega_2p_6_button();
-	}
-}
-
-sega_2p_6_button_decorative_plate();

src/top-panel-right-sega-2p-plus-one-plus-control-with-mount-with-oled.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 <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-solo-dir_arc-plus-w-24mm-8-button.scad

@@ -21,7 +21,8 @@ include <components.scad>
 module dir_arc_plus_w_24mm_8_button_panel() {
 	difference() {
 		top_plate_with_raised_overhang();
-		translate([-80.5, top_plate_y/6, 0]) dir_arc_plus_w_24mm_8_button();
+		translate([-71.5, -top_plate_y/2+122.5, 0]) dir_arc_24mm_8_button_compressed();
+		translate([-34.5, 51, 0]) button_24mm_hole();
 	}
 }