v5: space things slightly closer together (choc -> kail ulp)

2 files changed, 24 insertions, 22 deletions

diff --git a/ergogen/footprints/mx6c_ulp.js b/ergogen/footprints/mx6c_ulp.js
index a162889..17a1cd4 100644
--- a/ergogen/footprints/mx6c_ulp.js
+++ b/ergogen/footprints/mx6c_ulp.js
@@ -6,8 +6,8 @@ module.exports = {
         hotswap: false,
         include_silkscreen: true,
         include_keycaps: true,
-        keycap_width: 17.5,
-        keycap_height: 16.5,
+        keycap_width: 16,
+        keycap_height: 16,
         switch_3dmodel_filename: 'PG1316S.step',
         switch_3dmodel_xyz_offset: [-4.75, -6.25, -10.25], // [-5.45, 0, 3] for MX6C
         switch_3dmodel_xyz_rotation: [0,0,0], // [0, 0, -90] for MX6C
diff --git a/ergogen/fpkb_v5.yaml b/ergogen/fpkb_v5.yaml
index 92de5a0..3a84788 100644
--- a/ergogen/fpkb_v5.yaml
+++ b/ergogen/fpkb_v5.yaml
@@ -1,3 +1,5 @@
+units:
+  k: 16.5
 points:
   zones:
     matrix:
@@ -8,49 +10,49 @@ points:
           rows.bottom.bind: [0, 1, 1, 1]
           key.splay: 10
         ring:
-          key.stagger: 0.66cy
+          key.stagger: 0.66k
           rows.top.bind: [1,4,0,1]
           rows.home.bind: [0,3,0,2]
           rows.bottom.bind: [0,1,1,1.5]
           key.splay: -5
-          key.spread: cx+1
+          key.spread: k+0.66
         middle:
-          key.stagger: 0.25cy
+          key.stagger: 0.25k
           rows.top.bind: [1,1,0,1]
           rows.home.bind: [1,3,0,2]
           rows.bottom.bind: [0,3,1,3]
           key.splay: -5
-          key.spread: cx+1
+          key.spread: k+0.66
         index:
-          key.stagger: -0.25cy
+          key.stagger: -0.25k
           rows.top.bind: [1,1,0,5]
           rows.home.bind: [0,2,0,2]
           rows.bottom.bind: [0,2,1,1]
           key.splay: -5
-          key.spread: cx+0.7
+          key.spread: k+0.5
         inner:
-          key.stagger: -0.2cy
-          rows.top.bind: [1,2+1cx,0,1]
-          rows.home.bind: [0,2+1cx,0,0]
-          rows.bottom.bind: [0,2+1cx,1,1]
-          key.spread: cx
+          key.stagger: -0.2k
+          rows.top.bind: [1,2+1k,0,1]
+          rows.home.bind: [0,2+1k,0,0]
+          rows.bottom.bind: [0,2+1k,1,1]
+          key.spread: k
       rows:
-        bottom.padding: cy
-        home.padding: cy
-        top.padding: cy
+        bottom.padding: k
+        home.padding: k
+        top.padding: k
     thumb:
       anchor:
         ref: matrix_inner_bottom
-        shift: [0cx, -1.5cy]
+        shift: [0k, -1.5k]
         rotate: -10
       columns:
         tucky:
           key.name: thumb_tucky
           rows.home.bind: [12,6,1,1]
         reachy:
-          key.spread: 1.0cx
+          key.spread: k
           key.splay: -15
-          key.origin: [-0.5cx, -0.5cy]
+          key.origin: [-0.5k, -0.5k]
           key.name: thumb_reachy
           rows.home.bind: [1,1,1,1]
 outlines:
@@ -59,7 +61,7 @@ outlines:
       where: true
       bound: true
       asym: left
-      size: [1cx, 1cy]
+      size: [1k, 1k]
   cutout:
     - what: outline
       name: raw
@@ -83,7 +85,7 @@ pcbs:
         what: promicro
         where:
           ref: matrix_inner_home
-          shift: [1cx+1.5, 0.5cy]
+          shift: [1k+1.5, 0.5k]
           rotate: -90
         params:
           P20: matrix_inner_top
@@ -114,5 +116,5 @@ pcbs:
           symmetric: true
         where:
           ref: matrix_inner_bottom
-          shift: [1+1.5cx, -0.4cy]
+          shift: [1+1.5k, -0.4k]
           rotate: -90