Skip to content

Commit

Permalink
Adding the git hash to the feeder mobo, feeder floor and indexing whe…
Browse files Browse the repository at this point in the history
…el boards.
  • Loading branch information
daveismith committed Feb 28, 2021
1 parent eb8d90c commit 601c00c
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 61 deletions.
20 changes: 19 additions & 1 deletion .github/workflows/generate-feeder-pcb-artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,28 @@ jobs:
run: apt update

- name: Install Required Libraries
run: apt -y install git zip librsvg2-bin imagemagick
run: apt -y install git git-lfs zip librsvg2-bin imagemagick

- name: Checkout Repository
uses: actions/checkout@v2
with:
lfs: true

- name: Update the PCBs with the git hash
if: github.ref != 'refs/heads/master'
run: |
export COMMIT=$(git rev-parse --short HEAD)
echo "COMMIT = ${COMMIT}"
sed -i "s!<<hash>>!-${COMMIT}!" feeder/pcb/mobo/mobo.kicad_pcb
sed -i "s!<<hash>>!${COMMIT}!" feeder/pcb/feederFloor/feederFloor.kicad_pcb
sed -i "s!<<hash>>!${COMMIT}!" feeder/pcb/indexingWheel/indexingWheel.kicad_pcb
- name: Update the PCBs with no hash on master
if: github.ref == 'refs/heads/master'
run: |
sed -i "s!<<hash>>!!" feeder/pcb/mobo/mobo.kicad_pcb
sed -i "s!<<hash>>!!" feeder/pcb/feederFloor/feederFloor.kicad_pcb
sed -i "s!<<hash>>!!" feeder/pcb/indexingWheel/indexingWheel.kicad_pcb
- name: Run feeder mobo KiBot
run: cd feeder/pcb/mobo && kibot -c ../../../config.kibot.yaml -d export
Expand Down
114 changes: 57 additions & 57 deletions feeder/pcb/feederFloor/feederFloor.kicad_pcb
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,16 @@
(fp_text value 220R (at 0 1.65) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start 1.68 0.95) (end -1.68 0.95) (layer F.CrtYd) (width 0.05))
(fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer F.CrtYd) (width 0.05))
(fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer F.CrtYd) (width 0.05))
(fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer F.CrtYd) (width 0.05))
(fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
(fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
(fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
(fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
(fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
(fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.1))
(fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.1))
(fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.1))
(fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.1))
(fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer F.SilkS) (width 0.12))
(fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer F.SilkS) (width 0.12))
(fp_line (start -1.68 0.95) (end -1.68 -0.95) (layer F.CrtYd) (width 0.05))
(fp_line (start -1.68 -0.95) (end 1.68 -0.95) (layer F.CrtYd) (width 0.05))
(fp_line (start 1.68 -0.95) (end 1.68 0.95) (layer F.CrtYd) (width 0.05))
(fp_line (start 1.68 0.95) (end -1.68 0.95) (layer F.CrtYd) (width 0.05))
(fp_text user %R (at 0 0) (layer F.Fab)
(effects (font (size 0.5 0.5) (thickness 0.08)))
)
Expand All @@ -166,12 +166,6 @@
(fp_text value LOGO (at 0.75 0) (layer B.SilkS) hide
(effects (font (size 1.524 1.524) (thickness 0.3)) (justify mirror))
)
(fp_poly (pts (xy 0.172439 0.342195) (xy 0.176389 0.162278) (xy 0.356305 0.158329) (xy 0.536222 0.154379)
(xy 0.536222 -0.16849) (xy 0.356305 -0.172439) (xy 0.176389 -0.176389) (xy 0.172439 -0.356305)
(xy 0.16849 -0.536222) (xy -0.154379 -0.536222) (xy -0.158329 -0.356305) (xy -0.162278 -0.176389)
(xy -0.342195 -0.172439) (xy -0.522111 -0.16849) (xy -0.522111 0.154379) (xy -0.342195 0.158329)
(xy -0.162278 0.162278) (xy -0.158329 0.342195) (xy -0.154379 0.522111) (xy 0.16849 0.522111)
(xy 0.172439 0.342195)) (layer B.SilkS) (width 0.01))
(fp_poly (pts (xy 0.169333 2.543898) (xy 0.263869 2.534212) (xy 0.52296 2.493539) (xy 0.77827 2.424972)
(xy 1.029979 2.32846) (xy 1.150055 2.27195) (xy 1.292674 2.196349) (xy 1.419534 2.118738)
(xy 1.537813 2.033871) (xy 1.654691 1.936508) (xy 1.777345 1.821403) (xy 1.806554 1.792443)
Expand Down Expand Up @@ -218,6 +212,12 @@
(xy -1.432602 2.100411) (xy -1.308306 2.179202) (xy -1.16987 2.254798) (xy -1.135945 2.27195)
(xy -0.885908 2.38195) (xy -0.632356 2.463979) (xy -0.375109 2.518088) (xy -0.249759 2.534212)
(xy -0.155222 2.543898) (xy -0.155222 2.836333) (xy 0.169333 2.836333) (xy 0.169333 2.543898)) (layer B.SilkS) (width 0.01))
(fp_poly (pts (xy 0.172439 0.342195) (xy 0.176389 0.162278) (xy 0.356305 0.158329) (xy 0.536222 0.154379)
(xy 0.536222 -0.16849) (xy 0.356305 -0.172439) (xy 0.176389 -0.176389) (xy 0.172439 -0.356305)
(xy 0.16849 -0.536222) (xy -0.154379 -0.536222) (xy -0.158329 -0.356305) (xy -0.162278 -0.176389)
(xy -0.342195 -0.172439) (xy -0.522111 -0.16849) (xy -0.522111 0.154379) (xy -0.342195 0.158329)
(xy -0.162278 0.162278) (xy -0.158329 0.342195) (xy -0.154379 0.522111) (xy 0.16849 0.522111)
(xy 0.172439 0.342195)) (layer B.SilkS) (width 0.01))
)

(module index:70AA-5 (layer F.Cu) (tedit 5F87580F) (tstamp 5F87B373)
Expand All @@ -229,10 +229,10 @@
(fp_text value Conn_01x10_Female (at 5.08 -3.8608) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -1.4191 1.3135) (end 11.5809 1.3135) (layer F.SilkS) (width 0.12))
(fp_line (start 11.5809 1.3135) (end 11.5809 -8.9365) (layer F.SilkS) (width 0.12))
(fp_line (start 11.5809 -8.9365) (end -1.4191 -8.9365) (layer F.SilkS) (width 0.12))
(fp_line (start -1.4191 -8.9365) (end -1.4191 1.3135) (layer F.SilkS) (width 0.12))
(fp_line (start 11.5809 -8.9365) (end -1.4191 -8.9365) (layer F.SilkS) (width 0.12))
(fp_line (start 11.5809 1.3135) (end 11.5809 -8.9365) (layer F.SilkS) (width 0.12))
(fp_line (start -1.4191 1.3135) (end 11.5809 1.3135) (layer F.SilkS) (width 0.12))
(pad 1 smd rect (at 0 0) (size 1.27 2.25) (layers F.Cu F.Paste F.Mask)
(net 1 GND))
(pad 2 smd rect (at 2.54 0) (size 1.27 2.25) (layers F.Cu F.Paste F.Mask)
Expand Down Expand Up @@ -272,20 +272,20 @@
(fp_text value DS2431 (at 0 3) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -1.88 -1.27) (end -1.88 1.97) (layer F.Fab) (width 0.1))
(fp_line (start -1.88 1.97) (end 1.88 1.97) (layer F.Fab) (width 0.1))
(fp_line (start -1.18 -1.97) (end 1.88 -1.97) (layer F.Fab) (width 0.1))
(fp_line (start 1.88 -1.97) (end 1.88 1.97) (layer F.Fab) (width 0.1))
(fp_line (start 0 -2.08) (end 1.99 -2.08) (layer F.SilkS) (width 0.12))
(fp_line (start 1.99 -2.08) (end 1.99 -1.795) (layer F.SilkS) (width 0.12))
(fp_line (start -1.99 1.795) (end -1.99 2.08) (layer F.SilkS) (width 0.12))
(fp_line (start -1.99 2.08) (end 1.99 2.08) (layer F.SilkS) (width 0.12))
(fp_line (start 1.99 1.795) (end 1.99 2.08) (layer F.SilkS) (width 0.12))
(fp_line (start -1.88 -1.27) (end -1.18 -1.97) (layer F.Fab) (width 0.1))
(fp_line (start -2.44 -2.22) (end 2.44 -2.22) (layer F.CrtYd) (width 0.05))
(fp_line (start 2.44 -2.22) (end 2.44 2.22) (layer F.CrtYd) (width 0.05))
(fp_line (start -2.44 -2.22) (end -2.44 2.22) (layer F.CrtYd) (width 0.05))
(fp_line (start -2.44 2.22) (end 2.44 2.22) (layer F.CrtYd) (width 0.05))
(fp_line (start -2.44 -2.22) (end -2.44 2.22) (layer F.CrtYd) (width 0.05))
(fp_line (start 2.44 -2.22) (end 2.44 2.22) (layer F.CrtYd) (width 0.05))
(fp_line (start -2.44 -2.22) (end 2.44 -2.22) (layer F.CrtYd) (width 0.05))
(fp_line (start -1.88 -1.27) (end -1.18 -1.97) (layer F.Fab) (width 0.1))
(fp_line (start 1.99 1.795) (end 1.99 2.08) (layer F.SilkS) (width 0.12))
(fp_line (start -1.99 2.08) (end 1.99 2.08) (layer F.SilkS) (width 0.12))
(fp_line (start -1.99 1.795) (end -1.99 2.08) (layer F.SilkS) (width 0.12))
(fp_line (start 1.99 -2.08) (end 1.99 -1.795) (layer F.SilkS) (width 0.12))
(fp_line (start 0 -2.08) (end 1.99 -2.08) (layer F.SilkS) (width 0.12))
(fp_line (start 1.88 -1.97) (end 1.88 1.97) (layer F.Fab) (width 0.1))
(fp_line (start -1.18 -1.97) (end 1.88 -1.97) (layer F.Fab) (width 0.1))
(fp_line (start -1.88 1.97) (end 1.88 1.97) (layer F.Fab) (width 0.1))
(fp_line (start -1.88 -1.27) (end -1.88 1.97) (layer F.Fab) (width 0.1))
(fp_text user %R (at 0 0) (layer F.Fab)
(effects (font (size 0.7 0.7) (thickness 0.127)))
)
Expand Down Expand Up @@ -324,31 +324,31 @@
(fp_text value IDC (at 1.27 -11.684) (layer B.Fab)
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_line (start 5.695 5.1) (end 5.695 -10.18) (layer B.Fab) (width 0.1))
(fp_line (start 5.145 4.56) (end 5.145 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start -3.155 5.1) (end -3.155 -10.18) (layer B.Fab) (width 0.1))
(fp_line (start -2.605 4.56) (end -2.605 -0.29) (layer B.Fab) (width 0.1))
(fp_line (start -2.605 -4.79) (end -2.605 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start -2.605 -0.29) (end -3.155 -0.29) (layer B.Fab) (width 0.1))
(fp_line (start -2.605 -4.79) (end -3.155 -4.79) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 5.1) (end -3.155 5.1) (layer B.Fab) (width 0.1))
(fp_line (start 5.145 4.56) (end -2.605 4.56) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 -10.18) (end -3.155 -10.18) (layer B.Fab) (width 0.1))
(fp_line (start 5.145 -9.62) (end -2.605 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 5.1) (end 5.145 4.56) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 -10.18) (end 5.145 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start -3.155 5.1) (end -2.605 4.56) (layer B.Fab) (width 0.1))
(fp_line (start -3.155 -10.18) (end -2.605 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start 5.95 5.35) (end 5.95 -10.43) (layer B.CrtYd) (width 0.05))
(fp_line (start 5.95 -10.43) (end -3.41 -10.43) (layer B.CrtYd) (width 0.05))
(fp_line (start -3.41 -10.43) (end -3.41 5.35) (layer B.CrtYd) (width 0.05))
(fp_line (start -3.41 5.35) (end 5.95 5.35) (layer B.CrtYd) (width 0.05))
(fp_line (start 5.945 5.35) (end 5.945 -10.43) (layer B.SilkS) (width 0.12))
(fp_line (start 5.945 -10.43) (end -3.405 -10.43) (layer B.SilkS) (width 0.12))
(fp_line (start -3.405 -10.43) (end -3.405 5.35) (layer B.SilkS) (width 0.12))
(fp_line (start -3.405 5.35) (end 5.945 5.35) (layer B.SilkS) (width 0.12))
(fp_line (start -3.655 5.6) (end -3.655 3.06) (layer B.SilkS) (width 0.12))
(fp_line (start -3.655 5.6) (end -1.115 5.6) (layer B.SilkS) (width 0.12))
(fp_line (start -3.655 5.6) (end -3.655 3.06) (layer B.SilkS) (width 0.12))
(fp_line (start -3.405 5.35) (end 5.945 5.35) (layer B.SilkS) (width 0.12))
(fp_line (start -3.405 -10.43) (end -3.405 5.35) (layer B.SilkS) (width 0.12))
(fp_line (start 5.945 -10.43) (end -3.405 -10.43) (layer B.SilkS) (width 0.12))
(fp_line (start 5.945 5.35) (end 5.945 -10.43) (layer B.SilkS) (width 0.12))
(fp_line (start -3.41 5.35) (end 5.95 5.35) (layer B.CrtYd) (width 0.05))
(fp_line (start -3.41 -10.43) (end -3.41 5.35) (layer B.CrtYd) (width 0.05))
(fp_line (start 5.95 -10.43) (end -3.41 -10.43) (layer B.CrtYd) (width 0.05))
(fp_line (start 5.95 5.35) (end 5.95 -10.43) (layer B.CrtYd) (width 0.05))
(fp_line (start -3.155 -10.18) (end -2.605 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start -3.155 5.1) (end -2.605 4.56) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 -10.18) (end 5.145 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 5.1) (end 5.145 4.56) (layer B.Fab) (width 0.1))
(fp_line (start 5.145 -9.62) (end -2.605 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 -10.18) (end -3.155 -10.18) (layer B.Fab) (width 0.1))
(fp_line (start 5.145 4.56) (end -2.605 4.56) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 5.1) (end -3.155 5.1) (layer B.Fab) (width 0.1))
(fp_line (start -2.605 -4.79) (end -3.155 -4.79) (layer B.Fab) (width 0.1))
(fp_line (start -2.605 -0.29) (end -3.155 -0.29) (layer B.Fab) (width 0.1))
(fp_line (start -2.605 -4.79) (end -2.605 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start -2.605 4.56) (end -2.605 -0.29) (layer B.Fab) (width 0.1))
(fp_line (start -3.155 5.1) (end -3.155 -10.18) (layer B.Fab) (width 0.1))
(fp_line (start 5.145 4.56) (end 5.145 -9.62) (layer B.Fab) (width 0.1))
(fp_line (start 5.695 5.1) (end 5.695 -10.18) (layer B.Fab) (width 0.1))
(fp_text user %R (at 1.27 -2.54) (layer B.Fab)
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
Expand Down Expand Up @@ -383,15 +383,15 @@
(fp_text value MountingHole (at 0 6.3) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_circle (center 0 0) (end 5.3 0) (layer Cmts.User) (width 0.15))
(fp_circle (center 0 0) (end 5.55 0) (layer F.CrtYd) (width 0.05))
(fp_circle (center 0 0) (end 5.3 0) (layer Cmts.User) (width 0.15))
(fp_text user %R (at 0.3 0) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(pad 1 np_thru_hole circle (at 0 0) (size 5.3 5.3) (drill 5.3) (layers *.Cu *.Mask))
)

(gr_text "FEEDER FLOOR\nREV02" (at 191.75 31.5) (layer B.SilkS)
(gr_text "FEEDER FLOOR\nREV02\n<<hash>>" (at 191.75 31.5) (layer B.SilkS)
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(gr_text ID (at 187 57) (layer F.SilkS)
Expand Down
2 changes: 1 addition & 1 deletion feeder/pcb/indexingWheel/indexingWheel.kicad_pcb
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
(uvia_drill 0.1)
)

(gr_text "INDEXING WHEEL\nREV02" (at 0 6.8) (layer F.Mask)
(gr_text "INDEXING WHEEL\nREV02\n<<hash>>" (at 0 6.8) (layer F.Mask)
(effects (font (size 1.5 1.5) (thickness 0.3)))
)
(gr_circle (center 0 0) (end 16 0) (layer B.Mask) (width 3.5))
Expand Down
4 changes: 2 additions & 2 deletions feeder/pcb/mobo/mobo.kicad_pcb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(kicad_pcb (version 20171130) (host pcbnew 5.1.5+dfsg1-2build2)
(kicad_pcb (version 20171130) (host pcbnew "(5.1.8-0-10_14)")

(general
(thickness 1.6)
Expand Down Expand Up @@ -3233,7 +3233,7 @@
)
)

(gr_text "Index Feeder\nREV05" (at 195.2 60.2) (layer B.Mask)
(gr_text "Index Feeder\nREV05<<hash>>" (at 195.2 60.2) (layer B.Mask)
(effects (font (size 1 1) (thickness 0.15)) (justify left mirror))
)
(gr_text BOOT1 (at 85.8 103.4 90) (layer F.SilkS) (tstamp 5FF916BB)
Expand Down

0 comments on commit 601c00c

Please sign in to comment.