Skip to content

Commit

Permalink
Merge branch 'main' into dev/spi_target
Browse files Browse the repository at this point in the history
  • Loading branch information
sihyung-maxim committed Jul 12, 2023
2 parents 10471b1 + d8665b3 commit 7f6e02b
Show file tree
Hide file tree
Showing 47 changed files with 682 additions and 231 deletions.
154 changes: 77 additions & 77 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,92 +41,92 @@
###############################################################################

'BLE':
- 'Examples/*/BLE*/*'
- 'Libraries/BlePhy/*'
- 'Libraries/Cordio/*'
- 'Tools/Bluetooth/*'
- '*Examples/*/BLE*/*'
- '*Libraries/BlePhy/*'
- '*Libraries/Cordio/*'
- '*Tools/Bluetooth/*'

'documentation':
- 'Documentation/*'
- '*Documentation/*'

'MAX32520':
- 'Examples/MAX32520/*'
- '*Examples/MAX32520/*'
- '*es17.*'
- 'Libraries/Boards/MAX32520/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32520/*'
- 'Libraries/PeriphDrivers/max32520_files.mk'
- 'Libraries/Include/MAX32520/*'
- '*Libraries/Boards/MAX32520/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32520/*'
- '*Libraries/PeriphDrivers/max32520_files.mk'
- '*Libraries/Include/MAX32520/*'

'MAX32570':
- '*me13.*'
- 'Libraries/Boards/MAX32570/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32570/*'
- 'Libraries/PeriphDrivers/max32570_files.mk'
- 'Libraries/Include/MAX32570/*'
- '*Libraries/Boards/MAX32570/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32570/*'
- '*Libraries/PeriphDrivers/max32570_files.mk'
- '*Libraries/Include/MAX32570/*'

'MAX32650':
- 'Examples/MAX32650/*'
- '*Examples/MAX32650/*'
- '*me10.*'
- 'Libraries/Boards/MAX32650/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32650/*'
- 'Libraries/PeriphDrivers/max32650_files.mk'
- 'Libraries/Include/MAX32650/*'
- '*Libraries/Boards/MAX32650/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32650/*'
- '*Libraries/PeriphDrivers/max32650_files.mk'
- '*Libraries/Include/MAX32650/*'

'MAX32655':
- 'Examples/MAX32655/*'
- '*Examples/MAX32655/*'
- '*me17.*'
- 'Libraries/Boards/MAX32655/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32655/*'
- 'Libraries/PeriphDrivers/max32655_files.mk'
- 'Libraries/Include/MAX32655/*'
- '*Libraries/Boards/MAX32655/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32655/*'
- '*Libraries/PeriphDrivers/max32655_files.mk'
- '*Libraries/Include/MAX32655/*'

'MAX32660':
- 'Examples/MAX32660/*'
- '*Examples/MAX32660/*'
- '*me11.*'
- 'Libraries/Boards/MAX32660/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32660/*'
- 'Libraries/PeriphDrivers/max32660_files.mk'
- 'Libraries/Include/MAX32660/*'
- '*Libraries/Boards/MAX32660/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32660/*'
- '*Libraries/PeriphDrivers/max32660_files.mk'
- '*Libraries/Include/MAX32660/*'

'MAX32662':
- 'Examples/MAX32662/*'
- '*Examples/MAX32662/*'
- '*me12.*'
- 'Libraries/Boards/MAX32662/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32662/*'
- 'Libraries/PeriphDrivers/max32662_files.mk'
- 'Libraries/Include/MAX32662/*'
- '*Libraries/Boards/MAX32662/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32662/*'
- '*Libraries/PeriphDrivers/max32662_files.mk'
- '*Libraries/Include/MAX32662/*'

'MAX32665':
- 'Examples/MAX32665/*'
- '*Examples/MAX32665/*'
- '*me14.*'
- 'Libraries/Boards/MAX32665/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32665/*'
- 'Libraries/PeriphDrivers/max32665_files.mk'
- 'Libraries/Include/MAX32665/*'
- '*Libraries/Boards/MAX32665/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32665/*'
- '*Libraries/PeriphDrivers/max32665_files.mk'
- '*Libraries/Include/MAX32665/*'

'MAX32670':
- 'Examples/MAX32670/*'
- '*Examples/MAX32670/*'
- '*me15.*'
- 'Libraries/Boards/MAX32670/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32670/*'
- 'Libraries/PeriphDrivers/max32670_files.mk'
- 'Libraries/Include/MAX32670/*'
- '*Libraries/Boards/MAX32670/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32670/*'
- '*Libraries/PeriphDrivers/max32670_files.mk'
- '*Libraries/Include/MAX32670/*'

'MAX32672':
- 'Examples/MAX32672/*'
- '*Examples/MAX32672/*'
- '*me21.*'
- 'Libraries/Boards/MAX32672/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32672/*'
- 'Libraries/PeriphDrivers/max32672_files.mk'
- 'Libraries/Include/MAX32672/*'
- '*Libraries/Boards/MAX32672/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32672/*'
- '*Libraries/PeriphDrivers/max32672_files.mk'
- '*Libraries/Include/MAX32672/*'

'MAX32675':
- 'Examples/MAX32675/*'
- '*Examples/MAX32675/*'
- '*me16.*'
- 'Libraries/Boards/MAX32675/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32675/*'
- 'Libraries/PeriphDrivers/max32675_files.mk'
- 'Libraries/Include/MAX32675/*'
- '*Libraries/Boards/MAX32675/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32675/*'
- '*Libraries/PeriphDrivers/max32675_files.mk'
- '*Libraries/Include/MAX32675/*'
- '*aes_me15.*'
- '*afe*'
- '*crc_me15.*'
Expand All @@ -149,12 +149,12 @@
- '*wdt*me15.*'

'MAX32680':
- 'Examples/MAX32680/*'
- '*Examples/MAX32680/*'
- '*me20.*'
- 'Libraries/Boards/MAX32680/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32680/*'
- 'Libraries/PeriphDrivers/max32680_files.mk'
- 'Libraries/Include/MAX32680/*'
- '*Libraries/Boards/MAX32680/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32680/*'
- '*Libraries/PeriphDrivers/max32680_files.mk'
- '*Libraries/Include/MAX32680/*'
- '*adc*me17.*'
- '*aes_me17.*'
- '*afe*'
Expand All @@ -180,20 +180,20 @@
- '*wut*me17.*'

'MAX32690':
- 'Examples/MAX32690/*'
- '*Examples/MAX32690/*'
- '*me18.*'
- 'Libraries/Boards/MAX32690/*'
- 'Libraries/CMSIS/Device/Maxim/MAX32690/*'
- 'Libraries/PeriphDrivers/max32690_files.mk'
- 'Libraries/Include/MAX32690/*'
- '*Libraries/Boards/MAX32690/*'
- '*Libraries/CMSIS/Device/Maxim/MAX32690/*'
- '*Libraries/PeriphDrivers/max32690_files.mk'
- '*Libraries/Include/MAX32690/*'

'MAX78000':
- 'Examples/MAX78000/*'
- '*Examples/MAX78000/*'
- '*ai85.*'
- 'Libraries/Boards/MAX78000/*'
- 'Libraries/CMSIS/Device/Maxim/MAX78000/*'
- 'Libraries/PeriphDrivers/max78000_files.mk'
- 'Libraries/Include/MAX78000/*'
- '*Libraries/Boards/MAX78000/*'
- '*Libraries/CMSIS/Device/Maxim/MAX78000/*'
- '*Libraries/PeriphDrivers/max78000_files.mk'
- '*Libraries/Include/MAX78000/*'
- '*adc*me17.*'
- '*aes_me17.*'
- '*crc_me17.*'
Expand All @@ -211,20 +211,20 @@
- '*wut*me17.svd'

'MAX78002':
- 'Examples/MAX78002/*'
- '*Examples/MAX78002/*'
- '*ai87.*'
- 'Libraries/Boards/MAX78002/*'
- 'Libraries/CMSIS/Device/Maxim/MAX78002/*'
- 'Libraries/PeriphDrivers/max78002_files.mk'
- 'Libraries/Include/MAX78002/*'
- '*Libraries/Boards/MAX78002/*'
- '*Libraries/CMSIS/Device/Maxim/MAX78002/*'
- '*Libraries/PeriphDrivers/max78002_files.mk'
- '*Libraries/Include/MAX78002/*'

'Register Change':
- '*_regs.h'
- '*.svd'

'Tools':
- 'Tools/*'
- '*Tools/*'

'Workflow':
- '.github/workflows/*'
- '.github/labeler.yml'
- '*.github/workflows/*'
- '*.github/labeler.yml'
37 changes: 37 additions & 0 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: "Package Release Components"

on:
release:
types:
- "published"

permissions:
contents: write

jobs:
release:
name: "Release"
runs-on: "ubuntu-latest"
steps:
- name: "Checkout the repository"
uses: "actions/[email protected]"

- name: "Archive Tools"
shell: "bash"
run: tar -cf Tools.tar.xz --use-compress-program='xz -9' ./Tools

- name: "Archive Examples"
shell: "bash"
run: tar -cf Examples.tar.xz --use-compress-program='xz -9' ./Examples

- name: "Archive Libraries"
shell: "bash"
run: tar -cf Libraries.tar.xz --use-compress-program='xz -9' ./Libraries

- name: "Upload the achives to the release"
uses: softprops/[email protected]
with:
files: |
${{ github.workspace }}/Tools.tar.xz
${{ github.workspace }}/Examples.tar.xz
${{ github.workspace }}/Libraries.tar.xz
8 changes: 8 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ jobs:
pull-requests: write

steps:
- name: Checkout
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
submodules: false
fetch-depth: 0

- name: Labeling
uses: actions/labeler@v4
with:
Expand Down
9 changes: 5 additions & 4 deletions Documentation/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,11 @@ The `Documentation/build.py` script can be used to build the MSDK User Guide and
To **build** the docs:

1. Install [doxygen](https://www.doxygen.nl/download.html)
2. Install Python 3
3. `pip install -r Documentation/requirements.txt`
4. `python Documentation/build.py`
5. The site will be built in the `docs` folder of the repo.
2. Add doxygen's binary diretory to the [Environmental Path](https://learn.microsoft.com/en-us/previous-versions/office/developer/sharepoint-2010/ee537574(v=office.14)) Variable
3. Install Python 3
4. `pip install -r Documentation/requirements.txt`
5. `python Documentation/build.py`
6. The site will be built in the `docs` folder of the repo.

To **preview** the generated site:

Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/Barcode_Decoder/src/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,16 @@ void utils_delay_ms(unsigned int ms)

unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/CameraIF/src/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,16 @@ void utils_delay_ms(unsigned int ms)

unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/MAX32572_Demo_BareMetal/src/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@
/************************ PUBLIC FUNCTIONS *******************************/
unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
11 changes: 6 additions & 5 deletions Examples/MAX32572/MAX32572_Demo_FreeRTOS/src/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@
/************************ PUBLIC FUNCTIONS *******************************/
unsigned int utils_get_time_ms(void)
{
uint32_t sec;
uint32_t subsec;
uint32_t sec, ssec;
double subsec;
uint32_t ms;

MXC_RTC_GetSubSeconds(&subsec);
subsec /= 4096;
MXC_RTC_GetSubSeconds(&ssec);
subsec = (double)ssec / (double)(4096.0);

MXC_RTC_GetSeconds(&sec);

ms = (sec * 1000) + (subsec * 1000);
ms = (sec * 1000) + (int)(subsec * 1000);

return ms;
}
Expand Down
Loading

0 comments on commit 7f6e02b

Please sign in to comment.