Skip to content

Commit

Permalink
Merge pull request #129 from gcormier/newpower
Browse files Browse the repository at this point in the history
Minor PCB Resign
  • Loading branch information
gcormier authored Mar 22, 2023
2 parents bf52475 + 0d3ae0c commit 913a529
Show file tree
Hide file tree
Showing 12 changed files with 7,199 additions and 8,599 deletions.
67 changes: 5 additions & 62 deletions .github/workflows/fabrication-panel.yml
Original file line number Diff line number Diff line change
@@ -1,68 +1,11 @@
name: "Fabrication - Panel"
on:
push:
paths:
- '**.kicad_sch'
- '**.kicad_pcb'
- '**kibot.yaml'
pull_request:
paths:
- '**.kicad_sch'
- '**.kicad_pcb'
- '**kibot.yaml'
tags:
- pcb-v*

workflow_dispatch:
workflow_call:

env:
BaseFileName: megadesk
Timezone: America/Toronto
PanelFolder: pcb/panel_output
runs-on: ubuntu-latest

jobs:
make_panel:
name: Create panel
runs-on: ubuntu-latest

steps:
# Check out the files
- uses: actions/checkout@v3

# Generate the panel first
- name: KiBot
uses: INTI-CMNB/KiBot@v2_k6
with:
config: pcb/kibot-panel.yaml
dir: ${{ env.PanelFolder }}
schema: pcb/${{ env.BaseFileName }}.kicad_sch
board: pcb/${{ env.BaseFileName }}.kicad_pcb

# Get the current date and time, in the timezone specified above, for use later.
- name: Get current date and time
id: date
run: echo "date=$(TZ='${{ env.Timezone }}' date +'%Y-%m-%d %T')" >> $GITHUB_OUTPUT

# Get the current date
- name: Get current date
id: date_only
run: echo "date_only=$(TZ='${{ env.Timezone }}' date +'%Y-%m-%d')" >> $GITHUB_OUTPUT

# Generate fab output based on panel
- name: KiBot
uses: INTI-CMNB/KiBot@v2_k6
with:
config: pcb/kibot.yaml
dir: ${{ env.PanelFolder }}
schema: pcb/megadesk_panel.kicad_sch
board: pcb/megadesk_panel.kicad_pcb

# Archive all the artifacts from output and attach to the action's results.
- name: Archive production artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ env.BaseFileName }}-panel-fab-${{ steps.date_only.outputs.date_only }}
path: ${{ env.PanelFolder }}/**


fabrication-panel:
uses: gcormier/kicad-jobs/.github/workflows/kicad-fabrication-panel.yaml@main
permissions:
contents: write
8 changes: 5 additions & 3 deletions .github/workflows/fabrication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ on:
- '**.kicad_sch'
- '**.kicad_pcb'
- '**kibot.yaml'
tags:
- pcb-v*
pull_request:
paths:
- '**.kicad_sch'
- '**.kicad_pcb'
- '**kibot.yaml'
tags:
- pcb-v*
workflow_dispatch:
workflow_call:

jobs:
fabrication:
uses: gcormier/kicad-jobs/.github/workflows/kicad-fabrication.yaml@main
uses: gcormier/kicad-jobs/.github/workflows/kicad-fabrication.yaml@main
permissions:
contents: write
2 changes: 2 additions & 0 deletions .github/workflows/firmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:

jobs:
build:
permissions:
contents: write
env:
BaseFileName: ${{ github.event.repository.name }}
Timezone: America/Toronto
Expand Down
1 change: 1 addition & 0 deletions pcb/fp-lib-table
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
(fp_lib_table
(version 7)
(lib (name "megadesk")(type "KiCad")(uri "${KIPRJMOD}/megadesk.pretty")(options "")(descr ""))
)
77 changes: 77 additions & 0 deletions pcb/kibot-panel.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
kibot:
version: 1

filters:
- name: only_jlc_parts
comment: 'Only parts with JLC (LCSC) code'
type: generic
include_only:
- column: 'LCSC'
regex: '^C\d+'

variants:
- name: rotated
comment: 'Just a place holder for the rotation filter'
type: kibom
variant: rotated
pre_transform: _rot_footprint

outputs:
- name: 'panel'
type: panelize
options:
title: '+ (Panel)'
units: mm
configs:
- layout:
rows: 4
cols: 5
space: 0
#hbackbone: 5
#vbackbone: 5
#hboneskip: 1
#vboneskip: 1
#page:
#size: A3
tabs:
type: full
#width: 3
#vcount: 2
#hcount: 0
cuts:
type: vcuts
layer: Edge.Cuts
#drill: 0.5
#spacing: 1mm
#offset: 0.2
#prolong: 0.5
framing:
type: railstb
width: 5
space: 3
fillet: 1mm
tooling:
type: 4hole
hoffset: 2.5
voffset: 2.5
size: 1.152
fiducials:
type: 4fid
hoffset: 5
voffset: 3.85
coppersize: 1
opening: 2
text:
type: simple
text: JLCJLCJLCJLC
anchor: mt
voffset: 2.5
hjustify: center
vjustify: center
text2:
type: simple
text: Design created on {date}
anchor: mb
voffset: -2.5
hjustify: center
vjustify: center
19 changes: 19 additions & 0 deletions pcb/kibot-render.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
kibot:
version: 1

outputs:
- name: 'STEP'
comment: "STEP file"
type: step

- name: 'Rendering'
type: render_3d
options:
view: top
rotate_x: 4
rotate_y: 0
rotate_z: -3
ray_tracing: true
auto_crop: true
transparent_background: true
output: "render.png"
22 changes: 2 additions & 20 deletions pcb/kibot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ outputs:
options: &gerber_options
exclude_edge_layer: true
exclude_pads_from_silkscreen: true
plot_sheet_reference: false
plot_footprint_refs: true
plot_footprint_values: false
force_plot_invisible_refs_vals: false
tent_vias: true
use_protel_extensions: true
create_gerber_job_file: false
Expand All @@ -43,6 +39,8 @@ outputs:
# are slightly different.
- F.Cu
- B.Cu
- F.Paste
- B.Paste
- F.SilkS
- B.SilkS
- F.Mask
Expand Down Expand Up @@ -122,19 +120,3 @@ outputs:
hide_pcb_info: true
hide_stats_info: true
quote_all: true

- name: 'STEP'
comment: "STEP file"
type: step

- name: 'Rendering'
type: render_3d
options:
view: top
rotate_x: 4
rotate_y: 0
rotate_z: -3
ray_tracing: true
auto_crop: true
transparent_background: true
output: "render.png"
Loading

0 comments on commit 913a529

Please sign in to comment.