fix imports of the overhang panels following renames

Signed-off-by: Brian S. Stephan <bss@incorporeal.org>

src/bottom-panel-inset.scad

@@ -6,8 +6,8 @@
 include <parameters.scad>
 include <components.scad>
 
-module bottom_panel() {
-	mirror([0, 0, 1]) panel();
+module inset_bottom_panel() {
+	mirror([0, 0, 1]) bottom_panel();
 }
 
-bottom_panel();
+inset_bottom_panel();

src/bottom-panel-overhang-left.scad

@@ -5,7 +5,7 @@
 
 include <parameters.scad>
 include <components.scad>
-use <bottom-panel-solo.scad>
+use <bottom-panel-overhang-solo.scad>
 
 module bottom_panel_left() {
 	difference() {

src/bottom-panel-overhang-middle.scad

@@ -5,8 +5,8 @@
 
 include <parameters.scad>
 include <components.scad>
-use <bottom-panel-left.scad>
-use <bottom-panel-right.scad>
+use <bottom-panel-overhang-left.scad>
+use <bottom-panel-overhang-right.scad>
 
 module bottom_panel_middle() {
 	intersection() {

src/bottom-panel-overhang-right.scad

@@ -5,7 +5,7 @@
 
 include <parameters.scad>
 include <components.scad>
-use <bottom-panel-left.scad>
+use <bottom-panel-overhang-left.scad>
 
 module bottom_panel_right() {
 	rotate([0, 0, 180]) bottom_panel_left();

src/components.scad

@@ -164,6 +164,18 @@ module levermountholes() {
 
 module base_panel() {
 	cube([panel_x, panel_y, panel_z], center=true);
+	translate([panel_to_frame_point_x, panel_to_frame_point_y, -panel_z])
+		scale([1.4, 1.4, 0.1]) frame_hex_bolt_hole();
+	translate([-panel_to_frame_point_x, panel_to_frame_point_y, -panel_z])
+		scale([1.4, 1.4, 0.1]) frame_hex_bolt_hole();
+	translate([panel_to_frame_point_x, -panel_to_frame_point_y, -panel_z])
+		scale([1.4, 1.4, 0.1]) frame_hex_bolt_hole();
+	translate([-panel_to_frame_point_x, -panel_to_frame_point_y, -panel_z])
+		scale([1.4, 1.4, 0.1]) frame_hex_bolt_hole();
+}
+
+module base_bottom_panel() {
+	cube([panel_x, panel_y, panel_z], center=true);
 }
 
 module panel() {
@@ -173,6 +185,13 @@ module panel() {
 	}
 }
 
+module bottom_panel() {
+	difference() {
+		base_bottom_panel();
+		mirror([0, 0, 1]) panel_holes();
+	}
+}
+
 module overhang_plate() {
 	roundedcube([overhang_panel_x, overhang_panel_y, panel_z], center=true, radius=1);
 }
@@ -182,7 +201,7 @@ module base_panel_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_panel();
-		cube([panel_x-(panel_support_width*2), panel_y-(panel_support_width*2), panel_z*2], center=true);
+		cube([panel_x-(panel_support_width*2), panel_y-(panel_support_width*2), panel_z], center=true);
 	}
 	translate([panel_to_frame_point_x, panel_to_frame_point_y, -2.5]) resize([0, 0, 10])
 		frame_mount_column();
@@ -204,7 +223,13 @@ module panel_with_raised_overhang() {
 
 module frame_box() {
 	difference() {
-		roundedcube([frame_x, frame_y, frame_z], center=true, radius=3);
+		points = [ [(frame_x/2)-3, (frame_y/2)-3, 0], [-(frame_x/2)+3, (frame_y/2)-3, 0],
+			[(frame_x/2)-3, -(frame_y/2)+3, 0], [-(frame_x/2)+3, -(frame_y/2)+3, 0] ];
+		hull() {
+			for (p = points) {
+				translate(p) cylinder(r=3, h=frame_z, center=true);
+			}
+		}
 		// cut out the middle to make it a box
 		cube([panel_x-(panel_support_width*2), panel_y-(panel_support_width*2), frame_z+5], center=true);
 	}
@@ -255,6 +280,19 @@ module frame() {
 		translate([-panel_to_frame_point_x, panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([panel_to_frame_point_x, -panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
 		translate([-panel_to_frame_point_x, -panel_to_frame_point_y, 0]) frame_hex_bolt_hole();
+
+		// comfort bevel
+		translate([0, -frame_y/2, frame_z/2]) rotate([45, 0, 0]) cube([frame_x+0.01, 4, 4], center=true);
+
+		// slightly larger holes than the posts in the base_panel
+		translate([panel_to_frame_point_x, panel_to_frame_point_y, frame_z/2-panel_z-5])
+			scale([1.45, 1.45, 0.2]) frame_hex_bolt_hole();
+		translate([-panel_to_frame_point_x, panel_to_frame_point_y, frame_z/2-panel_z-5])
+			scale([1.45, 1.45, 0.2]) frame_hex_bolt_hole();
+		translate([panel_to_frame_point_x, -panel_to_frame_point_y, frame_z/2-panel_z-5])
+			scale([1.45, 1.45, 0.2]) frame_hex_bolt_hole();
+		translate([-panel_to_frame_point_x, -panel_to_frame_point_y, frame_z/2-panel_z-5])
+			scale([1.45, 1.45, 0.2]) frame_hex_bolt_hole();
 	}
 }
 

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

@@ -5,7 +5,7 @@
 
 include <parameters.scad>
 include <components.scad>
-use <top-panel-middle-dir_arc-plus-w-30mm.scad>
+use <top-panel-overhang-middle-dir_arc-plus-w-30mm.scad>
 
 module top_panel_middle_dir_arc_w_30mm_with_mount() {
 	top_panel_middle_dir_arc_w_30mm();

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

@@ -5,7 +5,7 @@
 
 include <parameters.scad>
 include <components.scad>
-use <top-panel-right-sega-2p-plus-one-plus-control-with-mount.scad>
+use <top-panel-overhang-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() {

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

@@ -5,7 +5,7 @@
 
 include <parameters.scad>
 include <components.scad>
-use <top-panel-right-sega-2p-plus-one-plus-control.scad>
+use <top-panel-overhang-right-sega-2p-plus-one-plus-control.scad>
 
 module top_panel_right_sega_2p_plus_one_plus_control_with_mount() {
 	top_panel_right_sega_2p_plus_one_plus_control();

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

@@ -5,7 +5,7 @@
 
 include <parameters.scad>
 include <components.scad>
-use <top-panel-right-sega-2p-plus-one.scad>
+use <top-panel-overhang-right-sega-2p-plus-one.scad>
 
 module top_panel_right_sega_2p_plus_one_with_mount() {
 	top_panel_right_sega_2p_plus_one();