From b015d84056eebef09c92aaf1633af7e4ed0e8750 Mon Sep 17 00:00:00 2001
From: "Brian S. Stephan" <bss@incorporeal.org>
Date: Tue, 4 Mar 2025 20:42:21 -0600
Subject: [PATCH] remove front-or-back-longish.scad, but use the piece
elsewhere
the piece was not meant to be printed (at least not until/unless there
is a side that extends out the extra length of the front and back, which
seems unlikely), but the piece is used to create the inner wall that
juts out through windowed pieces, so we're going to keep it and just
stash it in front-or-back.scad
Signed-off-by: Brian S. Stephan <bss@incorporeal.org>
---
...-or-back-inner-wall-for-horiz-stripes.scad | 2 +-
.../pieces/front-or-back-inner-wall.scad | 26 ++++++++++++++++
src/frames/pieces/front-or-back-longish.scad | 30 -------------------
3 files changed, 27 insertions(+), 31 deletions(-)
delete mode 100644 src/frames/pieces/front-or-back-longish.scad
diff --git a/src/frames/pieces/front-or-back-inner-wall-for-horiz-stripes.scad b/src/frames/pieces/front-or-back-inner-wall-for-horiz-stripes.scad
index 1f02e56..25edb4f 100644
--- a/src/frames/pieces/front-or-back-inner-wall-for-horiz-stripes.scad
+++ b/src/frames/pieces/front-or-back-inner-wall-for-horiz-stripes.scad
@@ -6,8 +6,8 @@
include <parameters.scad>
include <components.scad>
+use <front-or-back.scad>
use <front-or-back-inner-wall.scad>
-use <front-or-back-longish.scad>
use <front-or-back-windowed-horiz-stripes.scad>
// for stability's sake, this piece juts out a bit from the outside of the wall, so we
diff --git a/src/frames/pieces/front-or-back-inner-wall.scad b/src/frames/pieces/front-or-back-inner-wall.scad
index 47b70de..4146383 100644
--- a/src/frames/pieces/front-or-back-inner-wall.scad
+++ b/src/frames/pieces/front-or-back-inner-wall.scad
@@ -36,4 +36,30 @@ module front_or_back_inner_wall_frame_piece() {
translate([0, 0, 50]) rotate([90, 0, 0]) front_or_back_inner_wall_frame_base_piece();
}
+// this is here for use in inner wall pieces, but unlike the side longish piece (in its own
+// .scad), front_or_back_longish_frame_piece is not printable so we'll just stash it here
+module front_or_back_frame_piece_wall() {
+ // get a slice of the whole wall, to use it for making the extended version
+ difference() {
+ front_or_back_frame_piece();
+ cube([frame_x, frame_y-frame_wall*2, frame_z], center=true);
+ }
+}
+
+// this is here for use in inner wall pieces, but unlike the side longish piece (in its own
+// .scad), front_or_back_longish_frame_piece is not printable so we'll just stash it here
+module front_or_back_frame_piece_extension() {
+ hull() {
+ front_or_back_frame_piece_wall();
+ translate([0, -frame_bevel_height*2, 0]) front_or_back_frame_piece_wall();
+ }
+}
+
+// this is here for use in inner wall pieces, but unlike the side longish piece (in its own
+// .scad), front_or_back_longish_frame_piece is not printable so we'll just stash it here
+module front_or_back_longish_frame_piece() {
+ front_or_back_frame_piece_extension();
+ front_or_back_frame_piece();
+}
+
front_or_back_inner_wall_frame_piece();
diff --git a/src/frames/pieces/front-or-back-longish.scad b/src/frames/pieces/front-or-back-longish.scad
deleted file mode 100644
index b83bfc4..0000000
--- a/src/frames/pieces/front-or-back-longish.scad
+++ /dev/null
@@ -1,30 +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 <front-or-back.scad>
-
-module front_or_back_frame_piece_wall() {
- // get a slice of the whole wall, to use it for making the extended version
- difference() {
- front_or_back_frame_piece();
- cube([frame_x, frame_y-frame_wall*2, frame_z], center=true);
- }
-}
-
-module front_or_back_frame_piece_extension() {
- hull() {
- front_or_back_frame_piece_wall();
- translate([0, -frame_bevel_height*2, 0]) front_or_back_frame_piece_wall();
- }
-}
-
-module front_or_back_longish_frame_piece() {
- front_or_back_frame_piece_extension();
- front_or_back_frame_piece();
-}
-
-front_or_back_longish_frame_piece();