Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrate nrfx 3.1.0 #59838

Merged
merged 3 commits into from
Jul 13, 2023
Merged

Integrate nrfx 3.1.0 #59838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
274b483
manifest: hal_nordic: Update hal_nordic revision
Jun 29, 2023
13bb8fc
drivers: pwm: pwm_nrfx: Revert workaround for stopping PWM instance
Jun 29, 2023
53bc5d8
modules: hal_nordic: nrfx_config: Align to updates in nrfx 3.1.0
Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions drivers/pwm/pwm_nrfx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,7 @@ static int pwm_nrfx_set_cycles(const struct device *dev, uint32_t channel,
* and till that moment, it ignores any start requests,
* so ensure here that it is stopped.
*/
/* TODO: Remove nrfy_pwm_events_process() that is temporarly
* added as a workaround for missing functionality in
* nrfx_pwm_stopped_check()
*/
while (!nrfx_pwm_stopped_check(&config->pwm) &&
!nrfy_pwm_events_process(config->pwm.p_reg,
NRFY_EVENT_TO_INT_BITMASK(NRF_PWM_EVENT_STOPPED))) {
while (!nrfx_pwm_stopped_check(&config->pwm)) {
}
}

Expand Down
51 changes: 51 additions & 0 deletions modules/hal_nordic/nrfx/nrfx_config_nrf51.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,57 @@
#define NRFX_PPI_CONFIG_LOG_LEVEL 3
#endif

/**
* @brief NRFX_PRS_ENABLED
*
* Boolean. Accepted values 0 and 1.
*/
#ifndef NRFX_PRS_ENABLED
#define NRFX_PRS_ENABLED 0
#endif

/**
* @brief NRFX_PRS_CONFIG_LOG_ENABLED
*
* Boolean. Accepted values 0 and 1.
*/
#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
#define NRFX_PRS_CONFIG_LOG_ENABLED 0
#endif

/**
* @brief NRFX_PRS_CONFIG_LOG_LEVEL
*
* Integer value.
* Supported values:
* - Off = 0
* - Error = 1
* - Warning = 2
* - Info = 3
* - Debug = 4
*/
#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
#define NRFX_PRS_CONFIG_LOG_LEVEL 3
#endif

/**
* @brief NRFX_PRS_BOX_0_ENABLED
*
* Boolean. Accepted values 0 and 1.
*/
#ifndef NRFX_PRS_BOX_0_ENABLED
#define NRFX_PRS_BOX_0_ENABLED 0
#endif

/**
* @brief NRFX_PRS_BOX_1_ENABLED
*
* Boolean. Accepted values 0 and 1.
*/
#ifndef NRFX_PRS_BOX_1_ENABLED
#define NRFX_PRS_BOX_1_ENABLED 0
#endif

/**
* @brief NRFX_QDEC_ENABLED
*
Expand Down
6 changes: 3 additions & 3 deletions modules/hal_nordic/nrfx/nrfx_config_nrf52805.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*
* Integer value.
* Supported values:
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - External Low Swing = 131073
* - External Full Swing = 196609
*/
Expand Down
6 changes: 3 additions & 3 deletions modules/hal_nordic/nrfx/nrfx_config_nrf52810.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*
* Integer value.
* Supported values:
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - External Low Swing = 131073
* - External Full Swing = 196609
*/
Expand Down
6 changes: 3 additions & 3 deletions modules/hal_nordic/nrfx/nrfx_config_nrf52811.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*
* Integer value.
* Supported values:
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - External Low Swing = 131073
* - External Full Swing = 196609
*/
Expand Down
6 changes: 3 additions & 3 deletions modules/hal_nordic/nrfx/nrfx_config_nrf52820.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*
* Integer value.
* Supported values:
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - External Low Swing = 131073
* - External Full Swing = 196609
*/
Expand Down
15 changes: 4 additions & 11 deletions modules/hal_nordic/nrfx/nrfx_config_nrf52832.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*
* Integer value.
* Supported values:
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - External Low Swing = 131073
* - External Full Swing = 196609
*/
Expand Down Expand Up @@ -626,14 +626,7 @@
* @brief NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE - EGU instance used by the nRF52 Anomaly 109
* workaround for PWM.
*
* Integer value.
* Supported values:
* - EGU0 = 0
* - EGU1 = 1
* - EGU2 = 2
* - EGU3 = 3
* - EGU4 = 4
* - EGU5 = 5
* Integer value. Minimum: 0 Maximum: 5
*/
#ifndef NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE
#define NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE 5
Expand Down
6 changes: 3 additions & 3 deletions modules/hal_nordic/nrfx/nrfx_config_nrf52833.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*
* Integer value.
* Supported values:
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - External Low Swing = 131073
* - External Full Swing = 196609
*/
Expand Down
6 changes: 3 additions & 3 deletions modules/hal_nordic/nrfx/nrfx_config_nrf52840.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
*
* Integer value.
* Supported values:
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - RC = 0
* - XTAL = 1
* - Synth = 2
* - External Low Swing = 131073
* - External Full Swing = 196609
*/
Expand Down
6 changes: 3 additions & 3 deletions modules/hal_nordic/nrfx/nrfx_config_nrf91.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
*
* Integer value.
* Supported values:
* - RC = 1
* - XTAL = 2
* - RC = 1
* - XTAL = 2
*/
#ifndef NRFX_CLOCK_CONFIG_LF_SRC
#define NRFX_CLOCK_CONFIG_LF_SRC 2
Expand Down Expand Up @@ -278,7 +278,7 @@
* Integer value. Minimum: 0 Maximum: 7
*/
#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY 3
#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
#endif

/**
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ manifest:
groups:
- hal
- name: hal_nordic
revision: a1c3e0fbaafda091139b8744becd4853ada2f747
revision: 20ae0a7be9030dd58fb59db1c74315a60efb076f
path: modules/hal/nordic
groups:
- hal
Expand Down
Loading