Nulo/rae-dux
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Renaming to rae-dux and fixing build flows.

Browse source
This commit is contained in:
Andrew Rae 2022-01-06 19:50:42 -05:00
parent 0c0fac67de
commit 12f46d5858
3 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/build.yml vendored
View file

@ -32,16 +32,6 @@ jobs:
pcb_input_file: output/pcbs/board.kicad_pcb pcb_input_file: output/pcbs/board.kicad_pcb
pcb_output_file: output/pcbs/board_routed.kicad_pcb pcb_output_file: output/pcbs/board_routed.kicad_pcb
ses_file: output/pcbs/board.ses 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 - name: Export Gerbers for main PCB
uses: ./.github/actions/export-gerbers uses: ./.github/actions/export-gerbers
with: with:
@ -50,5 +40,5 @@ jobs:
- name: Persist output - name: Persist output
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: samoklava-routed-pcbs-and-gerbers name: rae-dux-routed-pcbs-and-gerbers
path: output path: output

8
Makefile
View file

@ -10,7 +10,7 @@ setup:
npm install npm install
# outputs from # 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 npm run gen
output/pcbs/%.dsn: output/pcbs/%.kicad_pcb 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 output/routed_pcbs/%.ses: output/pcbs/%.dsn
mkdir -p $(shell dirname $@) 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 output/routed_pcbs/%.kicad_pcb: output/routed_pcbs/%.ses output/pcbs/%.kicad_pcb
mkdir -p $(shell dirname $@) 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 output/routed_pcbs/%-front.png: output/routed_pcbs/%.kicad_pcb
mkdir -p $(shell dirname $@) 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 output/routed_pcbs/%-back.png: output/routed_pcbs/%.kicad_pcb
mkdir -p $(shell dirname $@) 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 output/gerbers/%/gerbers.zip: output/routed_pcbs/%.kicad_pcb
mkdir -p $(shell dirname $@) mkdir -p $(shell dirname $@)

14
samoklava.yaml → rae-dux.yaml
View file

@ -306,18 +306,20 @@ pcbs:
type: text type: text
anchor: anchor:
ref: ref:
- matrix_pinky_bottom - thumbfan_near_thumb
shift: [0.75 kx, 0] shift: [ -1.1 kx, 0]
rotate: 15
params: params:
text: "rae-dux v1.0\\nby ajrae" text: "rae-dux v0.1\\nby ajrae"
justify: left justify: left
info_r: info_r:
type: text type: text
anchor: anchor:
ref: ref:
- matrix_pinky_bottom - thumbfan_near_thumb
shift: [0.75 kx, 0] shift: [ -1.1 kx, 0]
rotate: 15
params: params:
layer: B.SilkS layer: B.SilkS
text: "rae-dux v1.0\\nby ajrae" text: "rae-dux v0.1\\nby ajrae"
justify: right mirror justify: right mirror