Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/upstream/main' into feat/unity
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake-Carter committed Oct 4, 2024
2 parents ab65373 + f4649e2 commit 3b4cc3b
Show file tree
Hide file tree
Showing 3,549 changed files with 317,732 additions and 47,810 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
31 changes: 20 additions & 11 deletions .github/workflows/BLE_Examples_Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ on:

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
push:


env:
LOCK_MAX32655_B2: false
Expand Down Expand Up @@ -604,15 +604,15 @@ jobs:
run: |
#set advertising names
sed -i "s/'S'/'?'/g" Examples/MAX32655/Bluetooth/BLE_dats/dats_main.c
sed -i "s/'S'/'?'/g" Examples/MAX32655/Bluetooth/BLE_datc/datc_main.c
sed -i "s/'S'/'!'/g" Examples/MAX32665/Bluetooth/BLE_dats/dats_main.c
sed -i "s/'S'/'!'/g" Examples/MAX32690/Bluetooth/BLE_datc/datc_main.c
# sed -i "s/'S'/'?'/g" Examples/MAX32655/Bluetooth/BLE_dats/dats_main.c
# sed -i "s/'S'/'?'/g" Examples/MAX32655/Bluetooth/BLE_datc/datc_main.c
# sed -i "s/'S'/'!'/g" Examples/MAX32665/Bluetooth/BLE_dats/dats_main.c
# sed -i "s/'S'/'!'/g" Examples/MAX32690/Bluetooth/BLE_datc/datc_main.c
sed -i "s/'S'/'?'/g" Examples/MAX32655/Bluetooth/BLE_otas/dats_main.c
sed -i "s/'S'/'?'/g" Examples/MAX32655/Bluetooth/BLE_otac/datc_main.c
sed -i "s/'S'/'!'/g" Examples/MAX32665/Bluetooth/BLE_otas/dats_main.c
sed -i "s/'S'/'!'/g" Examples/MAX32690/Bluetooth/BLE_otac/datc_main.c
# sed -i "s/'S'/'?'/g" Examples/MAX32655/Bluetooth/BLE_otas/dats_main.c
# sed -i "s/'S'/'?'/g" Examples/MAX32655/Bluetooth/BLE_otac/datc_main.c
# sed -i "s/'S'/'!'/g" Examples/MAX32665/Bluetooth/BLE_otas/dats_main.c
# sed -i "s/'S'/'!'/g" Examples/MAX32690/Bluetooth/BLE_otac/datc_main.c
- name: Erase Boards DATS
if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32665_DATS_CONNECTED_TEST == 'true' || env.MAX32690_DATS_CONNECTED_TEST == 'true'}}
Expand Down Expand Up @@ -643,7 +643,11 @@ jobs:
BLE_datc
suppress_output: true

build_flags: |
ADV_NAME=DAT?
ADV_NAME=DAT?
build: true
distclean: true

Expand Down Expand Up @@ -675,7 +679,12 @@ jobs:
max32655_board1
max32655_board2
max32665_board1
build_flags: |
ADV_NAME=OTA?
ADV_NAME=OTA?
ADV_NAME=OTA!
ADV_NAME=OTA!
project: |
BLE_otas
BLE_otac
Expand Down
25 changes: 23 additions & 2 deletions .github/workflows/Build_Examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,35 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Update the submodules below, doing so here will convert ssh to https
submodules: false
fetch-depth: 0
ref: '${{ github.event.pull_request.head.ref }}'
repository: '${{ github.event.pull_request.head.repo.full_name }}'

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v45
with:
files: |
**.c
**.h
**.S
**.s
**.a
**.cpp
**.mk
**/Makefile
- name: List all changed files
env:
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
run: |
echo ${ALL_CHANGED_FILES} > changed_files
cat changed_files
- name: Check watch files
id: check_watch
run: |
Expand Down Expand Up @@ -222,7 +243,7 @@ jobs:
# Set MAXIM_PATH to limit warnings
export MAXIM_PATH=$(pwd)
python .github/workflows/scripts/build.py
python .github/workflows/scripts/build.py --change_file changed_files
Regression_Test_Make_3_81:
runs-on:
Expand Down
23 changes: 22 additions & 1 deletion .github/workflows/Verify_Register_SVD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -655,5 +655,26 @@ jobs:
fi
done
set -e
# Remove generated register files for next time a runner picks up the job.
# The register files generated in a previous instance will remain and won't
# be regenerated because the Wall-E doesn't refresh its workspace and this
# workflow only generates the register files for a specific part only once
# (to save time) by checking whether the generated register files exist or not.
cd ${{ env.MSDK-INTERNAL_DIR }}/SVD/Devices/
# Enter each directory and remove ./chip_test/
for file_dir in *
do
# Don't mess with files.
[[ -d $file_dir ]] || continue
if [[ ${DIE_TO_CHIP_NAMES[$file_dir]+_} ]]; then
rm -rf ./${file_dir}/chip_test/
fi
done
# Return to workspace
cd ../../../
exit $CHECK_FAIL
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
# Exclude register header files. Those don't follow clang formatting or it becomes unreadable
- name: clang-format-check
run: |
CHANGE_FILES=$(git diff --ignore-submodules --name-only remotes/origin/main '*.c' '*.h' ':!*_regs.h' ':!*ffconf.h' ':!*weights.h' ':!*cnn.h' ':!*cnn.c' ':!*sampledata.h' ':!*sampleoutput.h' ':!*softmax.c' ':!Examples/*/Coremark/*' ':!Libraries/FCL' ':!Libraries/FreeRTOS' ':!Libraries/lwIP' ':!Libraries/littlefs' ':!Libraries/FreeRTOS-Plus' ':!Libraries/LC3' ':!Libraries/SDHC' ':!Libraries/MAXUSB' ':!Libraries/Cordio' ':!Libraries/LVGL' ':!Libraries/Coremark' ':!Libraries/MiscDrivers/BarcodeDecoder')
CHANGE_FILES=$(git diff --ignore-submodules --name-only remotes/origin/main '*.c' '*.h' ':!*_regs.h' ':!*ffconf.h' ':!*weights.h' ':!*cnn.h' ':!*cnn.c' ':!*sampledata.h' ':!*sampleoutput.h' ':!*softmax.c' ':!Examples/*/Coremark/*' ':!Libraries/FCL' ':!Libraries/FreeRTOS' ':!Libraries/lwIP' ':!Libraries/littlefs' ':!Libraries/FreeRTOS-Plus' ':!Libraries/LC3' ':!Libraries/SDHC' ':!Libraries/MAXUSB' ':!Libraries/Cordio' ':!Libraries/LVGL' ':!Libraries/Coremark' ':!Libraries/MiscDrivers/BarcodeDecoder' ':!Libraries/tinyusb' ':!Libraries/CMSIS/5.9.0/DSP')
if [[ "$CHANGE_FILES" != "" ]]; then
bash -e .github/workflows/clang-format-run.sh $CHANGE_FILES
fi
4 changes: 2 additions & 2 deletions .github/workflows/clang-format-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ FILES=""
if [[ $# -eq 0 ]]
then
# Find the c files
FILES=$(find . -iname "*.c" -not -name "*cnn.c" -a -not -name "*softmax.c" -a -not -regex ".*/Libraries/MiscDrivers/BarcodeDecoder/.*" -a -not -regex ".*/Examples/.*/Coremark/.*" -a -not -regex ".*/Libraries/\(Cordio\|FCL\|FreeRTOS\|FreeRTOS\-Plus\|LC3\|littlefs\|lwIP\|MAXUSB\|SDHC\|LVGL\|Coremark\)/.*")
FILES=$(find . -iname "*.c" -not -name "*cnn.c" -a -not -name "*softmax.c" -a -not -regex ".*/Libraries/MiscDrivers/BarcodeDecoder/.*" -a -not -regex ".*/Examples/.*/Coremark/.*" -a -not -regex ".*/Libraries/\(Cordio\|FCL\|FreeRTOS\|FreeRTOS\-Plus\|LC3\|littlefs\|lwIP\|MAXUSB\|SDHC\|LVGL\|Coremark\|tinyusb\)/.*")

# Find the header files
FILES=$FILES+$(find . -iname "*.h" -not -name "*regs*" -a -not -name "*weights.h" -a -not -name "*cnn.h" -a -not -name "*sampledata.h" -a -not -name "*sampleoutput.h" -a -not -regex ".*/Libraries/MiscDrivers/BarcodeDecoder/.*" -a -not -regex ".*/Examples/.*/Coremark/.*" -a -not -regex ".*/Libraries/\(Cordio\|FCL\|FreeRTOS\|FreeRTOS\-Plus\|LC3\|littlefs\|lwIP\|MAXUSB\|SDHC\|LVGL\|Coremark\)/.*")
FILES=$FILES+$(find . -iname "*.h" -not -name "*regs*" -a -not -name "*weights.h" -a -not -name "*cnn.h" -a -not -name "*sampledata.h" -a -not -name "*sampleoutput.h" -a -not -regex ".*/Libraries/MiscDrivers/BarcodeDecoder/.*" -a -not -regex ".*/Examples/.*/Coremark/.*" -a -not -regex ".*/Libraries/\(Cordio\|FCL\|FreeRTOS\|FreeRTOS\-Plus\|LC3\|littlefs\|lwIP\|MAXUSB\|SDHC\|LVGL\|Coremark\|tinyusb\)/.*")
else
# Accumulate the input arguments into FILES
FILES="$*"
Expand Down
137 changes: 137 additions & 0 deletions .github/workflows/example_tester.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
###############################################################################
#
# Copyright (C) 2022-2023 Maxim Integrated Products, Inc. (now owned by
# Analog Devices, Inc.),
# Copyright (C) 2023-2024 Analog Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################

name: Basic Examples Test

# Cancels workflows in progress that are in the same PR
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the "main" branch
pull_request:
branches:
- main
paths-ignore:
# Any files in a docs directory anywhere in the repository.
- "**/docs/**"
- "**/Documentation/**"
# Any README.md file anywhere in the repository.
- "**/README.md"
# Any .pdf file anywhere in the repository.
- "**/*.pdf"
# Any .yml file anywhere in the repository.
# can comment this out when testing changes to THIS yml file
- "**/*.yml"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:


env:
MAXIM_PATH: ''

jobs:
Example_Tests_MAX32690:
# The type of runner that the job will run on
runs-on: [self-hosted]
if: github.event.pull_request.draft == false


steps:

- uses: actions/checkout@v4
with:
submodules: false
repository: analogdevicesinc/msdk
fetch-depth: 0

- name: Set MAXIM_PATH
run: |
echo "MAXIM_PATH=$(pwd)" >> $GITHUB_ENV
printenv
- name: Lock Boards
uses: Analog-Devices-MSDK/btm-ci-scripts/actions/[email protected]
with:
boards: |
max32690_board_ex
lock: true
timeout: 900 # Attempt to lock for an hour

- name: run_example_test
run: |
bash .github/workflows/scripts/example_tester.sh max32690_board_ex
- name: Unlock Boards
if: always()
uses: Analog-Devices-MSDK/btm-ci-scripts/actions/[email protected]
with:
lock: false
all_owned: true

Example_Tests_MAX78002:
# The type of runner that the job will run on
runs-on: [self-hosted]
if: github.event.pull_request.draft == false


steps:

- uses: actions/checkout@v4
with:
submodules: false
repository: analogdevicesinc/msdk
fetch-depth: 0

- name: Set MAXIM_PATH
run: |
echo "MAXIM_PATH=$(pwd)" >> $GITHUB_ENV
printenv
- name: Lock Boards
uses: Analog-Devices-MSDK/btm-ci-scripts/actions/[email protected]
with:
boards: |
max78002_board_ex
lock: true
timeout: 900 # Attempt to lock for an hour

- name: run_example_test
run: |
bash .github/workflows/scripts/example_tester_78002.sh max78002_board_ex
- name: Unlock Boards
if: always()
uses: Analog-Devices-MSDK/btm-ci-scripts/actions/[email protected]
with:
lock: false
all_owned: true









2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Skip autogenerated register files and internal use board files
FILTER_REGEX_EXCLUDE: (.*\/Libraries\/Unity\/.*)|(.*\/Libraries\/CMSIS\/Device\/Maxim\/.*\/Include\/partition_.*\.h)|(.*\/Libraries\/((CMSIS\/Device\/Maxim\/[^\/]*\/Include)|(PeriphDrivers\/Source\/[^\/]*))\/[^\/]*_regs\.h)|(.*\/Libraries\/Boards\/[^\/]*\/(BCB|Emulator|Simulation|ROM)[^\/]*\/.*)|(.*\/Examples\/[^\/]*\/Display\/lvgl-8\.0\.2\/.*)|(.*\/Examples\/[^\/]*\/Demo\/lv_conf.h)|(.*\/Libraries\/CMSIS\/5.9.0\/.*)|(.*\/Libraries\/CMSIS\/Include\/.*)|(.*\/Libraries\/Cordio\/.*)|(.*\/Libraries\/SDHC\/.*)|(.*\/Libraries\/lwIP\/.*)|(.*\/Examples\/[^\/]*\/CNN\/.*)
FILTER_REGEX_EXCLUDE: (.*\/Libraries\/Unity\/.*)|(.*\/Libraries\/CMSIS\/Device\/Maxim\/.*\/Include\/partition_.*\.h)|(.*\/Libraries\/((CMSIS\/Device\/Maxim\/[^\/]*\/Include)|(PeriphDrivers\/Source\/[^\/]*))\/[^\/]*_regs\.h)|(.*\/Libraries\/Boards\/[^\/]*\/(BCB|Emulator|Simulation|ROM)[^\/]*\/.*)|(.*\/Examples\/[^\/]*\/Display\/lvgl-8\.0\.2\/.*)|(.*\/Examples\/[^\/]*\/Demo\/lv_conf.h)|(.*\/Libraries\/CMSIS\/5.9.0\/.*)|(.*\/Libraries\/CMSIS\/Include\/.*)|(.*\/Libraries\/Cordio\/.*)|(.*\/Libraries\/SDHC\/.*)|(.*\/Libraries\/lwIP\/.*)|(.*\/Examples\/[^\/]*\/CNN\/.*)|(.*\/Libraries\/tinyusb\/.*)|(.*\/Libraries\/CMSIS\/5\.9\.0\/DSP\/.*)|(.*\/Libraries\/CMSIS\/Device\/Maxim\/MAX32657\/Source\/Template\/.*)|(.*\/partition_.*\.h)

# Explicity turn off all linters except CPP
# SuperLinter Documentation says all we need to do is turn on the ones we want
Expand Down
Loading

0 comments on commit 3b4cc3b

Please sign in to comment.