max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
nrf:  saadc fixes
This commit is contained in:
Dario Nieuwenhuis 2021-10-11 01:00:22 +02:00 committed by GitHub
commit 34637bf2d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
embassy-nrf/src/chips/nrf52820.rs
View File

@ -22,9 +22,6 @@ embassy_hal_common::peripherals! {
TWISPI0, TWISPI0,
TWISPI1, TWISPI1,
// SAADC
SAADC,
// TIMER // TIMER
TIMER0, TIMER0,
TIMER1, TIMER1,

9
embassy-nrf/src/saadc.rs
View File

@ -245,7 +245,7 @@ macro_rules! input_mappings {
// TODO the variant names are unchecked // TODO the variant names are unchecked
// the inputs are copied from nrf hal // the inputs are copied from nrf hal
#[cfg(feature = "9160")] #[cfg(feature = "nrf9160")]
input_mappings! { input_mappings! {
ANALOGINPUT0 => P0_13, ANALOGINPUT0 => P0_13,
ANALOGINPUT1 => P0_14, ANALOGINPUT1 => P0_14,
@ -256,8 +256,13 @@ input_mappings! {
ANALOGINPUT6 => P0_19, ANALOGINPUT6 => P0_19,
ANALOGINPUT7 => P0_20, 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! { input_mappings! {
ANALOGINPUT0 => P0_02, ANALOGINPUT0 => P0_02,
ANALOGINPUT1 => P0_03, ANALOGINPUT1 => P0_03,