Starting to move towards a diodeless solution option, no more

autorouting :(

Makefile

@@ -20,7 +20,7 @@ output/pcbs/%.dsn: output/pcbs/%.kicad_pcb
 
 output/routed_pcbs/%.ses: output/pcbs/%.dsn
 	mkdir -p $(shell dirname $@)
-	${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -jar /opt/freerouting_cli.jar -de $< -do $@
+	${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -jar /opt/freerouting_cli.jar -de $< -do $@ -mp 15 -us global
 
 output/routed_pcbs/%.kicad_pcb: output/routed_pcbs/%.ses output/pcbs/%.kicad_pcb
 	mkdir -p $(shell dirname $@)

build.sh

@@ -7,11 +7,10 @@ container_args="-w /board -v $(pwd):/board --rm"
 rm -rf output
 npm run gen
 ${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/export_dsn.py output/pcbs/main.kicad_pcb output/pcbs/main.dsn
-${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -jar /opt/freerouting_cli.jar -de output/pcbs/main.dsn -do output/pcbs/main.ses
+# ${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -jar /opt/freerouting_cli.jar -de output/pcbs/main.dsn -do output/pcbs/main.ses
-${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py output/pcbs/main.kicad_pcb output/pcbs/main.ses --output-file output/pcbs/main-routed.kicad_pcb
+# ${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py output/pcbs/main.kicad_pcb output/pcbs/main.ses --output-file output/pcbs/main-routed.kicad_pcb
-${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/run_drc.py output/pcbs/main-routed.kicad_pcb output/pcbs/drc/
+# ${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/run_drc.py output/pcbs/main-routed.kicad_pcb output/pcbs/drc/
 # pcbdraw also supports a style file as JSON
-${container_cmd} run ${container_args} yaqwsx/kikit:v0.7 pcbdraw --style builtin:set-white-enig.json output/pcbs/main-routed.kicad_pcb images/left.png
+# ${container_cmd} run ${container_args} yaqwsx/kikit:v0.7 pcbdraw --style builtin:set-white-enig.json output/pcbs/main-routed.kicad_pcb images/left.png
-${container_cmd} run ${container_args} yaqwsx/kikit:v0.7 pcbdraw -b --style builtin:set-white-enig.json output/pcbs/main-routed.kicad_pcb images/right.png
+# ${container_cmd} run ${container_args} yaqwsx/kikit:v0.7 pcbdraw -b --style builtin:set-white-enig.json output/pcbs/main-routed.kicad_pcb images/right.png
-${container_cmd} run ${container_args} yaqwsx/kikit:v0.7 kikit fab jlcpcb --no-assembly output/pcbs/main-routed.kicad_pcb production/pcb/main
+# ${container_cmd} run ${container_args} yaqwsx/kikit:v0.7 kikit fab jlcpcb --no-assembly output/pcbs/main-routed.kicad_pcb production/pcb/main
-

rae-dux.yaml

@@ -6,10 +6,12 @@ units:
 points:
   key:
     footprints:
-      choc_hotswap:
+      choc_soldered:
         type: choc
+        anchor:
+          rotate: 180
         params:
-          hotswap: true
+          hotswap: false
           reverse: true
           keycaps: true
         nets:
@@ -25,7 +27,7 @@ points:
           from: =colrow
           to: =row_net
         anchor:
-          shift: [0, -5]
+          shift: [0, 5]
   zones:
     matrix:
       # anchor:
@@ -34,7 +36,7 @@ points:
       columns:
         pinky:
           spread: 18
-          rotate: 20
+          rotate: 17
           origin: [0, -ky]
           key:
             bind: [0.1, 0.5 kx, 0.1, 0.1]
@@ -42,7 +44,7 @@ points:
         ring:
           spread: 18
           stagger: 2 ky /3
-          rotate: -10
+          rotate: -7
           origin: [0, -ky]
           key:
             bind: [0.1, 0.5 kx, 0.1, 0.1]
@@ -133,7 +135,7 @@ outlines:
           ref:
             - matrix_inner_top
           shift: [0 kx, -4.05 ky]
-        size: [32, 76.5]
+        size: [30, 76.5]
         corner: px
     base_outline:
       main:
@@ -170,108 +172,12 @@ pcbs:
             - matrix_inner_top
           shift: [20, -11]
           rotate: 270
-      mcu_r:
-        type: promicro
-        params:
-          orientation: down
-          batteryPins: true
-        anchor:
-          ref:
-            - matrix_inner_top
-          shift: [22.5, -12.25]
-          rotate: 270
-      pad_plus:
-        type: pad
-        anchor:
-          ref:
-            - matrix_inner_top
-          shift: [23, -18]
-          rotate: 0
-        params:
-          front: true
-          back: true
-          width: 1.5
-          height: 1.5
-          text: "B+"
-        nets:
-          net: Braw
-      pad_minus:
-        type: pad
-        anchor:
-          ref:
-            - matrix_inner_top
-          shift: [23, -15]
-          rotate: 0
-        params:
-          front: true
-          back: true
-          width: 1.5
-          height: 1.5
-          text: "B-"
-        nets:
-          net: Bminus
-      trrs_l:
-        type: trrs
-        anchor:
-          ref:
-            - matrix_inner_bottom
-          shift: [32, -15]
-          rotate: 270
-        params:
-          reverse: false
-          symmetric: false
-        # The naming of the nets on this footprint is different from the Corne schematics.
-        nets:
-          A: ""
-          B: VCC
-          C: GND
-          D: P0
-      trrs_r:
-        type: trrs
-        anchor:
-          ref:
-            - matrix_inner_bottom
-          shift: [32, -13]
-          rotate: 270
-        params:
-          reverse: true
-          symmetric: false
-        # The naming of the nets on this footprint is different from the Corne schematics.
-        nets:
-          A: ""
-          B: VCC
-          C: GND
-          D: P0
-      jumper_l:
-        type: jumper
-        anchor:
-          ref:
-            - matrix_inner_bottom
-          shift: [23.5, 0]
-          rotate: 270
-        params:
-          side: B
-        nets:
-          from: Braw
-          to: Bplus
-      jumper_r:
-        type: jumper
-        anchor:
-          ref:
-            - matrix_inner_bottom
-          shift: [23.5, 0]
-          rotate: 270
-        params:
-          side: F
-        nets:
-          from: Braw
-          to: Bplus
       slider_l:
         type: slider
         anchor:
           ref:
             - matrix_inner_bottom
-          shift: [30, 0]
+          shift: [28, 0]
           rotate: 270
         params:
           side: F
@@ -283,7 +189,7 @@ pcbs:
         anchor:
           ref:
             - matrix_inner_bottom
-          shift: [30, 0]
+          shift: [28, 0]
           rotate: 270
         params:
           side: B
@@ -295,7 +201,7 @@ pcbs:
         anchor:
           ref:
             - matrix_inner_bottom
-          shift: [ky, 0]
+          shift: [27, -14]
           rotate: 270
         params:
           variant: 2_pin_th