Skip to content

Commit fcb66fc

Browse files
gab-kgab-k
committed
Merge branch 'dev' into 'main'
2 parents bb66ba0 + 91e10e1 commit fcb66fc

File tree

98 files changed

+628094
-2445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+628094
-2445
lines changed

‎.github/workflows/build_sw.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Build Software
2+
3+
on:
4+
push:
5+
branches:
6+
- dev # Trigger on push to 'dev' branch
7+
- main # Trigger on push to 'main' branch
8+
paths:
9+
- '.github/workflows/build_sw.yml' # Trigger if this workflow file changes
10+
- 'Software/**' # Trigger if any file in the 'Software' directory changes
11+
12+
13+
env:
14+
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
15+
BUILD_TYPE: Debug
16+
17+
jobs:
18+
build:
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- uses: actions/checkout@v4
23+
- name: install build packages
24+
run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi g++ libstdc++-arm-none-eabi-newlib build-essential
25+
26+
- name: Get SDK and add PICO_SDK_PATH
27+
run: git clone https://github.com/raspberrypi/pico-sdk.git && echo "PICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk" >> $GITHUB_ENV
28+
29+
- name: Init submodules to get tinyUSB stack
30+
run: ls && cd pico-sdk && git submodule update --init && cd ..
31+
32+
- name: Configure and run CMake for Hardware Rev 0.3
33+
run: cmake -B ${{github.workspace}}/Software/build-Rev-0_3 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-0_3
34+
35+
- name: Build for Hardware Rev 0.3
36+
run: cmake --build ${{github.workspace}}/Software/build-Rev-0_3 --config ${{env.BUILD_TYPE}}
37+
38+
- name: Configure and run CMake for Hardware Rev 1.0
39+
run: cmake -B ${{github.workspace}}/Software/build-Rev-1_0 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-1_0
40+
41+
- name: Build for Hardware Rev 1.0
42+
run: cmake --build ${{github.workspace}}/Software/build-Rev-1_0 --config ${{env.BUILD_TYPE}}

‎.github/workflows/cmake-single-platform.yml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎.github/workflows/docs.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: Generate documentation doxygen/breathe/sphinx and deploy on gh-pages/gh-pages-dev
2+
3+
on:
4+
push:
5+
branches:
6+
- dev # Trigger on push to 'dev' branch
7+
- main # Trigger on push to 'main' branch
8+
paths:
9+
- '.github/workflows/docs.yml' # Trigger if this workflow file changes
10+
- 'Software/**' # Trigger if any file in the 'Software' directory changes
11+
- 'docs/**' # Trigger if any file in the 'docs' directory changes
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Check out the repo
18+
uses: actions/checkout@v4
19+
20+
- name: Doxygen build
21+
uses: mattnotmitt/[email protected]
22+
with:
23+
# Path to Doxyfile
24+
doxyfile-path: './Doxyfile'
25+
working-directory: 'docs/doxygen'
26+
27+
- name: Sphinx build
28+
uses: ammaraskar/[email protected]
29+
with:
30+
docs-folder: "docs/sphinx/"
31+
32+
- name: Upload sphinx files as artifact
33+
uses: actions/upload-artifact@v4
34+
with:
35+
name: sphinx_files
36+
path: docs/sphinx/build
37+
38+
39+
deploy-main:
40+
if: github.ref == 'refs/heads/main' # Only deploy on 'main' branch
41+
runs-on: ubuntu-latest
42+
needs: build
43+
44+
steps:
45+
- name: Download sphinx files artifact
46+
uses: actions/download-artifact@v4
47+
with:
48+
name: sphinx_files
49+
path: docs/sphinx
50+
51+
- name: Deploy
52+
uses: peaceiris/actions-gh-pages@v3
53+
with:
54+
github_token: ${{ secrets.GITHUB_TOKEN }}
55+
publish_dir: ./html
56+
publish_branch: gh-pages
57+
destination_dir: docs/sphinx/build
58+
59+
deploy-dev:
60+
if: github.ref == 'refs/heads/dev' # Only deploy on 'dev' branch
61+
runs-on: ubuntu-latest
62+
needs: build
63+
64+
steps:
65+
- name: Download doxygen files artifact
66+
uses: actions/download-artifact@v4
67+
with:
68+
name: sphinx_files
69+
path: docs/sphinx
70+
71+
- name: Deploy
72+
uses: peaceiris/actions-gh-pages@v3
73+
with:
74+
github_token: ${{ secrets.GITHUB_TOKEN }}
75+
publish_dir: docs/sphinx
76+
publish_branch: gh-pages-dev # Specify the target branch (gh-pages-dev in this case)
77+
destination_dir: sphinx

‎.github/workflows/doxygen-gh-pages.yml‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

‎.github/workflows/pcb_render.yml‎

Lines changed: 64 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: pcb_image
1+
name: Render PCB images and rotating mp4
22
on:
33
push:
44
branches:
@@ -9,62 +9,103 @@ on:
99
- 'KiCad/**' # Trigger if any file in the 'KiCad' directory changes
1010

1111
jobs:
12-
render-image:
13-
name: render-image
12+
render-images:
13+
name: render-images
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Check out the repo
1717
uses: actions/checkout@v4
1818

19-
- name: Render PCB image
19+
- name: Render PCB image and .mp4 (Rev 1.0)
2020
uses: linalinn/kicad-render@main
2121
with:
22-
pcb_file: KiCad/RP2040-Decoder.kicad_pcb
23-
output_path: ${{ github.workspace }}/images
24-
animation: gif
22+
pcb_file: KiCad/Rev_1_0/RP2040-Decoder.kicad_pcb
23+
output_path: ${{ github.workspace }}/images_rev_1_0
24+
animation: mp4
2525

26-
- name: Upload images as artifact
26+
- name: Render PCB image and .mp4 (Rev 0.3)
27+
uses: linalinn/kicad-render@main
28+
with:
29+
pcb_file: KiCad/Rev_0_3/RP2040-Decoder.kicad_pcb
30+
output_path: ${{ github.workspace }}/images_rev_0_3
31+
animation: mp4
32+
33+
- name: Upload images and mp4 as artifact (Rev 1.0)
34+
uses: actions/upload-artifact@v4
35+
with:
36+
name: pcb-images_rev_1_0
37+
path: images_rev_1_0/
38+
39+
- name: Upload images and mp4 as artifact (Rev 0.3)
2740
uses: actions/upload-artifact@v4
2841
with:
29-
name: pcb-images
30-
path: images/
42+
name: pcb-images_rev_0_3
43+
path: images_rev_0_3/
3144

3245
deploy-pages-main:
3346
if: github.ref == 'refs/heads/main' # Only deploy on 'main' branch
3447
runs-on: ubuntu-latest
35-
needs: render-image
48+
needs: render-images
3649

3750
steps:
38-
- name: Download pcb-images artifact
51+
- name: Download pcb-images_rev_1_0 artifact
3952
uses: actions/download-artifact@v4
4053
with:
41-
name: pcb-images
42-
path: images/
54+
name: pcb-images_rev_1_0
55+
path: images_rev_1_0/
4356

57+
- name: Download pcb-images_rev_0_3 artifact
58+
uses: actions/download-artifact@v4
59+
with:
60+
name: pcb-images_rev_0_3
61+
path: images_rev_0_3/
62+
63+
- name: Deploy
64+
uses: peaceiris/actions-gh-pages@v3
65+
with:
66+
github_token: ${{ secrets.GITHUB_TOKEN }}
67+
publish_dir: ./images_rev_1_0
68+
publish_branch: gh-pages # Specify the target branch (gh-pages in this case)
69+
destination_dir: img_rev_1_0
70+
4471
- name: Deploy
4572
uses: peaceiris/actions-gh-pages@v3
4673
with:
4774
github_token: ${{ secrets.GITHUB_TOKEN }}
48-
publish_dir: ./images
75+
publish_dir: ./images_rev_0_3
4976
publish_branch: gh-pages # Specify the target branch (gh-pages in this case)
50-
destination_dir: img
77+
destination_dir: img_rev_0_3
5178

5279
deploy-pages-dev:
5380
if: github.ref == 'refs/heads/dev' # Only deploy on 'dev' branch
5481
runs-on: ubuntu-latest
55-
needs: render-image
82+
needs: render-images
5683

5784
steps:
58-
- name: Download pcb-images artifact
85+
- name: Download pcb-images_rev_1_0 artifact
86+
uses: actions/download-artifact@v4
87+
with:
88+
name: pcb-images_rev_1_0
89+
path: images_rev_1_0/
90+
91+
- name: Download pcb-images_rev_0_3 artifact
5992
uses: actions/download-artifact@v4
6093
with:
61-
name: pcb-images
62-
path: images/
94+
name: pcb-images_rev_0_3
95+
path: images_rev_0_3/
6396

64-
- name: Deploy
97+
- name: Deploy Rev 1.0
98+
uses: peaceiris/actions-gh-pages@v3
99+
with:
100+
github_token: ${{ secrets.GITHUB_TOKEN }}
101+
publish_dir: ./images_rev_1_0
102+
publish_branch: gh-pages-dev # Specify the target branch (gh-pages-dev in this case)
103+
destination_dir: img_rev_1_0
104+
105+
- name: Deploy Rev 0.3
65106
uses: peaceiris/actions-gh-pages@v3
66107
with:
67108
github_token: ${{ secrets.GITHUB_TOKEN }}
68-
publish_dir: ./images
109+
publish_dir: ./images_rev_0_3
69110
publish_branch: gh-pages-dev # Specify the target branch (gh-pages-dev in this case)
70-
destination_dir: img
111+
destination_dir: img_rev_0_3

0 commit comments

Comments
 (0)