From 12f46d5858c1e6872c55fee24fe41460054bb0ac Mon Sep 17 00:00:00 2001
From: Andrew Rae <ajrae.nv@gmail.com>
Date: Thu, 6 Jan 2022 19:50:42 -0500
Subject: [PATCH] Renaming to rae-dux and fixing build flows.

---
 .github/workflows/build.yml    | 12 +-----------
 Makefile                       |  8 ++++----
 samoklava.yaml => rae-dux.yaml | 14 ++++++++------
 3 files changed, 13 insertions(+), 21 deletions(-)
 rename samoklava.yaml => rae-dux.yaml (96%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 233458a..caca9a6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,16 +32,6 @@ jobs:
           pcb_input_file: output/pcbs/board.kicad_pcb
           pcb_output_file: output/pcbs/board_routed.kicad_pcb
           ses_file: output/pcbs/board.ses
-      - name: Export Gerbers for top plate
-        uses: ./.github/actions/export-gerbers
-        with:
-          pcb_file: output/pcbs/top_plate.kicad_pcb
-          gerbers_dir: output/gerbers/top_plate
-      - name: Export Gerbers for bottom plate
-        uses: ./.github/actions/export-gerbers
-        with:
-          pcb_file: output/pcbs/bottom_plate.kicad_pcb
-          gerbers_dir: output/gerbers/bottom_plate
       - name: Export Gerbers for main PCB
         uses: ./.github/actions/export-gerbers
         with:
@@ -50,5 +40,5 @@ jobs:
       - name: Persist output
         uses: actions/upload-artifact@v2
         with:
-          name: samoklava-routed-pcbs-and-gerbers
+          name: rae-dux-routed-pcbs-and-gerbers
           path: output
diff --git a/Makefile b/Makefile
index a799934..280c6b2 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ setup:
 	npm install
 
 # outputs from 
-output/pcbs/board.kicad_pcb output/pcbs/top_plate.kicad_pcb output/pcbs/bottom_plate.kicad_pcb &: samoklava.yaml
+output/pcbs/board.kicad_pcb &: rae-dux.yaml
 	npm run gen
 
 output/pcbs/%.dsn: output/pcbs/%.kicad_pcb
@@ -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 -us hybrid -de $< -do $@
+	${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -jar /opt/freerouting_cli.jar -de $< -do $@
 
 output/routed_pcbs/%.kicad_pcb: output/routed_pcbs/%.ses output/pcbs/%.kicad_pcb
 	mkdir -p $(shell dirname $@)
@@ -34,11 +34,11 @@ output/routed_pcbs/%-drc/: output/routed_pcbs/%.kicad_pcb
 
 output/routed_pcbs/%-front.png: output/routed_pcbs/%.kicad_pcb
 	mkdir -p $(shell dirname $@)
-	${container_cmd} run ${container_args} yaqwsx/kikit:v0.7 pcbdraw --style builtin:oshpark-afterdark.json $< $@
+	${container_cmd} run ${container_args} yaqwsx/kikit:v1.0.0 pcbdraw --style builtin:oshpark-afterdark.json $< $@
 
 output/routed_pcbs/%-back.png: output/routed_pcbs/%.kicad_pcb
 	mkdir -p $(shell dirname $@)
-	${container_cmd} run ${container_args} yaqwsx/kikit:v0.7 pcbdraw -b --style builtin:oshpark-afterdark.json $< $@
+	${container_cmd} run ${container_args} yaqwsx/kikit:v1.0.0 pcbdraw -b --style builtin:oshpark-afterdark.json $< $@
 
 output/gerbers/%/gerbers.zip: output/routed_pcbs/%.kicad_pcb
 	mkdir -p $(shell dirname $@)
diff --git a/samoklava.yaml b/rae-dux.yaml
similarity index 96%
rename from samoklava.yaml
rename to rae-dux.yaml
index dc4f963..38ade28 100644
--- a/samoklava.yaml
+++ b/rae-dux.yaml
@@ -306,18 +306,20 @@ pcbs:
         type: text
         anchor:
           ref:
-            - matrix_pinky_bottom
-          shift: [0.75 kx, 0]
+            - thumbfan_near_thumb
+          shift: [ -1.1 kx, 0]
+          rotate: 15
         params:
-          text: "rae-dux v1.0\\nby ajrae"
+          text: "rae-dux v0.1\\nby ajrae"
           justify: left
       info_r:
         type: text
         anchor:
           ref:
-            - matrix_pinky_bottom
-          shift: [0.75 kx, 0]
+            - thumbfan_near_thumb
+          shift: [ -1.1 kx, 0]
+          rotate: 15
         params:
           layer: B.SilkS
-          text: "rae-dux v1.0\\nby ajrae"
+          text: "rae-dux v0.1\\nby ajrae"
           justify: right mirror