Merge branch 'main' of https://github.com/Analog-Devices-MSDK/msdk

analogdevicesinc · Jan 10, 2025 · 4681791 · 4681791
2 parents 1b57b57 + c316b83
commit 4681791
Show file tree

Hide file tree

Showing 1,022 changed files with 82,986 additions and 27,764 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -9,8 +9,7 @@
  #
  # Copyright (C) 2022-2023 Maxim Integrated Products, Inc. (now owned by
  # Analog Devices, Inc.),
- # Copyright (C) 2023-2024 Analog Devices, Inc. All Rights Reserved. This software
- # is proprietary to Analog Devices, Inc. and its licensors.
+ # Copyright (C) 2023-2024 Analog Devices, Inc. All Rights Reserved.
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@ -73,6 +72,14 @@
 - '**/Libraries/PeriphDrivers/max32655_files.mk'
 - '**/Libraries/PeriphDrivers/Include/MAX32655/**/*'
 
+'MAX32657':
+- '**/Examples/MAX32657/**/*'
+- '**/*me30*.*'
+- '**/Libraries/Boards/MAX32657/**/*'
+- '**/Libraries/CMSIS/Device/Maxim/MAX32657/**/*'
+- '**/Libraries/PeriphDrivers/max32657_files.mk'
+- '**/Libraries/PeriphDrivers/Include/MAX32657/**/*'
+
 'MAX32660':
 - '**/Examples/MAX32660/**/*'
 - '**/*me11*.*'
@@ -221,3 +228,6 @@
 'Workflow':
 - '**/.github/workflows/**/*'
 - '**/.github/**/*'
+
+'Zephyr':
+- '**/Libraries/zephyr/**/*'
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,5 +1,3 @@
-## Pull Request Template
-
 ### Description
 
 Please include a summary of the changes and related issues. Please also include relevant motivation and context.
@@ -11,6 +9,12 @@ Please include a summary of the changes and related issues. Please also include
 - [ ] (Optional) Link any related GitHub issues [using a keyword](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)
 - [ ] (Optional) Provide info on any relevant functional testing/validation.  For API changes or significant features, this is not optional.
 
+_______________________________________________________________________________
+
+> [!WARNING]
+> This is a template. Delete everything below the line when submitting a pull request.
+
+
 ### PR Title Guidelines
 
 The MSDK repo follows a custom rule set based on the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard. The pull request titles will follow this format:

diff --git a/.github/workflows/BLE_Examples_Test.yml b/.github/workflows/BLE_Examples_Test.yml
@@ -595,8 +595,6 @@ jobs:
           boards: |
             max32655_board1
             max32655_board2
-            max32665_board1
-            max32690_board_w1
           lock: true
           timeout: 3600 # Attempt to lock for an hour
 
@@ -615,23 +613,21 @@ jobs:
           # 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'}}
+        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32655_RUN_ALL_TEST == 'true'}}
         uses: Analog-Devices-MSDK/btm-ci-scripts/actions/[email protected]
         with:
           board: |
             max32655_board1
             max32655_board2
-            max32665_board1
-            max32690_board_w1
 
           has_two_flash_banks: |
             true
             true
-            true
-            true
+            # true
+            # true
 
       - name: Flash DATS 655
-        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true'}}
+        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32655_RUN_ALL_TEST == 'true'}}
         uses: Analog-Devices-MSDK/btm-ci-scripts/actions/[email protected]
         with:
           board: |
@@ -652,7 +648,7 @@ jobs:
           distclean: true
 
       - name: DATS 655
-        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true'}}
+        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32655_RUN_ALL_TEST == 'true'}}
         run: | 
           DATS_TEST_DIR=$TEST_DIR/dats     
           DATS_BOARD_655=max32655_board1
@@ -662,17 +658,15 @@ jobs:
 
 
       - name: Erase Boards OTAS
-        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32665_DATS_CONNECTED_TEST == 'true' || env.MAX32690_DATS_CONNECTED_TEST == 'true'}}
+        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32655_RUN_ALL_TEST == 'true'}}
         uses: Analog-Devices-MSDK/btm-ci-scripts/actions/[email protected]
         with:
           board: |
             max32655_board1
             max32655_board2
-            max32665_board1
-            max32690_board_w1
       
       - name: Flash OTAS
-        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32665_DATS_CONNECTED_TEST == 'true' || env.MAX32690_DATS_CONNECTED_TEST == 'true'}}
+        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32655_RUN_ALL_TEST == 'true'}}
         uses: Analog-Devices-MSDK/btm-ci-scripts/actions/[email protected]
         with:
           board: |
@@ -695,13 +689,13 @@ jobs:
           distclean: true
 
       - name: OTAS
-        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32665_DATS_CONNECTED_TEST == 'true' || env.MAX32690_DATS_CONNECTED_TEST == 'true'}}
+        if: ${{env.MAX32655_DATS_CONNECTED_TEST == 'true' || env.MAX32655_RUN_ALL_TEST == 'true'}}
         run: | 
           OTAS_TEST_DIR=$TEST_DIR/otas
           OTAS_BOARD_655=max32655_board1
           OTAC_BOARD_655=max32655_board2
-          OTAC_BOARD_665=max32665_board1
-          OTAC_BOARD_690=max32690_board_w1
+          # OTAC_BOARD_665=max32665_board1
+          # OTAC_BOARD_690=max32690_board_w1
 
 
           if [[ $MAX32655_OTAS_CONNECTED_TEST == 'true' ]]; then

diff --git a/.github/workflows/clang-format-run-pr.yml b/.github/workflows/clang-format-run-pr.yml
@@ -25,13 +25,22 @@ on:
   issue_comment:
       types: [created]
 
+permissions:
+  actions: write
+  contents: write
+
 env:
   CLANG_VERSION: 14
 
 jobs:
 
-  run-on-pr: 
-    # Run on branchs, not forked PR branches
+  run-on-pr:
+    permissions:
+      contents: write
+      pull-requests: write
+      actions: write
+
+    # Run on branches, not forked PR branches
     if: |
       contains(github.event.comment.body, '/clang-format-run')
 
@@ -44,7 +53,7 @@ jobs:
       run: |
         sudo apt-get install clang-format-${CLANG_VERSION}
 
-    - uses: actions/github-script@v6
+    - uses: actions/github-script@v7
       id: get-pr
       with:
         script: |

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -78,7 +78,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
           # Skip autogenerated register files and internal use board files
-          FILTER_REGEX_EXCLUDE: (.*\/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)
+          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 

diff --git a/.github/workflows/scripts/zephyr-hal.sh b/.github/workflows/scripts/zephyr-hal.sh
@@ -25,6 +25,8 @@ rm -rf ${hal_adi}/MAX/
 
 # Create parent folder
 mkdir -p ${hal_adi}/MAX/Libraries/CMSIS
+mkdir -p ${hal_adi}/MAX/Libraries/MAXUSB/include
+mkdir -p ${hal_adi}/MAX/Libraries/MAXUSB/src
 mkdir -p ${hal_adi}/MAX/Libraries/PeriphDrivers
 
 # Copy zephyr wrappers, system files and cmakefiles
@@ -38,11 +40,19 @@ cp -rf ${msdk}/Libraries/CMSIS/Include ${hal_adi}/MAX/Libraries/CMSIS/
 cp -rf ${msdk}/Libraries/PeriphDrivers/Include ${hal_adi}/MAX/Libraries/PeriphDrivers/
 cp -rf ${msdk}/Libraries/PeriphDrivers/Source  ${hal_adi}/MAX/Libraries/PeriphDrivers/
 
+# Copy MAXUSB folder
+cp -rf ${msdk}/Libraries/MAXUSB/include/core ${hal_adi}/MAX/Libraries/MAXUSB/include/
+cp -rf ${msdk}/Libraries/MAXUSB/src/core     ${hal_adi}/MAX/Libraries/MAXUSB/src/
+
 # Remove unneeded files
 rm -rf ${hal_adi}/MAX/Libraries/CMSIS/Device/Maxim/GCC
 rm -rf ${hal_adi}/MAX/Libraries/CMSIS/Device/Maxim/MAX*/Source/IAR
 rm -rf ${hal_adi}/MAX/Libraries/CMSIS/Device/Maxim/MAX*/Source/GCC
 rm -rf ${hal_adi}/MAX/Libraries/CMSIS/Device/Maxim/MAX*/Source/ARM
+rm -rf ${hal_adi}/MAX/Libraries/MAXUSB/include/core/arm
+rm -rf ${hal_adi}/MAX/Libraries/MAXUSB/include/core/maxq
+rm -rf ${hal_adi}/MAX/Libraries/MAXUSB/src/core/arm
+rm -rf ${hal_adi}/MAX/Libraries/MAXUSB/src/core/maxq
 
 # Check either dirty or clean
 cd ${hal_adi}

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 Examples/*/*/build
+Examples/**/build
 Examples/*/*/buildrv
 Examples/*/*/*/build
 Examples/*/*/*/buildrv

diff --git a/Examples/MAX32650/USB/MAXUSB/USB_CDCACM/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_CDCACM/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)

diff --git a/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_CDC/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)

diff --git a/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_CompositeDevice_MSC_HID/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)

diff --git a/Examples/MAX32650/USB/MAXUSB/USB_HIDKeyboard/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_HIDKeyboard/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)

diff --git a/Examples/MAX32650/USB/MAXUSB/USB_MassStorage/Makefile b/Examples/MAX32650/USB/MAXUSB/USB_MassStorage/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)

diff --git a/Examples/MAX32650/USB/TinyUSB/cdc_msc/Makefile b/Examples/MAX32650/USB/TinyUSB/cdc_msc/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)

diff --git a/Examples/MAX32650/USB/TinyUSB/cdc_msc_freertos/Makefile b/Examples/MAX32650/USB/TinyUSB/cdc_msc_freertos/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)

diff --git a/Examples/MAX32650/USB/TinyUSB/hid_composite/Makefile b/Examples/MAX32650/USB/TinyUSB/hid_composite/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)

diff --git a/Examples/MAX32650/USB/TinyUSB/msc_dual_lun/Makefile b/Examples/MAX32650/USB/TinyUSB/msc_dual_lun/Makefile
@@ -100,7 +100,7 @@ $(info Loaded project.mk)
 
 ifeq "$(MAXIM_PATH)" ""
 # MAXIM_PATH is still not defined...
-DEPTH := ../../../../
+DEPTH := ../../../../../
 MAXIM_PATH := $(abspath $(DEPTH))
 $(warning Warning:  MAXIM_PATH is not set!  Set MAXIM_PATH in your environment or in project.mk to clear this warning.)
 $(warning Warning:  Attempting to use $(MAXIM_PATH) calculated from relative path)