demo/all-together-demo-extended.scad

@@ -5,13 +5,13 @@
 
 include <parameters.scad>
 include <components.scad>
-use <frames/pieces/side-trapezoid-extended-to-front-trapezoid.scad>
-use <frames/pieces/front-or-back-trapezoid.scad>
 use <frames/pieces/front-or-back-aux-and-neutrik.scad>
-use <panels/inset/lever-and-ergo-wasd-five-panel-with-oled.scad>
+use <frames/pieces/front-or-back-trapezoid.scad>
-use <panels/inset/ergo-nine-plus-aux-button-with-mount.scad>
+use <frames/pieces/side-trapezoid-extended-to-front-trapezoid.scad>
+use <panels/inset/lever-and-dir_arc-plus-w-30mm-panel-with-oled.scad>
+use <panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad>
 use <misc/decorative-plate-24mm-button.scad>
-use <misc/decorative-plate-ergo-wasd-five-30mm-and-ergo-nine-30mm.scad>
+use <misc/decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-nine.scad>
 use <misc/dustwasher-lsx-nobi.scad>
 
 top_panel_color        = "#0086D6";
@@ -21,17 +21,17 @@ frame_back_color       = "white";
 frame_side_color       = "yellow";
 top_deco_color         = "white";
 
-color(top_panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z/2+0.001]) lever_and_ergo_wasd_five_panel_with_oled();
+color(top_panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z+0.01]) lever_and_dir_arc_w_30mm_panel_with_oled();
-color(top_panel_color) translate([panel_x/2, 0, frame_z/2-panel_z/2+0.001]) ergo_nine_plus_aux_button_panel_with_mount();
+color(top_panel_color) translate([panel_x/2, 0, frame_z/2-panel_z+0.01]) sega_2p_nine_plus_aux_button_with_mount();
-color(frame_side_color) translate([-frame_x/2+4, 0, 0]) side_trapezoid_extended_to_front_frame_piece();
+color(frame_side_color) translate([-frame_x/2+4, 0, -2.5]) side_trapezoid_extended_to_front_frame_piece();
-color(frame_side_color) translate([frame_x/2-4, 0, 0]) mirror([1, 0, 0]) side_trapezoid_extended_to_front_frame_piece();
+color(frame_side_color) translate([frame_x/2-4, 0, -2.5]) mirror([1, 0, 0]) side_trapezoid_extended_to_front_frame_piece();
-color(frame_front_color) translate([-frame_x/2+4, 0, 0])  front_or_back_trapezoid_frame_piece();
+color(frame_front_color) translate([-frame_x/2+4, 0, -2.5])  front_or_back_trapezoid_frame_piece();
-color(frame_front_color) translate([frame_x/2-4, 0, 0])  front_or_back_trapezoid_frame_piece();
+color(frame_front_color) translate([frame_x/2-4, 0, -2.5])  front_or_back_trapezoid_frame_piece();
-color(frame_back_color) translate([-frame_x/2+4, 0, 0]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece();
+color(frame_back_color) translate([-frame_x/2+4, 0, -2.5]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece();
-color(frame_back_color) translate([frame_x/2-4, 0, 0]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_frame_piece();
+color(frame_back_color) translate([frame_x/2-4, 0, -2.5]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_frame_piece();
-/* color(bottom_panel_color) translate([-panel_x/2, 0, -5-frame_z/2+5]) panel(); */
+color(bottom_panel_color) translate([-panel_x/2, 0, -5-frame_z/2+5]) panel();
-/* color(bottom_panel_color) translate([panel_x/2, 0, -5-frame_z/2+5]) panel(); */
+color(bottom_panel_color) translate([panel_x/2, 0, -5-frame_z/2+5]) panel();
 
-color(top_deco_color) translate([0, 0, 4+frame_z/2-panel_z/2+0.001]) ergo_wasd_five_30mm_and_ergo_nine_30mm_decorative_plate();
+color(top_deco_color) translate([0, 0, 3+frame_z/2-panel_z]) dir_arc_plus_w_30mm_and_sega_2p_nine_decorative_plate();
-color(top_deco_color) translate([-170, 25, 4+frame_z/2-panel_z/2+0.001]) lsx_nobi_dustwasher();
+color(top_deco_color) translate([-170, 20, 3+frame_z/2-panel_z]) rotate([180, 0, 0]) lsx_nobi_dustwasher();
-color(top_deco_color) translate([panel_x-24, 30, 4+frame_z/2-panel_z/2+0.001]) button_24mm_decorative_plate();
+color(top_deco_color) translate([panel_x-24, 30, 3+frame_z/2-panel_z]) button_24mm_decorative_plate();

demo/all-together-demo.scad

@@ -8,10 +8,10 @@ include <components.scad>
 use <frames/pieces/side.scad>
 use <frames/pieces/front-or-back.scad>
 use <frames/pieces/front-or-back-aux-and-neutrik.scad>
-use <panels/inset/lever-and-ergo-wasd-five-panel-with-oled.scad>
+use <panels/inset/lever-and-dir_arc-plus-w-30mm-panel.scad>
-use <panels/inset/ergo-nine-plus-aux-button-with-mount.scad>
+use <panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad>
 use <misc/decorative-plate-24mm-button.scad>
-use <misc/decorative-plate-ergo-wasd-five-30mm-and-ergo-nine-30mm.scad>
+use <misc/decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-nine.scad>
 use <misc/dustwasher-lsx-nobi.scad>
 
 panel_color    = "red";
@@ -19,17 +19,17 @@ base_color     = "gray";
 top_deco_color = "white";
 brace_color    = "gray";
 
-color(panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z/2+0.001]) lever_and_ergo_wasd_five_panel_with_oled();
+color(panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z/2+0.001]) lever_and_dir_arc_w_30mm_panel();
-color(panel_color) translate([panel_x/2, 0, frame_z/2-panel_z/2+0.001]) ergo_nine_plus_aux_button_panel_with_mount();
+color(panel_color) translate([panel_x/2, 0, frame_z/2-panel_z/2+0.001]) sega_2p_nine_plus_aux_button_with_mount();
 color(base_color) translate([panel_x/2, 0, 0]) rotate([0, 180, 0]) side_frame_piece();
 color(base_color) translate([-panel_x/2, 0, 0]) side_frame_piece();
 color(base_color) translate([panel_x/2, 0, 0]) front_or_back_frame_piece();
 color(base_color) translate([-panel_x/2, 0, 0]) front_or_back_frame_piece();
 color(base_color) translate([panel_x/2, 0, 0]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_frame_piece();
 color(base_color) translate([-panel_x/2, 0, 0]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece();
-/* color(base_color) translate([-panel_x/2, 0, -frame_z/2+panel_z/2]) panel(); */
+color(base_color) translate([-panel_x/2, 0, -frame_z/2+panel_z/2]) panel();
-/* color(base_color) translate([panel_x/2, 0, -frame_z/2+panel_z/2]) panel(); */
+color(base_color) translate([panel_x/2, 0, -frame_z/2+panel_z/2]) panel();
 
-color(top_deco_color) translate([0, 0, 4+frame_z/2-panel_z/2+0.001]) ergo_wasd_five_30mm_and_ergo_nine_30mm_decorative_plate();
+color(top_deco_color) translate([0, 0, 4+frame_z/2-panel_z/2+0.001]) dir_arc_plus_w_30mm_and_sega_2p_nine_decorative_plate();
-color(top_deco_color) translate([-170, 25, 4+frame_z/2-panel_z/2+0.001]) lsx_nobi_dustwasher();
+color(top_deco_color) translate([-170, 20, 4+frame_z/2-panel_z/2+0.001]) lsx_nobi_dustwasher();
 color(top_deco_color) translate([panel_x-24, 30, 4+frame_z/2-panel_z/2+0.001]) button_24mm_decorative_plate();

src/components.scad

@@ -510,76 +510,6 @@ module sega_2p_eleven() {
 	translate([sega_2p_column_5_offset, -19-9-11, 0]) sega_2p_p1();
 }
 
-// BSS ERGO - 30mm
-
-module ergo_wasd_30mm() {
-	button_30mm_hole();					// W
-	translate([0, -36, 0]) button_30mm_hole();		// S
-	translate([-34.5, -36-9, 0]) button_30mm_hole();	// A
-	translate([34.5, -36-9, 0]) button_30mm_hole();		// D
-}
-
-module ergo_six_30mm() {
-	ergo_wasd_30mm();
-	translate([-34.5, -9, 0]) button_30mm_hole();		// left of W
-	translate([34.5, -9, 0]) button_30mm_hole();		// right of W
-}
-
-module ergo_eight_30mm() {
-	ergo_six_30mm();
-	translate([34.5*1.9, -9*3, 0]) button_30mm_hole();	// top right of right of W
-	translate([34.5*1.9, -36-9*3, 0]) button_30mm_hole();	// right of D
-}
-
-module ergo_wasd_five_30mm() {
-	translate([-51.75, 65.5, 0]) rotate([0, 0, 10]) {
-		ergo_wasd_30mm();
-	}
-	translate([0, 0, 0]) sega_2p_nine_thumb_button();
-}
-
-module ergo_nine_30mm() {
-	translate([-51.75, 65.5, 0]) rotate([0, 0, 10]) {
-		ergo_eight_30mm();
-	}
-	translate([0, 0, 0]) sega_2p_nine_thumb_button();
-}
-
-// untested
-// BSS ERGO - 24mm
-/* module ergo_wasd() { */
-/* 	button_24mm_hole();					// W */
-/* 	translate([0, -27, 0]) button_24mm_hole();		// S */
-/* 	translate([-26, -27-7, 0]) button_24mm_hole();		// A */
-/* 	translate([26, -27-7, 0]) button_24mm_hole();		// D */
-/* } */
-
-/* module ergo_six() { */
-/* 	ergo_wasd(); */
-/* 	translate([-26, -7, 0]) button_24mm_hole();		// left of W */
-/* 	translate([26, -7, 0]) button_24mm_hole();		// right of W */
-/* } */
-
-/* module ergo_eight() { */
-/* 	ergo_six(); */
-/* 	translate([26*2-2, -7*3, 0]) button_24mm_hole();	// top right of right of W */
-/* 	translate([26*2-2, -27-7*3, 0]) button_24mm_hole();	// top right of right of W */
-/* } */
-
-/* module ergo_wasd_five() { */
-/* 	translate([-63.25, 65.5, 0]) rotate([0, 0, 10]) { */
-/* 		ergo_wasd(); */
-/* 	} */
-/* 	translate([0, 0, 0]) sega_2p_nine_thumb_button(); */
-/* } */
-
-/* module ergo_nine() { */
-/* 	translate([-63.25, 65.5, 0]) rotate([0, 0, 10]) { */
-/* 		ergo_eight(); */
-/* 	} */
-/* 	translate([0, 0, 0]) sega_2p_nine_thumb_button(); */
-/* } */
-
 module shiokenstar() {
 	translate([-172, 32, 0]) dir_arc_24mm_directionals();
 	sega_2p();

src/misc/decorative-plate-ergo-wasd-five-30mm-and-ergo-nine-30mm.scad

@@ -1,24 +0,0 @@
-/*
- * SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-include <parameters.scad>
-include <components.scad>
-
-module ergo_wasd_five_30mm_and_ergo_nine_30mm_decorative_plate() {
-	difference() {
-		// get a 2mm slice of the jumbo decorative button cylinders
-		union() {
-			translate([-panel_x/2, 0, -70]) mirror([1, 0, 0]) ergo_wasd_five_30mm();
-			translate([panel_x/2, 0, -70]) ergo_nine_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([-panel_x/2, 0, -1]) mirror([1, 0, 0]) ergo_wasd_five_30mm();
-		translate([panel_x/2, 0, -1]) ergo_nine_30mm();
-	}
-}
-
-ergo_wasd_five_30mm_and_ergo_nine_30mm_decorative_plate();

src/panels/inset/ergo-nine-plus-aux-button-with-mount.scad

@@ -1,15 +0,0 @@
-/*
- * SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-include <parameters.scad>
-include <components.scad>
-use <ergo-nine-plus-aux-button.scad>
-
-module ergo_nine_plus_aux_button_panel_with_mount() {
-	ergo_nine_plus_aux_button_panel();
-	translate([20, -50, -(panel_z/2) - 3]) pcb_mount();
-}
-
-ergo_nine_plus_aux_button_panel_with_mount();

src/panels/inset/ergo-nine-plus-aux-button.scad

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

src/panels/inset/lever-and-ergo-wasd-five-panel-with-oled.scad

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-include <parameters.scad>
-include <components.scad>
-use <lever-and-ergo-wasd-five-panel.scad>
-
-module lever_and_ergo_wasd_five_panel_with_oled() {
-	difference() {
-		lever_and_ergo_wasd_five_panel();
-		translate([0, -(panel_y/2 - 22), 0]) adafruit_pid_326_oled_ssd1306_mount_cutout();
-	}
-	translate([0, -(panel_y/2 - 22), 0]) adafruit_pid_326_oled_ssd1306_mount();
-}
-
-lever_and_ergo_wasd_five_panel_with_oled();

src/panels/inset/lever-and-ergo-wasd-five-panel.scad

@@ -1,18 +0,0 @@
-/*
- * SPDX-FileCopyrightText: © 2025 Brian S. Stephan <bss@incorporeal.org>
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-include <parameters.scad>
-include <components.scad>
-
-module lever_and_ergo_wasd_five_panel() {
-	difference() {
-		panel();
-		mirror([1, 0, 0]) ergo_wasd_five_30mm();
-		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountholes();
-		translate([(-panel_x/2)+55, (panel_y/2)-75, 0]) levermountcountersinks();
-	}
-}
-
-lever_and_ergo_wasd_five_panel();

src/panels/inset/sega-2p-eleven-panel-with-mount.scad

@@ -10,7 +10,7 @@ use <sega-2p-eleven-panel.scad>
 
 module sega_2p_eleven_panel_with_mount() {
 	sega_2p_eleven_panel();
-	translate([20, -50, -(panel_z/2) - 3]) pcb_mount();
+	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
 }
 
 sega_2p_eleven_panel_with_mount();

src/panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad

@@ -9,7 +9,7 @@ use <sega-2p-nine-plus-aux-button.scad>
 
 module sega_2p_nine_plus_aux_button_with_mount() {
 	sega_2p_nine_plus_aux_button();
-	translate([20, -50, -(panel_z/2) - 3]) pcb_mount();
+	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
 }
 
 sega_2p_nine_plus_aux_button_with_mount();

src/panels/overhang/right-sega-2p-nine-panel-with-mount.scad

@@ -9,7 +9,7 @@ use <right-sega-2p-nine-panel.scad>
 
 module sega_2p_nine_with_mount_right_overhang_panel() {
 	sega_2p_nine_right_overhang_panel();
-	translate([20, -50, -(panel_z/2) - 3]) pcb_mount();
+	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
 }
 
 sega_2p_nine_with_mount_right_overhang_panel();

src/panels/overhang/right-sega-2p-nine-plus-aux-button-with-mount.scad

@@ -9,7 +9,7 @@ use <right-sega-2p-nine-plus-aux-button.scad>
 
 module sega_2p_nine_plus_aux_button_right_overhang_panel_with_mount() {
 	sega_2p_nine_plus_aux_button_right_overhang_panel();
-	translate([20, -50, -(panel_z/2) - 3]) pcb_mount();
+	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
 }
 
 sega_2p_nine_plus_aux_button_right_overhang_panel_with_mount();