aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Lilleengen <[email protected]>2025-08-25 18:18:31 +0000
committerGitHub <[email protected]>2025-08-25 18:18:31 +0000
commit73717f9ae8ea1f13f029c4c2722610a7e54436cb (patch)
tree6579be978182e61689e4dddece374bd3996e1268
parentac60eaeddd9c4accbe8dc20d0486382940723efb (diff)
parentdfa6485f99ff523f10239ef9ac40d6412d867d13 (diff)
Merge pull request #4585 from dempfi/patch-1
Replace nrf5340's SAADC input pins with correct mappings
-rw-r--r--embassy-nrf/CHANGELOG.md2
-rw-r--r--embassy-nrf/src/chips/nrf5340_app.rs16
2 files changed, 10 insertions, 8 deletions
diff --git a/embassy-nrf/CHANGELOG.md b/embassy-nrf/CHANGELOG.md
index 5709b28b5..12e3850c0 100644
--- a/embassy-nrf/CHANGELOG.md
+++ b/embassy-nrf/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
8<!-- next-header --> 8<!-- next-header -->
9## Unreleased - ReleaseDate 9## Unreleased - ReleaseDate
10 10
11- bugfix: use correct analog input SAADC pins on nrf5340
12
11## 0.6.0 - 2025-08-04 13## 0.6.0 - 2025-08-04
12 14
13- changed: update to latest embassy-time-queue-utils 15- changed: update to latest embassy-time-queue-utils
diff --git a/embassy-nrf/src/chips/nrf5340_app.rs b/embassy-nrf/src/chips/nrf5340_app.rs
index 99cf29487..c0290b7a4 100644
--- a/embassy-nrf/src/chips/nrf5340_app.rs
+++ b/embassy-nrf/src/chips/nrf5340_app.rs
@@ -463,14 +463,14 @@ impl_ppi_channel!(PPI_CH29, 29 => configurable);
463impl_ppi_channel!(PPI_CH30, 30 => configurable); 463impl_ppi_channel!(PPI_CH30, 30 => configurable);
464impl_ppi_channel!(PPI_CH31, 31 => configurable); 464impl_ppi_channel!(PPI_CH31, 31 => configurable);
465 465
466impl_saadc_input!(P0_13, ANALOG_INPUT0); 466impl_saadc_input!(P0_04, ANALOG_INPUT0);
467impl_saadc_input!(P0_14, ANALOG_INPUT1); 467impl_saadc_input!(P0_05, ANALOG_INPUT1);
468impl_saadc_input!(P0_15, ANALOG_INPUT2); 468impl_saadc_input!(P0_06, ANALOG_INPUT2);
469impl_saadc_input!(P0_16, ANALOG_INPUT3); 469impl_saadc_input!(P0_07, ANALOG_INPUT3);
470impl_saadc_input!(P0_17, ANALOG_INPUT4); 470impl_saadc_input!(P0_25, ANALOG_INPUT4);
471impl_saadc_input!(P0_18, ANALOG_INPUT5); 471impl_saadc_input!(P0_26, ANALOG_INPUT5);
472impl_saadc_input!(P0_19, ANALOG_INPUT6); 472impl_saadc_input!(P0_27, ANALOG_INPUT6);
473impl_saadc_input!(P0_20, ANALOG_INPUT7); 473impl_saadc_input!(P0_28, ANALOG_INPUT7);
474 474
475impl_egu!(EGU0, EGU0, EGU0); 475impl_egu!(EGU0, EGU0, EGU0);
476impl_egu!(EGU1, EGU1, EGU1); 476impl_egu!(EGU1, EGU1, EGU1);