Skip to content

Commit ad49219

Browse files
YatekiiYatekii
committed
Put everything about the 811 in line with the other nrfs in terms of naming
1 parent 8e14821 commit ad49219

File tree

5 files changed

+28
-35
lines changed

5 files changed

+28
-35
lines changed

‎nrf-hal-common/src/ppi/event_nrf52811.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl Event for crate::pac::uarte0::EVENTS_RXTO {}
2222
impl Event for crate::pac::uarte0::EVENTS_RXSTARTED {}
2323
impl Event for crate::pac::uarte0::EVENTS_TXSTARTED {}
2424
impl Event for crate::pac::uarte0::EVENTS_TXSTOPPED {}
25-
impl Event for crate::pac::spi1::EVENTS_READY {}
25+
impl Event for crate::pac::spi0::EVENTS_READY {}
2626
impl Event for crate::pac::uart0::EVENTS_CTS {}
2727
impl Event for crate::pac::uart0::EVENTS_NCTS {}
2828
impl Event for crate::pac::uart0::EVENTS_RXDRDY {}
@@ -33,9 +33,9 @@ impl Event for crate::pac::clock::EVENTS_HFCLKSTARTED {}
3333
impl Event for crate::pac::clock::EVENTS_LFCLKSTARTED {}
3434
impl Event for crate::pac::clock::EVENTS_DONE {}
3535
impl Event for crate::pac::clock::EVENTS_CTTO {}
36-
impl Event for crate::pac::spis1::EVENTS_END {}
37-
impl Event for crate::pac::spis1::EVENTS_ENDRX {}
38-
impl Event for crate::pac::spis1::EVENTS_ACQUIRED {}
36+
impl Event for crate::pac::spis0::EVENTS_END {}
37+
impl Event for crate::pac::spis0::EVENTS_ENDRX {}
38+
impl Event for crate::pac::spis0::EVENTS_ACQUIRED {}
3939
impl Event for crate::pac::ecb::EVENTS_ENDECB {}
4040
impl Event for crate::pac::ecb::EVENTS_ERRORECB {}
4141
impl Event for crate::pac::timer0::EVENTS_COMPARE {}
@@ -108,11 +108,11 @@ impl Event for crate::pac::saadc::EVENTS_DONE {}
108108
impl Event for crate::pac::saadc::EVENTS_RESULTDONE {}
109109
impl Event for crate::pac::saadc::EVENTS_CALIBRATEDONE {}
110110
impl Event for crate::pac::saadc::EVENTS_STOPPED {}
111-
impl Event for crate::pac::spim1::EVENTS_STOPPED {}
112-
impl Event for crate::pac::spim1::EVENTS_ENDRX {}
113-
impl Event for crate::pac::spim1::EVENTS_END {}
114-
impl Event for crate::pac::spim1::EVENTS_ENDTX {}
115-
impl Event for crate::pac::spim1::EVENTS_STARTED {}
111+
impl Event for crate::pac::spim0::EVENTS_STOPPED {}
112+
impl Event for crate::pac::spim0::EVENTS_ENDRX {}
113+
impl Event for crate::pac::spim0::EVENTS_END {}
114+
impl Event for crate::pac::spim0::EVENTS_ENDTX {}
115+
impl Event for crate::pac::spim0::EVENTS_STARTED {}
116116
impl Event for crate::pac::power::EVENTS_POFWARN {}
117117
impl Event for crate::pac::power::EVENTS_SLEEPENTER {}
118118
impl Event for crate::pac::power::EVENTS_SLEEPEXIT {}

‎nrf-hal-common/src/ppi/task_nrf52811.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ use crate::ppi::Task;
88
// `^src/(.*)\.rs:pub type (.*) = .*$`
99
// Replace (regex):
1010
// `impl Task for crate::pac::$1::$2 { }`
11-
// Find (regex):
12-
// `^impl Task for crate::pac::spim0::(.*)$`
13-
// Replace (regex):
14-
// `impl Task for crate::pac::spim1::$1`
15-
impl Task for crate::pac::spim1::TASKS_START {}
16-
impl Task for crate::pac::spim1::TASKS_STOP {}
17-
impl Task for crate::pac::spim1::TASKS_SUSPEND {}
18-
impl Task for crate::pac::spim1::TASKS_RESUME {}
11+
impl Task for crate::pac::spim0::TASKS_START {}
12+
impl Task for crate::pac::spim0::TASKS_STOP {}
13+
impl Task for crate::pac::spim0::TASKS_SUSPEND {}
14+
impl Task for crate::pac::spim0::TASKS_RESUME {}
1915
impl Task for crate::pac::rng::TASKS_START {}
2016
impl Task for crate::pac::rng::TASKS_STOP {}
2117
impl Task for crate::pac::timer0::TASKS_START {}
@@ -24,8 +20,8 @@ impl Task for crate::pac::timer0::TASKS_COUNT {}
2420
impl Task for crate::pac::timer0::TASKS_CLEAR {}
2521
impl Task for crate::pac::timer0::TASKS_SHUTDOWN {}
2622
impl Task for crate::pac::timer0::TASKS_CAPTURE {}
27-
impl Task for crate::pac::spis1::TASKS_ACQUIRE {}
28-
impl Task for crate::pac::spis1::TASKS_RELEASE {}
23+
impl Task for crate::pac::spis0::TASKS_ACQUIRE {}
24+
impl Task for crate::pac::spis0::TASKS_RELEASE {}
2925
impl Task for crate::pac::uart0::TASKS_STARTRX {}
3026
impl Task for crate::pac::uart0::TASKS_STOPRX {}
3127
impl Task for crate::pac::uart0::TASKS_STARTTX {}

‎nrf-hal-common/src/spim.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ use core::sync::atomic::{compiler_fence, Ordering::SeqCst};
88
#[cfg(feature = "9160")]
99
use crate::pac::{spim0_ns as spim0, SPIM0_NS as SPIM0};
1010

11-
#[cfg(feature = "52811")]
12-
use crate::pac::{spim1 as spim0, SPIM0, SPIM1};
13-
14-
#[cfg(not(any(feature = "9160", feature = "52811")))]
11+
#[cfg(not(feature = "9160"))]
1512
use crate::pac::{spim0, SPIM0};
1613

1714
pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
1815
pub use spim0::frequency::FREQUENCY_A as Frequency;
1916

2017
use core::iter::repeat_with;
2118

19+
#[cfg(feature = "52811")]
20+
use crate::pac::SPIM1;
21+
2222
#[cfg(any(feature = "52832", feature = "52833", feature = "52840"))]
2323
use crate::pac::{SPIM1, SPIM2};
2424

‎nrf-hal-common/src/spis.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,15 @@ use crate::pac::{
1515
SPIS0_NS as SPIS0,
1616
};
1717

18-
#[cfg(feature = "52811")]
19-
use crate::pac::{
20-
spis1::{
21-
self as spis0, _EVENTS_ACQUIRED, _EVENTS_END, _EVENTS_ENDRX, _TASKS_ACQUIRE, _TASKS_RELEASE,
22-
},
23-
SPIS0, SPIS1,
24-
};
25-
26-
#[cfg(not(any(feature = "9160", feature = "52811")))]
18+
#[cfg(not(feature = "9160"))]
2719
use crate::pac::{
2820
spis0::{self, _EVENTS_ACQUIRED, _EVENTS_END, _EVENTS_ENDRX, _TASKS_ACQUIRE, _TASKS_RELEASE},
2921
SPIS0,
3022
};
3123

24+
#[cfg(feature = "52811")]
25+
use crate::pac::SPIS1;
26+
3227
#[cfg(any(feature = "52832", feature = "52833", feature = "52840"))]
3328
use crate::pac::{SPIS1, SPIS2};
3429

@@ -619,16 +614,18 @@ impl Instance for SPIS0 {
619614
const INTERRUPT: Interrupt = Interrupt::SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0;
620615
#[cfg(feature = "9160")]
621616
const INTERRUPT: Interrupt = Interrupt::UARTE0_SPIM0_SPIS0_TWIM0_TWIS0;
622-
#[cfg(any(feature = "52811", feature = "52810"))]
617+
#[cfg(feature = "52810")]
623618
const INTERRUPT: Interrupt = Interrupt::SPIM0_SPIS0_SPI0;
619+
#[cfg(feature = "52811")]
620+
const INTERRUPT: Interrupt = Interrupt::TWIM0_TWIS0_TWI0_SPIM0_SPIS0_SPI0;
624621
}
625622

626623
#[cfg(not(any(feature = "9160", feature = "52810")))]
627624
impl Instance for SPIS1 {
628625
#[cfg(not(feature = "52811"))]
629626
const INTERRUPT: Interrupt = Interrupt::SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1;
630627
#[cfg(feature = "52811")]
631-
const INTERRUPT: Interrupt = Interrupt::TWIM0_TWIS0_TWI0_SPIM1_SPIS1_SPI1;
628+
const INTERRUPT: Interrupt = Interrupt::SPIM1_SPIS1_SPI1;
632629
}
633630

634631
#[cfg(not(any(feature = "9160", feature = "52811", feature = "52810")))]

‎nrf52811-hal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ keywords = ["arm", "cortex-m", "nrf52", "hal", "nrf52811"]
1616
license = "MIT OR Apache-2.0"
1717

1818
[dependencies]
19-
nrf52811-pac = "0.9.0"
19+
nrf52811-pac = "0.9.1"
2020

2121
[dependencies.nrf-hal-common]
2222
path = "../nrf-hal-common"

0 commit comments

Comments
 (0)