src/components.scad

@@ -44,7 +44,7 @@ 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_x = 183;
 frame_y = 208;
 frame_z = 50;
 
@@ -245,6 +245,10 @@ module top_plate_with_raised_overhang() {
 	}
 }
 
+module top_plate_with_raised_overhang_long() {
+	rotate([0, 0, -90]) top_plate_with_raised_overhang();
+}
+
 module frame_box() {
 	difference() {
 		roundedcube([frame_x, frame_y, frame_z], center=true, radius=3);
@@ -299,21 +303,19 @@ module frame() {
 
 // Directional Arc (both hands)
 
-module dir_arc_24mm_directionals() {
+module dir_arc_24mm_6_button() {
 	button_24mm_hole();
 	translate([29.5, 0, 0]) button_24mm_hole();
 	translate([29.5+26.3, -12.9, 0]) button_24mm_hole();
-	translate([29.5+26.3+15.5, -65.2, 0]) button_30mm_hole();
-}
 
-module dir_arc_24mm_6_button() {
-	dir_arc_24mm_directionals();
 	translate([29.5+26.3+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+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+15.5, -65.2, 0]) button_30mm_hole();
 }
 
 // 6 button plus the normal fourth column for 8 button actually on a third row
@@ -325,26 +327,22 @@ module dir_arc_24mm_8_button_compressed() {
 
 // Directional Arc (left hand)
 
-module dir_arc_30mm_thumb_button() {
+module dir_arc_30mm_button_l() {
-	// just my guesstimate on this one, but note that this is the same position as sega 2p (just mirrored)
+	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([73, 132, 0]) button_30mm_hole();
-	translate([(top_plate_x/2)-28.06, (-top_plate_y/2)+67, 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_w_30mm() {
-	dir_arc_30mm();
+	dir_arc_30mm_button_l();
-	translate([-5.4-26.8, 52.2+12.9+34.5, 0]) dir_arc_30mm_thumb_button();
+	translate([35, 0, 0]) dir_arc_30mm_button_l();
+	translate([35+33.5, -12.9, 0]) dir_arc_30mm_button_l();
+	translate([35+7, 34.5, 0]) dir_arc_30mm_button_l();
+	// just my guesstimate on this one, but note that this is the same position as sega 2p (just mirrored)
+	translate([-top_plate_x/2, -top_plate_y/2, 0]) translate([top_plate_x-28.06, 145-19-9-11-19-9-11, 0]) button_30mm_hole();
 }
 
 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.5, -12.9, 0]) dir_arc_30mm_button_l();
 }
 
 // Namco Noir (right hand)

src/misc-dustwasher-lsx-nobi.scad

@@ -21,8 +21,8 @@ include <components.scad>
 module lsx_nobi_dustwasher() {
 	difference() {
 		cylinder(r=jumbo_decorative_radius+5+hole_tolerance, h=2, $fn=50, center=true);
-		// 5.25 = 5 (diameter of shaft is 10mm) + .25 to let it take an angle
+		// 5.5 = 5 (diameter of shaft is 10mm) + .5 to let it take an angle
-		cylinder(r=5.25+hole_tolerance, h=2.1, $fn=50, center=true);
+		cylinder(r=5.5+hole_tolerance, h=2.1, $fn=50, center=true);
 	}
 }
 

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

@@ -17,7 +17,7 @@
  */
 
 include <components.scad>
-use <top-panel-inset-dir_arc-plus-w-30mm-plus-one.scad>
+use <top-panel-dir_arc-plus-w-30mm-plus-one.scad>
 
 module dir_arc_w_30mm_plus_one_panel_with_mount() {
 	dir_arc_w_30mm_plus_one_panel();

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

@@ -17,7 +17,7 @@
  */
 
 include <components.scad>
-use <top-panel-inset-lever.scad>
+use <top-panel-lever.scad>
 
 module lever_panel_with_mount() {
 	lever_panel();

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

@@ -20,8 +20,8 @@ include <components.scad>
 
 module dir_arc_24mm_6_button_panel() {
 	difference() {
-		top_plate_with_raised_overhang();
+		top_plate_with_raised_overhang_long();
-		translate([-71.5, -top_plate_y/2+122.5, 0]) dir_arc_24mm_6_button();
+		translate([-top_plate_x+105, -top_plate_y/2+135, 0]) dir_arc_24mm_6_button();
 	}
 }
 

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

@@ -20,8 +20,8 @@ include <components.scad>
 
 module dir_arc_plus_w_24mm_8_button_panel() {
 	difference() {
-		top_plate_with_raised_overhang();
+		top_plate_with_raised_overhang_long();
-		translate([-71.5, -top_plate_y/2+122.5, 0]) dir_arc_24mm_8_button_compressed();
+		translate([-top_plate_x+105, -top_plate_y/2+123, 0]) dir_arc_24mm_8_button_compressed();
 		translate([-34.5, 51, 0]) button_24mm_hole();
 	}
 }