Merge pull request #418 from embassy-rs/fix-saadc

nrf:  saadc fixes

2 files changed, 7 insertions, 5 deletions

diff --git a/embassy-nrf/src/chips/nrf52820.rs b/embassy-nrf/src/chips/nrf52820.rs
index 4c0d3b0b8..e434c0096 100644
--- a/embassy-nrf/src/chips/nrf52820.rs
+++ b/embassy-nrf/src/chips/nrf52820.rs
@@ -22,9 +22,6 @@ embassy_hal_common::peripherals! {
     TWISPI0,
     TWISPI1,
 
-    // SAADC
-    SAADC,
-
     // TIMER
     TIMER0,
     TIMER1,
diff --git a/embassy-nrf/src/saadc.rs b/embassy-nrf/src/saadc.rs
index 96116b36a..2f2baefae 100644
--- a/embassy-nrf/src/saadc.rs
+++ b/embassy-nrf/src/saadc.rs
@@ -245,7 +245,7 @@ macro_rules! input_mappings {
 
 // TODO the variant names are unchecked
 // the inputs are copied from nrf hal
-#[cfg(feature = "9160")]
+#[cfg(feature = "nrf9160")]
 input_mappings! {
     ANALOGINPUT0 => P0_13,
     ANALOGINPUT1 => P0_14,
@@ -256,8 +256,13 @@ input_mappings! {
     ANALOGINPUT6 => P0_19,
     ANALOGINPUT7 => P0_20,
 }
+#[cfg(feature = "nrf52805")]
+input_mappings! {
+    ANALOGINPUT2 => P0_04,
+    ANALOGINPUT3 => P0_05,
+}
 
-#[cfg(not(feature = "9160"))]
+#[cfg(not(any(feature = "nrf52805", feature = "nrf9160")))]
 input_mappings! {
     ANALOGINPUT0 => P0_02,
     ANALOGINPUT1 => P0_03,