From 8b3772e561a08df3874e5ab87565f89cbfc84a8d Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Tue, 6 Feb 2024 18:57:12 -0600 Subject: [PATCH] s/topplate/panel/ --- just better naming --- src/bottom-panel-inset.scad | 2 +- src/components.scad | 24 +++++++++---------- ...el-inset-dir_arc-plus-w-30mm-plus-one.scad | 2 +- ...l-inset-lever-and-dir_arc-plus-w-30mm.scad | 5 ++-- src/top-panel-inset-lever.scad | 6 ++--- src/top-panel-inset-namco-noir-plus-one.scad | 2 +- src/top-panel-inset-namco-noir-plus-two.scad | 2 +- ...l-inset-sega-2p-plus-one-plus-control.scad | 2 +- src/top-panel-inset-sega-2p-plus-one.scad | 2 +- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/bottom-panel-inset.scad b/src/bottom-panel-inset.scad index 8d15d62..16f165f 100644 --- a/src/bottom-panel-inset.scad +++ b/src/bottom-panel-inset.scad @@ -8,7 +8,7 @@ include module bottom_panel() { difference() { - mirror([0, 0, 1]) topplate(); + mirror([0, 0, 1]) panel(); translate([0, 0, top_plate_z/2]) cube([top_plate_x-40, top_plate_y-40, top_plate_z], center=true); } } diff --git a/src/components.scad b/src/components.scad index fdb5e4b..e0e65de 100644 --- a/src/components.scad +++ b/src/components.scad @@ -162,19 +162,26 @@ module levermountholes() { m4_hole_countersink(); } -module base_topplate() { +module base_panel() { cube([top_plate_x, top_plate_y, top_plate_z], center=true); } +module panel() { + difference() { + base_panel(); + top_plate_holes(); + } +} + module overhang_plate() { roundedcube([overhang_top_plate_x, overhang_top_plate_y, top_plate_z], center=true, radius=1); } -// this takes the base_topplate and makes it a small frame, putting a larger top plate +// this takes the base_panel and makes it a small frame, putting a larger top plate module base_top_plate_with_raised_overhang() { // make a frame out of the top plate (and keep the main plate on the center plane) translate([0, 0, -5]) difference() { - base_topplate(); + base_panel(); cube([top_plate_x-(panel_support_width*2), top_plate_y-(panel_support_width*2), top_plate_z*2], center=true); } translate([plate_to_frame_point_x, plate_to_frame_point_y, -2.5]) resize([0, 0, 10]) frame_mount_column(); @@ -184,13 +191,6 @@ module base_top_plate_with_raised_overhang() { overhang_plate(); } -module topplate() { - difference() { - base_topplate(); - top_plate_holes(); - } -} - module bottom_plate_with_overhang() { difference() { rotate([180, 0, 0]) base_top_plate_with_raised_overhang(); @@ -249,8 +249,8 @@ module base_frame() { 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([0, 0, frame_z/2]) scale([1, 1, 2]) base_panel(); + translate([0, 0, -frame_z/2]) scale([1, 1, 2]) base_panel(); 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(); diff --git a/src/top-panel-inset-dir_arc-plus-w-30mm-plus-one.scad b/src/top-panel-inset-dir_arc-plus-w-30mm-plus-one.scad index 8d34b19..bdd093b 100644 --- a/src/top-panel-inset-dir_arc-plus-w-30mm-plus-one.scad +++ b/src/top-panel-inset-dir_arc-plus-w-30mm-plus-one.scad @@ -8,7 +8,7 @@ include module dir_arc_w_30mm_plus_one_panel() { difference() { - topplate(); + panel(); dir_arc_w_30mm_plus_one(); } } diff --git a/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad b/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad index 922c180..33717ae 100644 --- a/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad +++ b/src/top-panel-inset-lever-and-dir_arc-plus-w-30mm.scad @@ -9,8 +9,9 @@ include 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(); + panel(); + 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(); diff --git a/src/top-panel-inset-lever.scad b/src/top-panel-inset-lever.scad index abc0229..b9c3e63 100644 --- a/src/top-panel-inset-lever.scad +++ b/src/top-panel-inset-lever.scad @@ -11,10 +11,8 @@ module lever_panel() { difference() { // base plate union() { - translate([0,-20,0]) - topplate(); - translate([0, 0, -((top_plate_z/2)+(lever_mount_z/2))]) - levermountbase(); + translate([0,-20,0]) panel(); + translate([0, 0, -((top_plate_z/2)+(lever_mount_z/2))]) levermountbase(); } // holes to mount the lever levermountholes(); diff --git a/src/top-panel-inset-namco-noir-plus-one.scad b/src/top-panel-inset-namco-noir-plus-one.scad index ecb1ae3..52cb7cf 100644 --- a/src/top-panel-inset-namco-noir-plus-one.scad +++ b/src/top-panel-inset-namco-noir-plus-one.scad @@ -8,7 +8,7 @@ include module namco_noir_plus_one_panel() { difference() { - topplate(); + panel(); noir_plus_one(); } } diff --git a/src/top-panel-inset-namco-noir-plus-two.scad b/src/top-panel-inset-namco-noir-plus-two.scad index 867444c..24951ec 100644 --- a/src/top-panel-inset-namco-noir-plus-two.scad +++ b/src/top-panel-inset-namco-noir-plus-two.scad @@ -8,7 +8,7 @@ include module namco_noir_plus_two_panel() { difference() { - topplate(); + panel(); noir_plus_one(); translate([32.94-3.47-3.47, -78+7.37+4.49, 0]) noir_button_p1(); } diff --git a/src/top-panel-inset-sega-2p-plus-one-plus-control.scad b/src/top-panel-inset-sega-2p-plus-one-plus-control.scad index 4e2f308..a3e71e1 100644 --- a/src/top-panel-inset-sega-2p-plus-one-plus-control.scad +++ b/src/top-panel-inset-sega-2p-plus-one-plus-control.scad @@ -8,7 +8,7 @@ include module top_panel_inset_sega_2p_plus_one_plus_control() { difference() { - topplate(); + panel(); sega_2p_plus_one(); rotate([0, 0, 180]) side_chopper(); translate([89, 30, 0]) button_24mm_hole(); diff --git a/src/top-panel-inset-sega-2p-plus-one.scad b/src/top-panel-inset-sega-2p-plus-one.scad index a7e31aa..32b9123 100644 --- a/src/top-panel-inset-sega-2p-plus-one.scad +++ b/src/top-panel-inset-sega-2p-plus-one.scad @@ -8,7 +8,7 @@ include module sega_2p_plus_one_panel() { difference() { - topplate(); + panel(); sega_2p_plus_one(); } }