Well that was a slog

1 files changed, 56 insertions, 53 deletions

diff --git a/case/case.scad b/case/case.scad
index 55f3039..44190fc 100644
--- a/case/case.scad
+++ b/case/case.scad
@@ -98,126 +98,129 @@ module keyboard_base_plate(pcb_width, pcb_length) {
         
         for (y = horizontal) {
             side([0 - pcb_clearance_edge, y, 0],
-                 [pcb_width, width, height]);
+                 [bottom_width, width, height]);
         }
         
         for (x = vertical) {
             side([x, 0 - pcb_clearance_edge, 0],
-                 [width, pcb_length, height]);
+                 [width, bottom_length, height]);
         }
     }
     
     /* Upper right corner */
-    /*round_corner([thickness + pcb_clearance_edge + pcb_width,
-                  thickness + pcb_clearance_edge + pcb_length,
+    round_corner([pcb_clearance_edge + thickness + pcb_width - corner_radius,
+                  pcb_clearance_edge + thickness + pcb_length - corner_radius,
                  -thickness/2],
-                 [90, 90, 90]);*/
+                 [90, 90, 90]);
 
     /* Lower right corner */
-    /*round_corner([    thickness + pcb_clearance_edge + pcb_width,
-                  0 - thickness - pcb_clearance_edge,
-                     -thickness/2],
-                 [180, 90, 90]);*/
+    round_corner([ pcb_clearance_edge + thickness + pcb_width - corner_radius,
+                  -pcb_clearance_edge - thickness + corner_radius,
+                  -thickness/2],
+                 [180, 90, 90]);
 
     /* Lower left corner */
-    /*round_corner([0 - thickness - pcb_clearance_edge,
-                  0 - thickness - pcb_clearance_edge,
-                     -thickness/2],
-                 [-90, 90, 90]);*/
+    round_corner([-pcb_clearance_edge - thickness + corner_radius,
+                  -pcb_clearance_edge - thickness + corner_radius,
+                  -thickness/2],
+                 [-90, 90, 90]);
 
     /* Upper left corner */
-    /*round_corner([0 - thickness - pcb_clearance_edge,
-                      thickness + pcb_clearance_edge + pcb_length,
+    round_corner([-pcb_clearance_edge - thickness + corner_radius,
+                   pcb_clearance_edge + thickness + pcb_length - corner_radius,
                      -thickness/2],
-                 [0, 90, 90]);*/
+                 [0, 90, 90]);
 
     /* Upper edge */
-    /*round_edge([0 - thickness - pcb_clearance_edge,
-                    thickness + pcb_clearance_edge + pcb_length,
+    round_edge([0 - thickness - pcb_clearance_edge + corner_radius,
+                    thickness + pcb_clearance_edge + pcb_length - corner_radius,
                    -thickness/2],
                [0, 90, 0],
-               bottom_width);*/
+               bottom_width + 2 * corner_radius);
          
     /* Right edge */
-    /*round_edge([    thickness + pcb_clearance_edge + pcb_width,
-                0 - thickness - pcb_clearance_edge,
+    round_edge([    thickness + pcb_clearance_edge + pcb_width - corner_radius,
+                0 - thickness - pcb_clearance_edge + corner_radius,
                     -thickness/2],
                [270, 0, 0],
-               bottom_length);*/
+               bottom_length + 2 * corner_radius);
          
     /* Lower edge */
-    /*round_edge([0 - thickness - pcb_clearance_edge,
-                0 - thickness - pcb_clearance_edge,
+    round_edge([-pcb_clearance_edge - thickness + corner_radius,
+                -pcb_clearance_edge - thickness + corner_radius,
                     -thickness/2],
                [90, 180, 90],
-               bottom_width);*/
+               bottom_width + 2 * corner_radius);
          
     /* Left edge */
-    /*round_edge([0 - thickness - pcb_clearance_edge,
-                0 - thickness - pcb_clearance_edge,
+    round_edge([-pcb_clearance_edge - thickness + corner_radius,
+                -pcb_clearance_edge - thickness + corner_radius,
                    -thickness/2],
                [270, 90, 0],
-               bottom_length);*/
+               bottom_length + 2 * corner_radius);
 
     /* Upper right wall corner */
-    /*wall_corner([thickness + pcb_clearance_edge + pcb_width,
-                 thickness + pcb_clearance_edge + pcb_length,
+    wall_corner([thickness + pcb_clearance_edge + pcb_width - corner_radius,
+                 thickness + pcb_clearance_edge + pcb_length - corner_radius,
                 -thickness/2],
                 [0, 0, 0],
                 corner_radius,
-                wall_height);*/
+                wall_height);
                 
     /* Lower right wall corner */
-    /*wall_corner([    thickness + pcb_clearance_edge + pcb_width,
-                 0 - thickness - pcb_clearance_edge,
+    wall_corner([    thickness + pcb_clearance_edge + pcb_width - corner_radius,
+                 0 - thickness - pcb_clearance_edge + corner_radius,
                     -thickness/2],
                 [0, 0, 270],
                 corner_radius,
-                wall_height);*/
+                wall_height);
 
     /* Lower left wall corner */
-    /*wall_corner([0 - thickness - pcb_clearance_edge,
-                 0 - thickness - pcb_clearance_edge,
+    wall_corner([0 - thickness - pcb_clearance_edge + corner_radius,
+                 0 - thickness - pcb_clearance_edge + corner_radius,
                     -thickness/2],
                 [0, 0, 180],
                 corner_radius,
-                wall_height);*/
+                wall_height);
                 
     /* Upper left wall corner */
-    /*wall_corner([0 - thickness - pcb_clearance_edge,
-                     thickness + pcb_clearance_edge + pcb_length,
-                    -thickness/2],
+    wall_corner([-pcb_clearance_edge - corner_radius,
+                  pcb_clearance_edge + corner_radius + pcb_length,
+                 -thickness/2],
                 [0, 0, 90],
                 corner_radius,
-                wall_height);*/
+                wall_height);
  
     /* Upper wall */
-    side([-pcb_clearance_edge,
+    side([-pcb_clearance_edge - corner_radius,
            pcb_clearance_edge + pcb_length,
           -thickness/2],
-         [wall_width, thickness, wall_height]);
+         [wall_width + 2 * corner_radius, thickness, wall_height]);
           
     /* Right wall */
     side([ pcb_clearance_edge + pcb_width,
-          -pcb_clearance_edge,
+          -pcb_clearance_edge - corner_radius,
              -thickness/2],
-         [thickness, wall_length, wall_height]);
+         [thickness, wall_length + 2 * corner_radius, wall_height]);
           
     /* Lower wall */
-    side([-pcb_clearance_edge,
+    side([-pcb_clearance_edge - corner_radius,
           -pcb_clearance_edge - thickness,
              -thickness/2],
-         [wall_width, thickness, wall_height]);
+         [wall_width + 2 * corner_radius, thickness, wall_height]);
           
     /* Left wall */
-    side([-thickness - pcb_clearance_edge,
-                      -pcb_clearance_edge,
-             -thickness/2],
-         [thickness, wall_length, wall_height]);
+    side([-pcb_clearance_edge - thickness,
+          -pcb_clearance_edge - corner_radius,
+          -thickness/2],
+         [thickness, wall_length + 2 * corner_radius, wall_height]);
 
     /* Bottom plate */
-    side([-pcb_clearance_edge, -pcb_clearance_edge, -thickness],
-         [bottom_width, bottom_length, thickness]);
+    side([-pcb_clearance_edge - corner_radius,
+          -pcb_clearance_edge - corner_radius,
+          -thickness],
+         [bottom_width  + 2 * corner_radius,
+          bottom_length + 2 * corner_radius, thickness]);
           
     /* Screw holes */
     for (screw_hole = screw_holes) {