Meatier screws

4 files changed, 35 insertions, 35 deletions

diff --git a/case/compact.scad b/case/compact.scad
index 9bceea8..870d446 100644
--- a/case/compact.scad
+++ b/case/compact.scad
@@ -31,8 +31,8 @@ module keyboard_base_plate(pcb_dimensions, pcb_screw_holes, switch_z_range) {
     pcb_clearance_edge   = 1.0;
     pcb_clearance_bottom = -switch_z_min - pcb_height + 0.5;
 
-    pcb_screw_diameter      = 1.5;
-    pcb_screw_hole_diameter = 1.5;
+    pcb_screw_diameter      = 2.5;
+    pcb_screw_hole_diameter = 2.5;
     pcb_screw_height        = 3.0;
 
     thickness     = 1.75;
diff --git a/case/top.scad b/case/top.scad
index 3c0791f..73e7b4d 100644
--- a/case/top.scad
+++ b/case/top.scad
@@ -121,7 +121,7 @@ module top_case(key_switch_sizes, pcb_screw_holes) {
     }
 
     module screw_holes() {
-        pcb_screw_diameter = 1.5;
+        pcb_screw_diameter = 2.5;
 
         for (screw_hole = pcb_screw_holes) {
             translate([screw_hole[0], screw_hole[1], 0])
@@ -130,7 +130,7 @@ module top_case(key_switch_sizes, pcb_screw_holes) {
     }
 
     module keyboard_deck() {
-        key_switch_footprint = [16.0, 16.0];
+        key_switch_footprint = [15.25, 15.25];
 
         function add(v)            = [for(p=v) 1]*v;
         function slice(v, x, y)    = [for (i=[x:y]) v[i]];
diff --git a/pcb/xantronix-z32.kicad_pcb b/pcb/xantronix-z32.kicad_pcb
index fa4c2b3..9fb2025 100644
--- a/pcb/xantronix-z32.kicad_pcb
+++ b/pcb/xantronix-z32.kicad_pcb
@@ -926,17 +926,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp 13c983b2-868d-48f0-ba1d-0fcbd0a6ef99)
+      (tstamp 22e112fd-67bc-4ad5-8222-e89cc8c89bca)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp ae6b31d2-aaa8-4872-b4bf-fd3467697a4a)
+      (tstamp 91b5d4fc-e97d-49ce-9012-f76ea9e4efe1)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 7ab10947-7c36-44f2-84a6-66beb27e17fc)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp ff449f9a-1aaa-4ece-954c-d583ed31b291))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp 95d593dc-01b3-445d-a9db-6dbcf24ac8e2))
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
@@ -1083,17 +1083,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp 3690ef45-60be-4a7d-89b6-4e1dc3844bef)
+      (tstamp 0a71139d-43ef-4ce7-854b-256fd361e28b)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 74922fbf-9d0e-4dac-b856-6066f5d8a40c)
+      (tstamp 4c460eb0-3c24-445a-b733-9c60b89efdca)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 0c566aa7-038d-412f-8d9f-583abadc9dab)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 7c17bc21-c154-41c7-a94b-5e20646e9a8e))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp 2ac65096-a868-48d3-a043-47b0ab7f6bfd))
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
@@ -1930,17 +1930,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp 7b185aaf-4462-49de-a6e6-52d40f2cf6d6)
+      (tstamp 607ae693-d756-4427-b110-7176283da012)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 4fe225b8-b89d-4ec4-ba07-ba46102fd9ab)
+      (tstamp 6b21cdaa-28e2-4a34-b3af-898c042b99f3)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 92d866ec-a7c9-4e0d-9cdd-0ad716fc8a46)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 81d12b99-3505-4df6-825d-8b3edf2c037d))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp 66025372-c027-4a01-b6e8-999d54ef9c41))
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
@@ -2432,17 +2432,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp abd4b954-a441-48f4-8990-6d7a6bc8aa35)
+      (tstamp d443910f-94ed-4041-ad95-833e4205ef90)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 6a7fe32b-4782-41f8-a365-c9b2c4c5273d)
+      (tstamp d27f4cd9-2f73-4b3a-a44f-44b8d5da2f53)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 89ec9c7f-63b5-4815-be46-cf9f274f2b2b)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 3aa1a3b6-03b4-445a-aeb4-70eae4297b03))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp 43100f6c-ac68-4f57-a627-cfb8ef4c2669))
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
@@ -2520,17 +2520,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp 67f6f919-a1b1-40ea-8764-146a75782797)
+      (tstamp f592abf9-7a75-4671-a86a-2082e0c4b04d)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0a061577-4596-4bf3-8459-7f116ee05846)
+      (tstamp 0a10c819-b2c7-493d-8f09-91d48ec81b27)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 17ddde39-ccb7-4e4c-8178-6e3991fb9c67)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 968d2731-2329-4d24-b491-5fda41c7d673))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp 18d8fd45-0248-4eb0-8af9-e5d426fd6e22))
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
@@ -3298,17 +3298,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp ce5cc242-596b-4b9b-b93d-678b2b2f444b)
+      (tstamp 2287d465-083e-43b3-9cbd-ecf0bec08ba7)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 009834ec-34bc-4032-ab59-0fd4a1f9e06f)
+      (tstamp 5fefd967-ee3e-4852-a542-591ddeafab85)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 997ebbc1-0dd1-4ce9-95c2-7b73019a2fb2)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 77836674-85f5-4685-9f75-a65cfa135bfe))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp a05d4419-0c88-4257-b948-17102f052209))
   )
 
   (footprint "xantronix-z32:ScrewMount" (layer "F.Cu")
@@ -3317,17 +3317,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp 2f5cbda0-64f6-4d6a-bb7a-d9120fbcc4a9)
+      (tstamp ac4e37a4-2447-4b6b-b3cd-13fc222f4f06)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp dd257643-0338-4c04-9e3b-e86d5d20659f)
+      (tstamp ca70b825-258f-44b1-a656-0f90fba8fdf1)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 9df87e47-95d4-433e-86bd-53498d781166)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 1f05b80f-af9e-4274-a270-cc5e6b0599b6))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp e999287c-5873-41a7-8229-490a6a0e16ca))
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
@@ -3474,17 +3474,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp d7d2737f-84e0-4738-b5c6-82f07f71a4d8)
+      (tstamp daf98c0b-661f-41f7-936b-5cd51f787497)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 51758f7e-dbea-45c5-b927-a6fd02aca037)
+      (tstamp 246f6688-ca19-444a-a080-5d98a6382938)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3283c529-a033-41e3-a634-89c1ca084e3e)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 3d403869-c10b-4747-94fe-c6a450546c2f))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp dd91764b-e99b-4764-be24-168322db64d6))
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB" (layer "F.Cu")
@@ -4183,17 +4183,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp 3add60e0-d64e-40f8-8b77-7d013395fa07)
+      (tstamp 9846e391-4854-4f34-a1e6-7a14d1f61a3e)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 4e1e0377-83ab-4ccc-85b5-476263751930)
+      (tstamp d3b6d42e-722c-4c3a-a390-7ac611fadf44)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 03cd5ef9-9b51-4dc4-88c6-af6288e120b1)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 7cd01661-adfb-4d9a-a899-de6882566390))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp ccae0485-10db-40c4-ad52-37d298a90a22))
   )
 
   (footprint "xantronix-z32:ScrewMount" (layer "F.Cu")
@@ -4202,17 +4202,17 @@
     (attr smd)
     (fp_text reference "REF**" (at 0 -0.5 unlocked) (layer "F.SilkS") hide
         (effects (font (size 1 1) (thickness 0.1)))
-      (tstamp a506efff-467b-46b1-a056-070d51e2abd5)
+      (tstamp cdc05c0e-220d-45c4-af67-85c4504b26b9)
     )
     (fp_text value "ScrewMount" (at 0 1 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 2fcd3346-ab56-4048-ac0f-82e30a8118c9)
+      (tstamp 53d7c2f3-4e86-42d5-a9dc-275bef91ec7e)
     )
     (fp_text user "${REFERENCE}" (at 0 2.5 unlocked) (layer "F.Fab") hide
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp ce43d3b1-ed83-4175-a61e-bc2d517315b9)
     )
-    (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp 2d8dcf5f-d9b6-4b9a-ac91-06b63d9f53cc))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp f8b1e048-1fce-4db2-b7be-afd63b67d187))
   )
 
   (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.25u_PCB" (layer "F.Cu")
diff --git a/pcb/xantronix-z32.pretty/ScrewMount.kicad_mod b/pcb/xantronix-z32.pretty/ScrewMount.kicad_mod
index f8ac9b4..834571d 100644
--- a/pcb/xantronix-z32.pretty/ScrewMount.kicad_mod
+++ b/pcb/xantronix-z32.pretty/ScrewMount.kicad_mod
@@ -9,5 +9,5 @@
       (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 5ad96c5d-c721-4911-b398-d12a67d73275)
   )
-  (pad "" np_thru_hole circle (at 0 0) (size 1.7 1.7) (drill 1.55) (layers "*.Mask") (tstamp b1381882-20c8-443e-aa5e-cbb8168b4051))
+  (pad "" np_thru_hole circle (at 0 0) (size 2.6 2.6) (drill 2.5) (layers "*.Mask") (tstamp b1381882-20c8-443e-aa5e-cbb8168b4051))
 )