Move screw posts to case/screws.scad

4 files changed, 25 insertions, 23 deletions

diff --git a/case/outline.scad b/case/outline.scad
index 78fcdf8..c48812c 100644
--- a/case/outline.scad
+++ b/case/outline.scad
@@ -1,3 +1,5 @@
+include <screws.scad>
+
 $fn = 72;
 
 translate([case_length_bottom, 0, 0])
@@ -15,7 +17,7 @@ intersection() {
         square([case_width_bottom, wall_width], false);
 
 
-        for (screw_post = top_case_screw_posts) {
+        for (screw_post = screw_posts_top_case) {
             x = screw_post[0];
             y = screw_post[1];
 
diff --git a/case/params.scad b/case/params.scad
index 36617b0..2935b4b 100644
--- a/case/params.scad
+++ b/case/params.scad
@@ -33,24 +33,3 @@ screw_post_diameter_outer  =  6.25;
 screw_post_corner_height   = 12.00;
 // Top case middle screw post height
 screw_post_middle_height   = 29.30;
-
-screw_post_lower_y_offset  = (keyboard_y_offset - 2 * wall_width) / 2 + wall_width;
-screw_post_middle_y_offset = screw_post_lower_y_offset  + 65.00;
-screw_post_upper_y_offset  = screw_post_middle_y_offset + 65.00;
-screw_post_x_offset        = (keyboard_x_offset - 2 * wall_width) / 2 + wall_width;
-
-top_case_screw_posts = [
-    /* Upper row */
-    [screw_post_x_offset,   screw_post_upper_y_offset, screw_post_corner_height],
-    [case_width_bottom / 2, case_length_bottom - 10.0, screw_post_middle_height],
-    [case_width_bottom - screw_post_x_offset, screw_post_upper_y_offset, screw_post_corner_height],
-
-    /* Middle row */
-    [screw_post_x_offset, screw_post_middle_y_offset, screw_post_corner_height],
-    [case_width_bottom - screw_post_x_offset, screw_post_middle_y_offset, screw_post_corner_height],
-
-    /* Bottom row */
-    [screw_post_x_offset, screw_post_lower_y_offset, screw_post_corner_height],
-    [case_width_bottom / 2, screw_post_lower_y_offset, screw_post_corner_height],
-    [case_width_bottom - screw_post_x_offset, screw_post_lower_y_offset, screw_post_corner_height]
-];
diff --git a/case/screws.scad b/case/screws.scad
new file mode 100644
index 0000000..657c11c
--- /dev/null
+++ b/case/screws.scad
@@ -0,0 +1,20 @@
+screw_post_lower_y_offset  = (keyboard_y_offset - 2 * wall_width) / 2 + wall_width;
+screw_post_middle_y_offset = screw_post_lower_y_offset  + 65.00;
+screw_post_upper_y_offset  = screw_post_middle_y_offset + 65.00;
+screw_post_x_offset        = (keyboard_x_offset - 2 * wall_width) / 2 + wall_width;
+
+screw_posts_top_case = [
+    /* Upper row */
+    [screw_post_x_offset,   screw_post_upper_y_offset, screw_post_corner_height],
+    [case_width_bottom / 2, case_length_bottom - 10.0, screw_post_middle_height],
+    [case_width_bottom - screw_post_x_offset, screw_post_upper_y_offset, screw_post_corner_height],
+
+    /* Middle row */
+    [screw_post_x_offset, screw_post_middle_y_offset, screw_post_corner_height],
+    [case_width_bottom - screw_post_x_offset, screw_post_middle_y_offset, screw_post_corner_height],
+
+    /* Bottom row */
+    [screw_post_x_offset, screw_post_lower_y_offset, screw_post_corner_height],
+    [case_width_bottom / 2, screw_post_lower_y_offset, screw_post_corner_height],
+    [case_width_bottom - screw_post_x_offset, screw_post_lower_y_offset, screw_post_corner_height]
+];
diff --git a/case/top.scad b/case/top.scad
index 8482ee9..b9c86e7 100644
--- a/case/top.scad
+++ b/case/top.scad
@@ -1,6 +1,7 @@
 $fn = 72;
 
 include <support.scad>
+include <screws.scad>
 include <keyboard.scad>
 include <logo.scad>
 
@@ -64,7 +65,7 @@ module top_case(with_keyboard=false) {
             }
         }
 
-        for (post = top_case_screw_posts) {
+        for (post = screw_posts_top_case) {
             translate([post[0], post[1], wall_height - wall_width - post[2]])
             screw_post(post[2] + eps);
         }