Skip to content

Commit

Permalink
Merge branch 'main' into fix/me10_lp_usb
Browse files Browse the repository at this point in the history
  • Loading branch information
sihyung-maxim committed Sep 19, 2023
2 parents c0ea506 + b4f31bd commit 6e55be5
Show file tree
Hide file tree
Showing 288 changed files with 6,167 additions and 3,619 deletions.
1 change: 1 addition & 0 deletions .github/workflows/clang-format-run-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
repository: ${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}
ref: ${{ fromJSON(steps.get-pr.outputs.result).head.ref }}
fetch-depth: 0
token: ${{ secrets.GITHUB_CI_TOKEN }}

- name: clang-format-run
run: |
Expand Down
6 changes: 3 additions & 3 deletions Examples/MAX32520/EEPROM_Emulator/include/cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
*
******************************************************************************/

#ifndef EXAMPLES_MAX78000_EEPROM_EMULATOR_CACHE_H_
#define EXAMPLES_MAX78000_EEPROM_EMULATOR_CACHE_H_
#ifndef EXAMPLES_MAX32520_EEPROM_EMULATOR_INCLUDE_CACHE_H_
#define EXAMPLES_MAX32520_EEPROM_EMULATOR_INCLUDE_CACHE_H_

/***** Included Files *****/
#include <stdbool.h>
Expand Down Expand Up @@ -79,4 +79,4 @@ int cache_refresh(cache_t *cache, uint32_t next_addr);
*/
int cache_write_back(cache_t *cache);

#endif // EXAMPLES_MAX78000_EEPROM_EMULATOR_CACHE_H_
#endif // EXAMPLES_MAX32520_EEPROM_EMULATOR_INCLUDE_CACHE_H_
6 changes: 3 additions & 3 deletions Examples/MAX32520/EEPROM_Emulator/include/eeprom.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
*
******************************************************************************/

#ifndef EXAMPLES_MAX78000_EEPROM_EMULATOR_EEPROM_H_
#define EXAMPLES_MAX78000_EEPROM_EMULATOR_EEPROM_H_
#ifndef EXAMPLES_MAX32520_EEPROM_EMULATOR_INCLUDE_EEPROM_H_
#define EXAMPLES_MAX32520_EEPROM_EMULATOR_INCLUDE_EEPROM_H_

/***** Included Files *****/
#include <stdbool.h>
Expand Down Expand Up @@ -80,4 +80,4 @@ int eeprom_init(mxc_i2c_regs_t *eeprom_i2c, mxc_gpio_cfg_t rdy_pin);
*/
void eeprom_prep_for_txn(void);

#endif // EXAMPLES_MAX78000_EEPROM_EMULATOR_EEPROM_H_
#endif // EXAMPLES_MAX32520_EEPROM_EMULATOR_INCLUDE_EEPROM_H_
1 change: 1 addition & 0 deletions Examples/MAX32520/EEPROM_Emulator/src/eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ int eeprom_init(mxc_i2c_regs_t *eeprom_i2c, mxc_gpio_cfg_t rdy_pin)
eeprom.rdy_pin.func = MXC_GPIO_FUNC_OUT;
eeprom.rdy_pin.pad = MXC_GPIO_PAD_NONE;
eeprom.rdy_pin.vssel = MXC_GPIO_VSSEL_VDDIO;
eeprom.rdy_pin.drvstr = MXC_GPIO_DRVSTR_0;

err = MXC_GPIO_Config(&eeprom.rdy_pin);
if (err != E_NO_ERROR) {
Expand Down
6 changes: 6 additions & 0 deletions Examples/MAX32520/GPIO/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ int main(void)
gpio_interrupt_status.pad = MXC_GPIO_PAD_NONE;
gpio_interrupt_status.func = MXC_GPIO_FUNC_OUT;
gpio_interrupt_status.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_interrupt_status.drvstr = MXC_GPIO_DRVSTR_0;
MXC_GPIO_Config(&gpio_interrupt_status);

/*
Expand All @@ -96,6 +97,7 @@ int main(void)
gpio_interrupt.pad = MXC_GPIO_PAD_PULL_UP;
gpio_interrupt.func = MXC_GPIO_FUNC_IN;
gpio_interrupt.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_interrupt.drvstr = MXC_GPIO_DRVSTR_0;
MXC_GPIO_Config(&gpio_interrupt);
MXC_GPIO_RegisterCallback(&gpio_interrupt, gpio_isr, &gpio_interrupt_status);
MXC_GPIO_IntConfig(&gpio_interrupt, MXC_GPIO_INT_FALLING);
Expand All @@ -111,13 +113,17 @@ int main(void)
gpio_in.mask = MXC_GPIO_PIN_IN;
gpio_in.pad = MXC_GPIO_PAD_PULL_UP;
gpio_in.func = MXC_GPIO_FUNC_IN;
gpio_in.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_in.drvstr = MXC_GPIO_DRVSTR_0;
MXC_GPIO_Config(&gpio_in);

/* Setup output pin. */
gpio_out.port = MXC_GPIO_PORT_OUT;
gpio_out.mask = MXC_GPIO_PIN_OUT;
gpio_out.pad = MXC_GPIO_PAD_NONE;
gpio_out.func = MXC_GPIO_FUNC_OUT;
gpio_out.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_out.drvstr = MXC_GPIO_DRVSTR_0;
MXC_GPIO_Config(&gpio_out);

while (1) {
Expand Down
1 change: 1 addition & 0 deletions Examples/MAX32520/Library_Generate/gpiolib.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

#include "mxc_errors.h"
#include "gpio.h"
#include "gpiolib.h"

void gpio_set(const mxc_gpio_cfg_t *gpio)
{
Expand Down
6 changes: 3 additions & 3 deletions Examples/MAX32520/Library_Generate/gpiolib.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
*
******************************************************************************/

#ifndef GPIOLIB_H_
#define GPIOLIB_H_
#ifndef EXAMPLES_MAX32520_LIBRARY_GENERATE_GPIOLIB_H_
#define EXAMPLES_MAX32520_LIBRARY_GENERATE_GPIOLIB_H_

#include "gpio.h"

Expand All @@ -61,4 +61,4 @@ void gpio_clear(const mxc_gpio_cfg_t *gpio);
*/
int gpio_get(const mxc_gpio_cfg_t *gpio);

#endif /* GPIOLIB_H_ */
#endif // EXAMPLES_MAX32520_LIBRARY_GENERATE_GPIOLIB_H_
6 changes: 3 additions & 3 deletions Examples/MAX32520/Library_Use/lib/include/gpiolib.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
*
******************************************************************************/

#ifndef GPIOLIB_H_
#define GPIOLIB_H_
#ifndef EXAMPLES_MAX32520_LIBRARY_USE_LIB_INCLUDE_GPIOLIB_H_
#define EXAMPLES_MAX32520_LIBRARY_USE_LIB_INCLUDE_GPIOLIB_H_

#include "gpio.h"

Expand All @@ -61,4 +61,4 @@ void gpio_clear(const mxc_gpio_cfg_t *gpio);
*/
int gpio_get(const mxc_gpio_cfg_t *gpio);

#endif /* GPIOLIB_H_ */
#endif // EXAMPLES_MAX32520_LIBRARY_USE_LIB_INCLUDE_GPIOLIB_H_
8 changes: 6 additions & 2 deletions Examples/MAX32572/GPIO/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ int main(void)
gpio_interrupt_status.pad = MXC_GPIO_PAD_NONE;
gpio_interrupt_status.func = MXC_GPIO_FUNC_OUT;
gpio_interrupt_status.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_interrupt_status.drvstr = MXC_GPIO_DRVSTR_0;
MXC_GPIO_Config(&gpio_interrupt_status);

/*
Expand All @@ -95,6 +96,7 @@ int main(void)
gpio_interrupt.pad = MXC_GPIO_PAD_PULL_UP;
gpio_interrupt.func = MXC_GPIO_FUNC_IN;
gpio_interrupt.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_interrupt.drvstr = MXC_GPIO_DRVSTR_0;
MXC_GPIO_Config(&gpio_interrupt);
MXC_GPIO_RegisterCallback(&gpio_interrupt, gpio_isr, &gpio_interrupt_status);
MXC_GPIO_IntConfig(&gpio_interrupt, MXC_GPIO_INT_FALLING);
Expand All @@ -110,15 +112,17 @@ int main(void)
gpio_in.mask = MXC_GPIO_PIN_IN;
gpio_in.pad = MXC_GPIO_PAD_PULL_UP;
gpio_in.func = MXC_GPIO_FUNC_IN;
gpio_interrupt.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_in.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_in.drvstr = MXC_GPIO_DRVSTR_0;
MXC_GPIO_Config(&gpio_in);

/* Setup output pin. */
gpio_out.port = MXC_GPIO_PORT_OUT;
gpio_out.mask = MXC_GPIO_PIN_OUT;
gpio_out.pad = MXC_GPIO_PAD_NONE;
gpio_out.func = MXC_GPIO_FUNC_OUT;
gpio_interrupt.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_out.vssel = MXC_GPIO_VSSEL_VDDIO;
gpio_out.drvstr = MXC_GPIO_DRVSTR_0;
MXC_GPIO_Config(&gpio_out);

while (1) {
Expand Down
6 changes: 3 additions & 3 deletions Examples/MAX32572/I2C/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Universal instructions on building, flashing, and debugging this project can be

## Expected Output
```
******** I2C SLAVE ASYNC TRANSACTION TEST *********
******** I2C Master-Slave Transaction Demo *********
This example uses one I2C peripheral as a master to
read and write to another I2C which acts as a slave.
Expand All @@ -37,9 +37,9 @@ P2.19 to P0.7 (SDA).
-->Result:
-->TxData: 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63
-->TxData: 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe
-->RxData: 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63
-->RxData: 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe
-->I2C Transaction Successful
Expand Down
Loading

0 comments on commit 6e55be5

Please sign in to comment.