Skip to content

manifest: update hal_nordic revision to integrate nrfx 3.13.0 #93316

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions drivers/adc/adc_nrfx_saadc.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
[NRF_SAADC_AIN5] = NRF_PIN_PORT_TO_PIN_NUMBER(10U, 1),
[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(11U, 1),
[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(12U, 1),
[NRF_SAADC_VDD] = NRF_SAADC_INPUT_VDD,
[NRF_SAADC_DVDD] = NRF_SAADC_INPUT_DVDD,
};
#endif

Expand Down
5 changes: 4 additions & 1 deletion tests/boards/nrf/comp/src/test.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,11 @@ ZTEST(comparator_runtime_configure, test_comp_config_se_vdd)

#ifdef COMP_REFSEL_REFSEL_AVDDAO1V8
conf.refsel = COMP_NRF_COMP_REFSEL_AVDDAO1V8;
#else
#elif defined(COMP_REFSEL_REFSEL_VDD)
conf.refsel = COMP_NRF_COMP_REFSEL_VDD;
#else
/* Use internal 1.2 V derived from VDD */
conf.refsel = COMP_NRF_COMP_REFSEL_INT_1V2;
#endif
rc = comp_nrf_comp_configure_se(test_dev, &conf);
zassert_equal(rc, 0, "Cannot configure comparator.");
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ manifest:
groups:
- hal
- name: hal_nordic
revision: 9587b1dcb83d24ab74e89837843a5f7d573f7059
revision: pull/308/head
path: modules/hal/nordic
groups:
- hal
Expand Down
Loading