Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Analog-Devices-MSDK/msdk in…
Browse files Browse the repository at this point in the history
…to dev-dc_delay

* 'main' of https://github.com/Analog-Devices-MSDK/msdk: (27 commits)
  Add SBT vs non-SBT Linkerfile Selection to MAX32672 LP Example (analogdevicesinc#401)
  Fixed script path error and added ME18 WLP PER test. (analogdevicesinc#418)
  Adding BTLE_LDO_TRIM register. (analogdevicesinc#402)
  Add Paths ignore to BLE test (analogdevicesinc#415)
  Not running on draft PR. (analogdevicesinc#414)
  Added a simple PER CI test. (analogdevicesinc#407)
  CAN Library Touch-Up (analogdevicesinc#400)
  [MSDK-976] Removed PUF references from ME18. (analogdevicesinc#318)
  Porting EEPROM_Emulator example (analogdevicesinc#379)
  MAX32520: Fix I2C slave address register offset. (analogdevicesinc#384)
  Add AI87 KWS20 Demo (analogdevicesinc#385)
  MAX32672EVKIT display example update (analogdevicesinc#392)
  Calibration and Initialization tools for CI (analogdevicesinc#398)
  Setting default BT_VER to 9. (analogdevicesinc#397)
  Added mini-circuits rf switch control. (analogdevicesinc#399)
  Updating FreeRTOS (v10.2.0) and FreeRTOS-Plus libraries to latest FreeRTOS (v10.5.1) release. (analogdevicesinc#361)
  Removed some unneeded type  hints to lower Python requirements (analogdevicesinc#387)
  Updated board files for ME18 (analogdevicesinc#394)
  Adding enumeration for btleldoctrl register. (analogdevicesinc#390)
  [MSDK-1042]: Resolving hardfault in MAX32672 LP example. (analogdevicesinc#391)
  ...
  • Loading branch information
tim-magnusen committed Feb 15, 2023
2 parents 249d8b2 + d998f01 commit 88d7dbe
Show file tree
Hide file tree
Showing 11,017 changed files with 3,414,941 additions and 1,261,066 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 11 additions & 1 deletion .github/workflows/BLE_Examples_Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@ on:
# branches: [ "main" ]
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:

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Build_Examples.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Build_Examples

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
Expand Down
25 changes: 17 additions & 8 deletions .github/workflows/Verify_Register_SVD.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Verify Register and SVD Files

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
Expand Down Expand Up @@ -316,19 +320,21 @@ jobs:
do
# Isolate to file name.
periph=${changed_svd_file##*/}
periph=${periph%*.svd}
# Adding '/' to differentiate between trimsir and sir.
periph="/${periph%*.svd}"
# Check if "Peripheral Rev#" SVD File or "SYS/SVD" (e.g. gcr_me14.svd) SVD File.
if [[ "$periph" =~ "_rev" ]]; then
periph=${periph%_rev*}
periph="/${periph%_rev*}"
else
# Remove attached die type name (Usually SYS register SVD files like gcr_me14.svd and fcr_me18.svd)
for die_name in ${!DIE_TO_CHIP_NAMES[@]}
do
lowercase_die_name=${die_name,,}
if [[ "$periph" =~ "_${lowercase_die_name}" ]]; then
periph=${periph%_${lowercase_die_name}*}
periph="/${periph%_${lowercase_die_name}*}"
break
fi
done
Expand Down Expand Up @@ -440,15 +446,15 @@ jobs:
# Helps minimize runtime by using a temporary list as a checklist instead of fully reiterating.
updated_part_list=${CHANGED_REG_FILES_PER_PART[$die_name]}
# Find parts depend on current peripheral SVD file.
# Find parts dependent on current peripheral SVD file.
# Read chip_periph.txt
if [[ -n $updated_part_list ]]; then
# Check whether one of the changed register files matches with SVD path
for changed_reg_file in ${CHANGED_REG_FILES_PER_PART[$die_name]}
do
# Isolate peripheral of changed register file to find corresponding peripheral SVD file
periph=${changed_reg_file##*/}
periph=${periph%_regs.h}
periph="/${periph%_regs.h}"
# Check if peripheral SVD file matches with changed register file using the peripheral name
match_line=$(find $CHIP_PERIPH -exec grep -s "$periph" {} \;)
Expand Down Expand Up @@ -571,9 +577,12 @@ jobs:
if [[ -n ${REGISTER_SVD_FILE_LIST[${affected_pr_reg_file#./*/}]} ]]; then
echo -e "[\e[0;31mERROR\e[0m] Could not find ${REGISTER_SVD_FILE_LIST[${affected_pr_reg_file#./*/}]} for ${affected_pr_reg_file#./*/}. Please add the correct SVD file. Contact the developers if you are adding a new register file.\n\n"
else
# This goes for deleted deprecated files.
# If no SVD file was added to REGISTER_SVD_FILE_LIST, then it's likely a deprecated file.
echo -e "[\e[0;31mERROR\e[0m] Could not find corresponding peripheral SVD file for ${affected_pr_reg_file#./*/}. Please make sure this register file is supported. Contact the developers for any assistance.\n\n"
# Exception for deleted files.
# If the script reaches this point, then that means an unsupported file was deleted. Typically, that means a deprecated file was deleted.
# The action will not fail if an unsupported file was deleted, but be wary of what was deleted.
# Note: If no SVD file was added to REGISTER_SVD_FILE_LIST, then it's likely a deprecated file.
CHECK_FAIL=0
echo -e "[\e[0;31mWARNING\e[0m] Could not find corresponding peripheral SVD file for ${affected_pr_reg_file#./*/}. Please confirm this is correct. Contact the developers for any assistance.\n\n"
fi
fi
fi
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: clang-format-check

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
Expand Down Expand Up @@ -53,7 +57,7 @@ jobs:
CLANG_VERSION=14
cat .clang-format
CHANGE_FILES=$(git diff --ignore-submodules --name-only remotes/origin/main '*.c' '*.h' ':!*_regs.h' ':!*weights.h' ':!*cnn.h' ':!*cnn.c' ':!*sampledata.h' ':!*sampleoutput.h' ':!*softmax.c' ':!Libraries/FCL' ':!Libraries/FreeRTOS' ':!Libraries/lwIP' ':!Libraries/littlefs' ':!Libraries/FreeRTOS-Plus' ':!Libraries/LC3' ':!Libraries/SDHC' ':!Libraries/MAXUSB' ':!Libraries/Cordio')
CHANGE_FILES=$(git diff --ignore-submodules --name-only remotes/origin/main '*.c' '*.h' ':!*_regs.h' ':!*weights.h' ':!*cnn.h' ':!*cnn.c' ':!*sampledata.h' ':!*sampleoutput.h' ':!*softmax.c' ':!Libraries/FCL' ':!Libraries/FreeRTOS' ':!Libraries/lwIP' ':!Libraries/littlefs' ':!Libraries/FreeRTOS-Plus' ':!Libraries/LC3' ':!Libraries/SDHC' ':!Libraries/MAXUSB' ':!Libraries/Cordio' ':!Libraries/LVGL')
CHECK_FAIL=0
set +e
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang-format-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CLANG_VERSION=14

# Find the C files
CFILES=$(find . -iname "*.c" -not -name "*cnn.c" -a -not -name "*softmax.c" -a -not -regex ".*/Libraries/\(Cordio\|FCL\|FreeRTOS\|FreeRTOS\-Plus\|LC3\|littlefs\|lwIP\|MAXUSB\|SDHC\)/.*")
CFILES=$(find . -iname "*.c" -not -name "*cnn.c" -a -not -name "*softmax.c" -a -not -regex ".*/Libraries/\(Cordio\|FCL\|FreeRTOS\|FreeRTOS\-Plus\|LC3\|littlefs\|lwIP\|MAXUSB\|SDHC\|LVGL\)/.*")

for c_file in ${CFILES}
do
Expand All @@ -20,7 +20,7 @@ done


# Reformat all of the header files
HFILES=$(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/\(Cordio\|FCL\|FreeRTOS\|FreeRTOS\-Plus\|LC3\|littlefs\|lwIP\|MAXUSB\|SDHC\)/.*")
HFILES=$(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/\(Cordio\|FCL\|FreeRTOS\|FreeRTOS\-Plus\|LC3\|littlefs\|lwIP\|MAXUSB\|SDHC\|LVGL\)/.*")
for h_file in ${HFILES}
do
clang-format-${CLANG_VERSION} --verbose -style=file -i ${h_file}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
#################################
name: Lint Code Base

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

#
# Documentation:
# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
Expand Down
33 changes: 0 additions & 33 deletions .github/workflows/open_load.sh

This file was deleted.

Loading

0 comments on commit 88d7dbe

Please sign in to comment.