diff --git a/.github/workflows/build-examples.yaml b/.github/workflows/build-examples.yaml index 80516f072..67d7bf195 100644 --- a/.github/workflows/build-examples.yaml +++ b/.github/workflows/build-examples.yaml @@ -248,8 +248,7 @@ jobs: needs: goil-linux strategy: matrix: - # List only the examples that currently compile - example_name: [blink] + example_name: [blink, blinkAndFPGA] steps: - name: Install ARM toolchain run: | @@ -267,14 +266,44 @@ jobs: run: ./make.py working-directory: examples/cortex-m/armv7m/SmartFusion2/starterKit/${{ matrix.example_name }} + cortex-m-corolab-f303-examples: + name: Build Cortex-M coroLab-F303 examples + runs-on: ubuntu-22.04 + needs: goil-linux + strategy: + matrix: + example_name: [base, baseCMake, trace] + steps: + - name: Install ARM toolchain + run: | + sudo apt update + sudo apt install -y gcc-arm-none-eabi + - name: Retrieve sources and Goil binary + uses: actions/cache/restore@v3 + with: + path: ${{ github.workspace }} + key: ${{ env.CACHE_KEY }} + - name: Generate the code + run: ${{ env.GOIL }} --target=cortex-m/armv7em/stm32f303/coroLabBoard --templates=../../../../../../goil/templates/ ${{ matrix.example_name }}.oil + working-directory: examples/cortex-m/armv7em/stm32f303/coroLab/${{ matrix.example_name }} + - name: Build the code + run: | + if [ -e CMakeLists.txt ] + then + cmake . + make -j $(nproc) + else + ./make.py + fi + working-directory: examples/cortex-m/armv7em/stm32f303/coroLab/${{ matrix.example_name }} + cortex-m-smart-nucleo-f303-examples: name: Build Cortex-M Nucleo-F303 examples runs-on: ubuntu-22.04 needs: goil-linux strategy: matrix: - # List only the examples that currently compile - example_name: [blink, serial] + example_name: [blink, readbutton_isr, serial, trace] steps: - name: Install ARM toolchain run: | @@ -298,8 +327,7 @@ jobs: needs: goil-linux strategy: matrix: - # List only the examples that currently compile - example_name: [blink, readbutton, serial] + example_name: [blink, readbutton, readbutton_isr, serial, trace] steps: - name: Install ARM toolchain run: | @@ -323,8 +351,7 @@ jobs: needs: goil-linux strategy: matrix: - # List only the examples that currently compile - example_name: [blink, readbutton, testDisableEnable] + example_name: [alarms, blink, readbutton, readbutton_isr, readbutton_isr1, testDisableEnable, timer] steps: - name: Install ARM toolchain run: | diff --git a/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/.gitignore b/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/.gitignore index 7b1c18666..c55798e22 100644 --- a/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/.gitignore +++ b/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/.gitignore @@ -1,8 +1,10 @@ -base -build -*.elf +baseCMake/ +build/ *.bin +*.elf *.map *.py .vscode -CMakeLists.txt +CMake* +cmake* +Makefile diff --git a/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/README.md b/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/README.md index 73decdcd8..53494d310 100644 --- a/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/README.md +++ b/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/README.md @@ -5,7 +5,7 @@ * TaskB4 to TaskB7, depending on the button pressed. ` -goil --target=cortex-m/armv7em/stm32f303/coroLabBoard --templates=../../../../../../goil/templates/ base.oil +goil --target=cortex-m/armv7em/stm32f303/coroLabBoard --templates=../../../../../../goil/templates/ baseCMake.oil ` This example uses CMake to build binary and add VSCode integration. VSCode requires extensions: diff --git a/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/base.oil b/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/baseCMake.oil similarity index 98% rename from examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/base.oil rename to examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/baseCMake.oil index 0d4f38346..4fd880526 100644 --- a/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/base.oil +++ b/examples/cortex-m/armv7em/stm32f303/coroLab/baseCMake/baseCMake.oil @@ -22,7 +22,7 @@ CPU blink { TRAMPOLINE_BASE_PATH = "../../../../../.."; APP_CPPSRC = "blink.cpp"; APP_CPPSRC = "buttonTasks.cpp"; - APP_NAME = "base.elf"; + APP_NAME = "baseCMake.elf"; CFLAGS = "-Os -fstack-usage -Wno-strict-aliasing"; LIBRARY = coroBoard; LDFLAGS = "-Map=blink.map"; diff --git a/examples/cortex-m/armv7em/stm32f303/coroLab/trace/.gitignore b/examples/cortex-m/armv7em/stm32f303/coroLab/trace/.gitignore index 92ebbdfff..e30f04f50 100644 --- a/examples/cortex-m/armv7em/stm32f303/coroLab/trace/.gitignore +++ b/examples/cortex-m/armv7em/stm32f303/coroLab/trace/.gitignore @@ -1,8 +1,10 @@ -trace -build -*.elf +build/ +trace/ *.bin +*.elf *.map *.py .vscode -CMakeLists.txt +CMake* +cmake* +Makefile diff --git a/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/.gitignore b/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/.gitignore index c05de9b7f..68b5815ed 100644 --- a/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/.gitignore +++ b/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/.gitignore @@ -1,4 +1,4 @@ -readbutton_isr +readbutton_isr1 build *_exe *.bin diff --git a/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/README.md b/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/README.md index 5784ee8c4..4023ca934 100644 --- a/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/README.md +++ b/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/README.md @@ -1,9 +1,9 @@ -|=-----=[ readbutton_isr example ]=-----=| +|=-----=[ readbutton_isr1 example ]=-----=| This application deals with ISR1, with the same EXTI handler. Configure the application with: ``` -goil --target=cortex-m/armv7em/stm32f407/stm32f4discovery --templates=../../../../../../goil/templates/ readbutton_isr.oil +goil --target=cortex-m/armv7em/stm32f407/stm32f4discovery --templates=../../../../../../goil/templates/ readbutton_isr1.oil ``` diff --git a/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/readbutton_isr.oil b/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/readbutton_isr1.oil similarity index 98% rename from examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/readbutton_isr.oil rename to examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/readbutton_isr1.oil index 877778436..597800e22 100644 --- a/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/readbutton_isr.oil +++ b/examples/cortex-m/armv7em/stm32f407/stm32f4discovery/readbutton_isr1/readbutton_isr1.oil @@ -19,7 +19,7 @@ CPU readbutton_isr { BUILD = TRUE { TRAMPOLINE_BASE_PATH = "../../../../../.."; APP_SRC = "readbutton_isr.c"; - APP_NAME = "readbutton_isr_exe"; + APP_NAME = "readbutton_isr1_exe"; CFLAGS = "-O0"; LDFLAGS = "-Map=readbutton_isr.map"; COMPILER = "arm-none-eabi-gcc"; diff --git a/examples/cortex-m/armv7m/SmartFusion2/starterKit/fpgaInterrupt/.gitignore b/examples/cortex-m/armv7m/SmartFusion2/starterKit/blinkAndFPGA/.gitignore similarity index 100% rename from examples/cortex-m/armv7m/SmartFusion2/starterKit/fpgaInterrupt/.gitignore rename to examples/cortex-m/armv7m/SmartFusion2/starterKit/blinkAndFPGA/.gitignore diff --git a/examples/cortex-m/armv7m/SmartFusion2/starterKit/fpgaInterrupt/README.md b/examples/cortex-m/armv7m/SmartFusion2/starterKit/blinkAndFPGA/README.md similarity index 100% rename from examples/cortex-m/armv7m/SmartFusion2/starterKit/fpgaInterrupt/README.md rename to examples/cortex-m/armv7m/SmartFusion2/starterKit/blinkAndFPGA/README.md diff --git a/examples/cortex-m/armv7m/SmartFusion2/starterKit/fpgaInterrupt/blinkAndFPGA.c b/examples/cortex-m/armv7m/SmartFusion2/starterKit/blinkAndFPGA/blinkAndFPGA.c similarity index 100% rename from examples/cortex-m/armv7m/SmartFusion2/starterKit/fpgaInterrupt/blinkAndFPGA.c rename to examples/cortex-m/armv7m/SmartFusion2/starterKit/blinkAndFPGA/blinkAndFPGA.c diff --git a/examples/cortex-m/armv7m/SmartFusion2/starterKit/fpgaInterrupt/blinkAndFPGA.oil b/examples/cortex-m/armv7m/SmartFusion2/starterKit/blinkAndFPGA/blinkAndFPGA.oil similarity index 100% rename from examples/cortex-m/armv7m/SmartFusion2/starterKit/fpgaInterrupt/blinkAndFPGA.oil rename to examples/cortex-m/armv7m/SmartFusion2/starterKit/blinkAndFPGA/blinkAndFPGA.oil