Skip to content

Commit

Permalink
Update nrf-pac.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dirbaio
Dirbaio committed Nov 15, 2024
1 parent ea1b97e commit 3f23fd5
Show file tree
Hide file tree
Showing 36 changed files with 632 additions and 859 deletions.
2 changes: 1 addition & 1 deletion embassy-net-nrf91/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ log = [ "dep:log" ]
defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true }

nrf-pac = { git = "https://github.com/embassy-rs/nrf-pac", rev = "875a29629cc1c87aae00cfea647a956b3807d8be" }
nrf-pac = { git = "https://github.com/embassy-rs/nrf-pac", rev = "12e2461859acb0bfea9b2ef5cd73f1283c139ac0" }
cortex-m = "0.7.7"

embassy-time = { version = "0.3.1", path = "../embassy-time" }
Expand Down
2 changes: 1 addition & 1 deletion embassy-nrf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ embedded-hal-async = { version = "1.0" }
embedded-io = { version = "0.6.0" }
embedded-io-async = { version = "0.6.1" }

nrf-pac = { git = "https://github.com/embassy-rs/nrf-pac", rev = "875a29629cc1c87aae00cfea647a956b3807d8be" }
nrf-pac = { git = "https://github.com/embassy-rs/nrf-pac", rev = "12e2461859acb0bfea9b2ef5cd73f1283c139ac0" }

defmt = { version = "0.3", optional = true }
bitflags = "2.4.2"
Expand Down
8 changes: 4 additions & 4 deletions embassy-nrf/src/chips/nrf51.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ impl_pin!(P0_31, 0, 31);
impl_radio!(RADIO, RADIO, RADIO);

embassy_hal_internal::interrupt_mod!(
POWER_CLOCK,
CLOCK_POWER,
RADIO,
UART0,
SPI0_TWI0,
SPI1_TWI1,
TWISPI0,
TWISPI1,
GPIOTE,
ADC,
TIMER0,
Expand All @@ -160,7 +160,7 @@ embassy_hal_internal::interrupt_mod!(
TEMP,
RNG,
ECB,
CCM_AAR,
AAR_CCM,
WDT,
RTC1,
QDEC,
Expand Down
28 changes: 14 additions & 14 deletions embassy-nrf/src/chips/nrf52805.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ embassy_hal_internal::peripherals! {
EGU1,
}

impl_uarte!(UARTE0, UARTE0, UARTE0_UART0);
impl_uarte!(UARTE0, UARTE0, UARTE0);

impl_spim!(SPI0, SPIM0, SPIM0_SPIS0_SPI0);
impl_spim!(SPI0, SPIM0, SPI0);

impl_spis!(SPI0, SPIS0, SPIM0_SPIS0_SPI0);
impl_spis!(SPI0, SPIS0, SPI0);

impl_twim!(TWI0, TWIM0, TWIM0_TWIS0_TWI0);
impl_twim!(TWI0, TWIM0, TWI0);

impl_twis!(TWI0, TWIS0, TWIM0_TWIS0_TWI0);
impl_twis!(TWI0, TWIS0, TWI0);

impl_qdec!(QDEC, QDEC, QDEC);

Expand Down Expand Up @@ -218,15 +218,15 @@ impl_saadc_input!(P0_05, ANALOG_INPUT3);

impl_radio!(RADIO, RADIO, RADIO);

impl_egu!(EGU0, EGU0, SWI0_EGU0);
impl_egu!(EGU1, EGU1, SWI1_EGU1);
impl_egu!(EGU0, EGU0, EGU0_SWI0);
impl_egu!(EGU1, EGU1, EGU1_SWI1);

embassy_hal_internal::interrupt_mod!(
POWER_CLOCK,
CLOCK_POWER,
RADIO,
UARTE0_UART0,
TWIM0_TWIS0_TWI0,
SPIM0_SPIS0_SPI0,
UARTE0,
TWI0,
SPI0,
GPIOTE,
SAADC,
TIMER0,
Expand All @@ -236,12 +236,12 @@ embassy_hal_internal::interrupt_mod!(
TEMP,
RNG,
ECB,
CCM_AAR,
AAR_CCM,
WDT,
RTC1,
QDEC,
SWI0_EGU0,
SWI1_EGU1,
EGU0_SWI0,
EGU1_SWI1,
SWI2,
SWI3,
SWI4,
Expand Down
28 changes: 14 additions & 14 deletions embassy-nrf/src/chips/nrf52810.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ embassy_hal_internal::peripherals! {
EGU1,
}

impl_uarte!(UARTE0, UARTE0, UARTE0_UART0);
impl_uarte!(UARTE0, UARTE0, UARTE0);

impl_spim!(SPI0, SPIM0, SPIM0_SPIS0_SPI0);
impl_spim!(SPI0, SPIM0, SPI0);

impl_spis!(SPI0, SPIS0, SPIM0_SPIS0_SPI0);
impl_spis!(SPI0, SPIS0, SPI0);

impl_twim!(TWI0, TWIM0, TWIM0_TWIS0_TWI0);
impl_twim!(TWI0, TWIM0, TWI0);

impl_twis!(TWI0, TWIS0, TWIM0_TWIS0_TWI0);
impl_twis!(TWI0, TWIS0, TWI0);

impl_pwm!(PWM0, PWM0, PWM0);

Expand Down Expand Up @@ -244,15 +244,15 @@ impl_saadc_input!(P0_31, ANALOG_INPUT7);

impl_radio!(RADIO, RADIO, RADIO);

impl_egu!(EGU0, EGU0, SWI0_EGU0);
impl_egu!(EGU1, EGU1, SWI1_EGU1);
impl_egu!(EGU0, EGU0, EGU0_SWI0);
impl_egu!(EGU1, EGU1, EGU1_SWI1);

embassy_hal_internal::interrupt_mod!(
POWER_CLOCK,
CLOCK_POWER,
RADIO,
UARTE0_UART0,
TWIM0_TWIS0_TWI0,
SPIM0_SPIS0_SPI0,
UARTE0,
TWI0,
SPI0,
GPIOTE,
SAADC,
TIMER0,
Expand All @@ -262,13 +262,13 @@ embassy_hal_internal::interrupt_mod!(
TEMP,
RNG,
ECB,
CCM_AAR,
AAR_CCM,
WDT,
RTC1,
QDEC,
COMP,
SWI0_EGU0,
SWI1_EGU1,
EGU0_SWI0,
EGU1_SWI1,
SWI2,
SWI3,
SWI4,
Expand Down
36 changes: 18 additions & 18 deletions embassy-nrf/src/chips/nrf52811.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ embassy_hal_internal::peripherals! {
UARTE0,

// SPI/TWI
TWISPI0,
SPI1,
TWI0_SPI1,
SPI0,

// SAADC
SAADC,
Expand Down Expand Up @@ -144,17 +144,17 @@ embassy_hal_internal::peripherals! {
EGU1,
}

impl_uarte!(UARTE0, UARTE0, UARTE0_UART0);
impl_uarte!(UARTE0, UARTE0, UARTE0);

impl_spim!(TWISPI0, SPIM0, TWIM0_TWIS0_TWI0_SPIM0_SPIS0_SPI0);
impl_spim!(SPI1, SPIM1, SPIM1_SPIS1_SPI1);
impl_spim!(SPI0, SPIM0, SPI0);
impl_spim!(TWI0_SPI1, SPIM1, TWI0_SPI1);

impl_spis!(TWISPI0, SPIS0, TWIM0_TWIS0_TWI0_SPIM0_SPIS0_SPI0);
impl_spis!(SPI1, SPIS1, SPIM1_SPIS1_SPI1);
impl_spis!(SPI0, SPIS0, SPI0);
impl_spis!(TWI0_SPI1, SPIS1, TWI0_SPI1);

impl_twim!(TWISPI0, TWIM0, TWIM0_TWIS0_TWI0_SPIM0_SPIS0_SPI0);
impl_twim!(TWI0_SPI1, TWIM0, TWI0_SPI1);

impl_twis!(TWISPI0, TWIS0, TWIM0_TWIS0_TWI0_SPIM0_SPIS0_SPI0);
impl_twis!(TWI0_SPI1, TWIS0, TWI0_SPI1);

impl_pwm!(PWM0, PWM0, PWM0);

Expand Down Expand Up @@ -246,15 +246,15 @@ impl_saadc_input!(P0_31, ANALOG_INPUT7);

impl_radio!(RADIO, RADIO, RADIO);

impl_egu!(EGU0, EGU0, SWI0_EGU0);
impl_egu!(EGU1, EGU1, SWI1_EGU1);
impl_egu!(EGU0, EGU0, EGU0_SWI0);
impl_egu!(EGU1, EGU1, EGU1_SWI1);

embassy_hal_internal::interrupt_mod!(
POWER_CLOCK,
CLOCK_POWER,
RADIO,
UARTE0_UART0,
TWIM0_TWIS0_TWI0_SPIM0_SPIS0_SPI0,
SPIM1_SPIS1_SPI1,
UARTE0,
TWI0_SPI1,
SPI0,
GPIOTE,
SAADC,
TIMER0,
Expand All @@ -264,13 +264,13 @@ embassy_hal_internal::interrupt_mod!(
TEMP,
RNG,
ECB,
CCM_AAR,
AAR_CCM,
WDT,
RTC1,
QDEC,
COMP,
SWI0_EGU0,
SWI1_EGU1,
EGU0_SWI0,
EGU1_SWI1,
SWI2,
SWI3,
SWI4,
Expand Down
52 changes: 26 additions & 26 deletions embassy-nrf/src/chips/nrf52820.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,19 @@ embassy_hal_internal::peripherals! {

impl_usb!(USBD, USBD, USBD);

impl_uarte!(UARTE0, UARTE0, UARTE0_UART0);
impl_uarte!(UARTE0, UARTE0, UARTE0);

impl_spim!(TWISPI0, SPIM0, SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0);
impl_spim!(TWISPI1, SPIM1, SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1);
impl_spim!(TWISPI0, SPIM0, TWISPI0);
impl_spim!(TWISPI1, SPIM1, TWISPI1);

impl_spis!(TWISPI0, SPIS0, SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0);
impl_spis!(TWISPI1, SPIS1, SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1);
impl_spis!(TWISPI0, SPIS0, TWISPI0);
impl_spis!(TWISPI1, SPIS1, TWISPI1);

impl_twim!(TWISPI0, TWIM0, SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0);
impl_twim!(TWISPI1, TWIM1, SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1);
impl_twim!(TWISPI0, TWIM0, TWISPI0);
impl_twim!(TWISPI1, TWIM1, TWISPI1);

impl_twis!(TWISPI0, TWIS0, SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0);
impl_twis!(TWISPI1, TWIS1, SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1);
impl_twis!(TWISPI0, TWIS0, TWISPI0);
impl_twis!(TWISPI1, TWIS1, TWISPI1);

impl_timer!(TIMER0, TIMER0, TIMER0);
impl_timer!(TIMER1, TIMER1, TIMER1);
Expand Down Expand Up @@ -237,19 +237,19 @@ impl_ppi_channel!(PPI_CH31, 31 => static);

impl_radio!(RADIO, RADIO, RADIO);

impl_egu!(EGU0, EGU0, SWI0_EGU0);
impl_egu!(EGU1, EGU1, SWI1_EGU1);
impl_egu!(EGU2, EGU2, SWI2_EGU2);
impl_egu!(EGU3, EGU3, SWI3_EGU3);
impl_egu!(EGU4, EGU4, SWI4_EGU4);
impl_egu!(EGU5, EGU5, SWI5_EGU5);
impl_egu!(EGU0, EGU0, EGU0_SWI0);
impl_egu!(EGU1, EGU1, EGU1_SWI1);
impl_egu!(EGU2, EGU2, EGU2_SWI2);
impl_egu!(EGU3, EGU3, EGU3_SWI3);
impl_egu!(EGU4, EGU4, EGU4_SWI4);
impl_egu!(EGU5, EGU5, EGU5_SWI5);

embassy_hal_internal::interrupt_mod!(
POWER_CLOCK,
CLOCK_POWER,
RADIO,
UARTE0_UART0,
SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0,
SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1,
UARTE0,
TWISPI0,
TWISPI1,
GPIOTE,
TIMER0,
TIMER1,
Expand All @@ -258,17 +258,17 @@ embassy_hal_internal::interrupt_mod!(
TEMP,
RNG,
ECB,
CCM_AAR,
AAR_CCM,
WDT,
RTC1,
QDEC,
COMP,
SWI0_EGU0,
SWI1_EGU1,
SWI2_EGU2,
SWI3_EGU3,
SWI4_EGU4,
SWI5_EGU5,
EGU0_SWI0,
EGU1_SWI1,
EGU2_SWI2,
EGU3_SWI3,
EGU4_SWI4,
EGU5_SWI5,
TIMER3,
USBD,
);
Loading

0 comments on commit 3f23fd5

Please sign in to comment.