From 98bc33f81628ec5d53454ab2f4cb51c361f62749 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 24 Oct 2024 19:11:09 +0000 Subject: [PATCH] Update Zephyr MSDK Hal based on MSDK PR: https://github.com/analogdevicesinc/msdk/pull/1232 --- MAX/Include/wrap_max32_tmr.h | 3 ++- MAX/Libraries/PeriphDrivers/Include/MAX32657/gpio.h | 4 +++- MAX/msdk_sha | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MAX/Include/wrap_max32_tmr.h b/MAX/Include/wrap_max32_tmr.h index f3706dae..310e90ed 100644 --- a/MAX/Include/wrap_max32_tmr.h +++ b/MAX/Include/wrap_max32_tmr.h @@ -105,7 +105,8 @@ int Wrap_MXC_TMR_GetPendingInt(mxc_tmr_regs_t *tmr) (CONFIG_SOC_MAX32672) || (CONFIG_SOC_MAX32662) || (CONFIG_SOC_MAX32675) || \ (CONFIG_SOC_MAX32680) || (CONFIG_SOC_MAX32657) || (CONFIG_SOC_MAX78002) -#if defined(CONFIG_SOC_MAX32672) || (CONFIG_SOC_MAX32675) || (CONFIG_SOC_MAX32657) +#if defined(CONFIG_SOC_MAX32672) || (CONFIG_SOC_MAX32675) || (CONFIG_SOC_MAX32657) || \ + (CONFIG_SOC_MAX32670) /* All timers are 32bits */ #define WRAP_MXC_IS_32B_TIMER(idx) (1) #elif defined(CONFIG_SOC_MAX32662) diff --git a/MAX/Libraries/PeriphDrivers/Include/MAX32657/gpio.h b/MAX/Libraries/PeriphDrivers/Include/MAX32657/gpio.h index cf1a7ad6..2c076b28 100644 --- a/MAX/Libraries/PeriphDrivers/Include/MAX32657/gpio.h +++ b/MAX/Libraries/PeriphDrivers/Include/MAX32657/gpio.h @@ -152,7 +152,9 @@ typedef enum { typedef enum { MXC_GPIO_PAD_NONE, /**< No pull-up or pull-down */ MXC_GPIO_PAD_WEAK_PULL_UP, /**< Set pad to weak pull-up */ - MXC_GPIO_PAD_WEAK_PULL_DOWN /**< Set pad to weak pull-down */ + MXC_GPIO_PAD_WEAK_PULL_DOWN, /**< Set pad to weak pull-down */ + MXC_GPIO_PAD_PULL_UP = MXC_GPIO_PAD_WEAK_PULL_UP, /**< Set pad to default (weak) pull-up */ + MXC_GPIO_PAD_PULL_DOWN = MXC_GPIO_PAD_WEAK_PULL_DOWN /**< Set pad to default (weak) pull-down */ } mxc_gpio_pad_t; /** diff --git a/MAX/msdk_sha b/MAX/msdk_sha index caf0a6e2..614bf75c 100644 --- a/MAX/msdk_sha +++ b/MAX/msdk_sha @@ -1 +1 @@ -db69388844d29e727cd245b90b54279341f77401 +c75f2f7143b66b90dd6e699de4989b4437c893ae