update ergogen file, clearer naming

2 files changed, 46 insertions, 47 deletions

diff --git a/ergogen_fpkb.txt b/ergogen_fpkb_v2.yaml
index 57aab13..0d8b7df 100644
--- a/ergogen_fpkb.txt
+++ b/ergogen_fpkb_v2.yaml
@@ -6,34 +6,34 @@ points:
           rows.top.bind: [1, 4, 0, 1]
           rows.home.bind: [0, 1, 0, 1]
           rows.bottom.bind: [0, 1, 1, 1]
-          rotate: 10
+          key.splay: 10
         ring:
-          stagger: 0.66cy
+          key.stagger: 0.66cy
           rows.top.bind: [1,4,0,1]
           rows.home.bind: [0,3,0,2]
           rows.bottom.bind: [0,1,1,1.5]
-          rotate: -5
-          spread: cx+1
+          key.splay: -5
+          key.spread: cx+1
         middle:
-          stagger: 0.25cy
+          key.stagger: 0.25cy
           rows.top.bind: [1,1,0,1]
           rows.home.bind: [1,3,0,2]
           rows.bottom.bind: [0,3,1,3]
-          rotate: -5
-          spread: cx+1
+          key.splay: -5
+          key.spread: cx+1
         index:
-          stagger: -0.25cy
+          key.stagger: -0.25cy
           rows.top.bind: [1,1,0,5]
           rows.home.bind: [0,2,0,2]
           rows.bottom.bind: [0,2,1,1]
-          rotate: -5
-          spread: cx+0.7
+          key.splay: -5
+          key.spread: cx+0.7
         inner:
-          stagger: -0.2cy
+          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]
-          spread: cx
+          key.spread: cx
       rows:
         bottom.padding: cy
         home.padding: cy
@@ -48,44 +48,44 @@ points:
           key.name: thumb_tucky
           rows.home.bind: [12,6,1,1]
         reachy:
-          spread: 1.0cx
-          rotate: -15
-          origin: [-0.5cx, -0.5cy]
+          key.spread: 1.0cx
+          key.splay: -15
+          key.origin: [-0.5cx, -0.5cy]
           key.name: thumb_reachy
           rows.home.bind: [1,1,1,1]
-  key:
-    footprints:
-      - type: choc
-        nets:
-          from: GND
-          to: =name
-        params:
-          reverse: true
-          keycaps: true
-          hotswap: false
 outlines:
-  exports:
-    raw:
-      - type: keys
-        side: left
-        size: [1cx, 1cy]
-    cutout:
-      - type: outline
-        name: raw
-        fillet: 1
+  raw:
+    - what: rectangle
+      where: true
+      bound: true
+      asym: left
+      size: [1cx, 1cy]
+  cutout:
+    - what: outline
+      name: raw
+      fillet: 1
 pcbs:
   fpkb_v2:
     outlines:
       main:
         outline: cutout
     footprints:
+      switches:
+        what: choc
+        where: true
+        params:
+          from: "{{name}}"
+          to: GND
+          reverse: true
+          keycaps: true
+          hotswap: false
       promicro:
-        type: promicro
-        anchor:
+        what: promicro
+        where:
           ref: matrix_inner_home
           shift: [1cx+1.5, 0.5cy]
           rotate: -90
-        nets:
+        params:
           P20: matrix_inner_top
           P19: matrix_index_top
           P18: matrix_middle_top
@@ -94,26 +94,25 @@ pcbs:
           P16: matrix_inner_home
           P10: matrix_index_home
           P1: matrix_middle_home
-          P0: matrix_rign_home
+          P0: matrix_ring_home
           P2: matrix_pinky_home
-          P3: matrix_pink_bottom
+          P3: matrix_pinky_bottom
           P4: matrix_ring_bottom
           P5: matrix_middle_bottom
-          P6: matrix_inner_bottom
-          P7: matrix_index_bottom
+          P7: matrix_inner_bottom
+          P6: matrix_index_bottom
           P8: thumb_tucky
           P9: thumb_reachy
       trrs:
-        type: trrs
-        nets:
+        what: trrs
+        params:
           A: GND
           B: GND
           C: P21
           D: VCC
-        anchor:
+          reverse: true
+          symmetric: true
+        where:
           ref: matrix_inner_bottom
           shift: [1+1.5cx, -0.4cy]
           rotate: -90
-        params:
-          reverse: true
-          symmetric: true
diff --git a/ergogen_fpkb_cherry.txt b/ergogen_fpkb_v4.yaml
index 16c5144..16c5144 100644
--- a/ergogen_fpkb_cherry.txt
+++ b/ergogen_fpkb_v4.yaml