cleanup

23creus.yaml

@@ -1,270 +0,0 @@
-units:
-  kx: cx
-  ky: cy
-  px: 2
-  py: 2
-  step: .5
-
-points:
-  key:
-    footprints:
-      mx_hotswap:
-        type: choc
-        params:
-          hotswap: true
-          reverse: false
-          keycaps: true
-        nets:
-          from: =colrow
-          to: =column_net
-      diode:
-        type: diode
-        nets:
-          from: =colrow
-          to: =row_net
-        anchor:
-          shift: [0, -5]
-          rotate: 180
-
-  zones:
-    matrix:
-      columns:
-        pinky:
-          key:
-            column_net: P21
-            mirror: { column_net: P2 }
-        ring:
-          spread: kx + step
-          stagger: 4
-          key:
-            column_net: P20
-            mirror: { column_net: P3 }
-        middle:
-          spread: kx + step
-          stagger: 5
-          key:
-            column_net: P19
-            mirror: { column_net: P4 }
-        index:
-          spread: kx + step
-          stagger: -5
-          key:
-            column_net: P18
-            mirror: { column_net: P5 }
-        inner:
-          spread: kx + step
-          stagger: -6
-          key:
-            column_net: P15
-            mirror: { column_net: P6 }
-        thumb:
-          spread: kx + step
-          stagger: 10
-          row_overrides:
-            bottom:
-          key:
-            column_net: P14
-            mirror: { column_net: P7}
-      rows:
-        bottom:
-          row_net: P16
-        home:
-          spread: ky + step
-          row_net: P10
-        top:
-          spread: ky + step
-          row_net: P9
-        num:
-          spread: ky + step
-          row_net: P8
-
-  rotate: -23
-  mirror:
-    ref: matrix_thumb_bottom
-    distance: 42
-
-outlines:
-  exports:
-    # outer border
-    outer:
-      - type: polygon
-        points:
-          - ref: matrix_inner_num
-            shift: [10, 10]
-          - ref: matrix_middle_num
-            shift: [10, 10]
-          - ref: matrix_middle_num
-            shift: [-10, 10]
-          - ref: matrix_pinky_num
-            shift: [-10, 10]
-          - ref: matrix_pinky_bottom
-            shift: [-10, -10]
-          - ref: matrix_pinky_bottom
-            shift: [10, -10]
-          - ref: matrix_inner_bottom
-            shift: [-10, -10]
-          - ref: matrix_inner_bottom
-            shift: [10, -10]
-          - ref: mirror_matrix_inner_bottom
-            shift: [10, -10]
-          - ref: mirror_matrix_inner_bottom
-            shift: [-10, -10]
-          - ref: mirror_matrix_pinky_bottom
-            shift: [10, -10]
-          - ref: mirror_matrix_pinky_bottom
-            shift: [-10, -10]
-          - ref: mirror_matrix_pinky_num
-            shift: [-10, 10]
-          - ref: mirror_matrix_middle_num
-            shift: [-10, 10]
-          - ref: mirror_matrix_middle_num
-            shift: [10, 10]
-          - ref: mirror_matrix_inner_num
-            shift: [10, 10]
-
-    farinner:
-      - type: polygon
-        points:
-          - ref: matrix_inner_num
-            shift: [10, 10.3]
-          - ref: matrix_middle_num
-            shift: [10.3, 10.3]
-          - ref: matrix_middle_num
-            shift: [-10.3, 10.3]
-          - ref: matrix_pinky_num
-            shift: [-10.3, 10.3]
-          - ref: matrix_pinky_bottom
-            shift: [-10.3, -10.3]
-          - ref: matrix_pinky_bottom
-            shift: [10.3, -10.3]
-          - ref: matrix_inner_bottom
-            shift: [-10.3, -10.3]
-          - ref: matrix_inner_bottom
-            shift: [10.3, -10.3]
-          - ref: mirror_matrix_inner_bottom
-            shift: [10.3, -10.3]
-          - ref: mirror_matrix_inner_bottom
-            shift: [-10.3, -10.3]
-          - ref: mirror_matrix_pinky_bottom
-            shift: [10.3, -10.3]
-          - ref: mirror_matrix_pinky_bottom
-            shift: [-10.3, -10.3]
-          - ref: mirror_matrix_pinky_num
-            shift: [-10.3, 10.3]
-          - ref: mirror_matrix_middle_num
-            shift: [-10.3, 10.3]
-          - ref: mirror_matrix_middle_num
-            shift: [10.3, 10.3]
-          - ref: mirror_matrix_inner_num
-            shift: [10, 10.3]
-    farouter:
-      - type: polygon
-        points:
-          - ref: matrix_inner_num
-            shift: [10, 12]
-          - ref: matrix_middle_num
-            shift: [12, 12]
-          - ref: matrix_middle_num
-            shift: [-12, 12]
-          - ref: matrix_pinky_num
-            shift: [-12, 12]
-          - ref: matrix_pinky_bottom
-            shift: [-12, -12]
-          - ref: matrix_pinky_bottom
-            shift: [12, -12]
-          - ref: matrix_inner_bottom
-            shift: [-12, -12]
-          - ref: matrix_inner_bottom
-            shift: [12, -12]
-          - ref: mirror_matrix_inner_bottom
-            shift: [12, -12]
-          - ref: mirror_matrix_inner_bottom
-            shift: [-12, -12]
-          - ref: mirror_matrix_pinky_bottom
-            shift: [12, -12]
-          - ref: mirror_matrix_pinky_bottom
-            shift: [-12, -12]
-          - ref: mirror_matrix_pinky_num
-            shift: [-12, 12]
-          - ref: mirror_matrix_middle_num
-            shift: [-12, 12]
-          - ref: mirror_matrix_middle_num
-            shift: [12, 12]
-          - ref: mirror_matrix_inner_num
-            shift: [10, 12]
-      #- type: keys
-      #  side: both
-      #  size: 20
-      #  corner: 1
-      #- type: polygon
-      #  points:
-      #    - ref: matrix_inner_num
-      #      shift: [0, -5]
-      #    - ref: matrix_thumb_bottom
-      #      shift: [-10, -10]
-      #    - ref: mirror_matrix_thumb_bottom
-      #      shift: [-10, -10]
-      #    - ref: mirror_matrix_inner_num
-      #      shift: [0, -5]
-    chip:
-      # cutout for the chip itself
-      - type: rectangle
-        size: [18, 50]
-        anchor:
-          ref: [matrix_inner_top, mirror_matrix_inner_top]
-          shift: [-9, -24.5]
-    # 14mm holes for cherry switches
-    keyholes:
-      - type: keys
-        side: both
-        size: 13.5
-        bound: false
-    # switchplate
-    switchplate:
-      - outer
-      - -keyholes
-      - -chip
-
-cases:
-  switchp:
-    - type: outline
-      name: switchplate
-      extrude: 1.3
-  outercase:
-    - type: outline
-      name: farouter
-      extrude: 6.3
-    - type: outline
-      name: farinner
-      extrude: 5
-      shift: [0, 0, 1.3]
-      operation: subtract
-    - type: outline
-      name: keyholes
-      extrude: 1.3
-      operation: subtract
-    - type: outline
-      name: chip
-      extrude: 6.3
-      operation: subtract
-
-pcbs:
-  main:
-    outlines:
-      outer:
-        outline: outer
-    footprints:
-      reset:
-        type: button
-        nets:
-          from: RST
-          to: GND
-        anchor:
-          ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
-          rotate: 90
-      mcu:
-        type: promicro
-        anchor:
-          rotate: 270
-          ref: [matrix_inner_top, mirror_matrix_inner_top]
-          shift: [0, -4]

23treus.yaml

@@ -23,45 +23,33 @@ points:
     matrix:
       columns:
         pinky:
-          key:
+          key: { column_net: P20 }
-            column_net: P21
-            mirror: { column_net: P2 }
         ring:
           stagger: 4
-          key:
+          key: { column_net: P19 }
-            column_net: P20
-            mirror: { column_net: P3 }
         middle:
           stagger: 5
-          key:
+          key: { column_net: P18 }
-            column_net: P19
-            mirror: { column_net: P4 }
         index:
           stagger: -5
-          key:
+          key: { column_net: P15 }
-            column_net: P18
-            mirror: { column_net: P5 }
         inner:
           stagger: -6
-          key:
+          key: { column_net: P14 }
-            column_net: P15
-            mirror: { column_net: P6 }
         thumb:
           stagger: 10
           row_overrides:
             bottom:
-          key:
+          key: { column_net: P16 }
-            column_net: P14
-            mirror: { column_net: P7}
       rows:
         bottom:
-          row_net: P16
+          row_net: P6
         home:
-          row_net: P10
+          row_net: P5
         top:
-          row_net: P9
+          row_net: P4
         num:
-          row_net: P8
+          row_net: P3
 
   rotate: -23
   mirror:
@@ -106,20 +94,7 @@ outlines:
             shift: [10, 10]
           - ref: mirror_matrix_inner_num
             shift: [10, 10]
-      #- type: keys
+
-      #  side: both
-      #  size: 20
-      #  corner: 1
-      #- type: polygon
-      #  points:
-      #    - ref: matrix_inner_num
-      #      shift: [0, -5]
-      #    - ref: matrix_thumb_bottom
-      #      shift: [-10, -10]
-      #    - ref: mirror_matrix_thumb_bottom
-      #      shift: [-10, -10]
-      #    - ref: mirror_matrix_inner_num
-      #      shift: [0, -5]
     chip:
       # cutout for the chip itself
       - type: rectangle
@@ -129,10 +104,40 @@ outlines:
           shift: [-9, -24.5]
       # cutout for the cable (looks)
       - type: rectangle
-        size: [8, 50]
+        size: [18, 50]
         anchor:
           ref: [matrix_inner_top, mirror_matrix_inner_top]
-          shift: [-4, -24.5]
+          shift: [-9, -24.5]
+      # reset button
+      - type: polygon
+        points:
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [-5, 5]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [-5, -5]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [-1, -5]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [-1, -4]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [-4, -4]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [-4, 4]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [4, 4]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [4, -4]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [1, -4]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [1, -5]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [5, -5]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [5, -5]
+          - ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+            shift: [5, 5]
+
     # 14mm holes for cherry switches
     keyholes:
       - type: keys
@@ -151,6 +156,35 @@ pcbs:
       outer:
         outline: outer
     footprints:
+      onoff:
+        type: slider
+        nets:
+          from: P1
+          to: battery-
+        anchor:
+          rotate: 180
+          ref: matrix_middle_bottom
+          shift: [0, -14]
+      battery+:
+        type: pad
+        params:
+          text: "+"
+          back: false
+        nets:
+          net: RAW
+        anchor:
+          ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+          shift: [4, 14]
+      battery-:
+        type: pad
+        params:
+          text: "-"
+          back: false
+        nets:
+          net: battery-
+        anchor:
+          ref: [matrix_inner_bottom, mirror_matrix_inner_bottom]
+          shift: [-4, 14]
       reset:
         type: button
         nets:

Makefile

@@ -1,5 +1,5 @@
 all: node_modules
-	node src/cli.js 23creus.yaml -o output
+	node src/cli.js 23treus.yaml -o output
 	cp output/pcbs/main.kicad_pcb kicad/45treus/
 
 node_modules: