Skip to content

Extension Trait for Tasks and Events #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thalesfragoso merged 7 commits into from
Jun 27, 2020
Merged

Extension Trait for Tasks and Events #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3be08c4
Add extension trait for tasks and events
Jun 27, 2020
d163309
Easier to maintain structure
Jun 27, 2020
1898623
Implement other crates, fix regex a bit
Jun 27, 2020
5820c7c
That's gross, but it works
Jun 27, 2020
3c0408b
Apply suggestions from code review
Jun 27, 2020
83a9655
Remove nrf9160 impls
Jun 27, 2020
8649692
More inline always
Jun 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/ppi-demo/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ fn main() -> ! {
let ppi_channels = ppi::Parts::new(p.PPI);
let mut channel0 = ppi_channels.ppi0;

channel0.set_task_endpoint(&p.RADIO.tasks_disable as *const _ as u32);
channel0.set_event_endpoint(&p.TIMER0.events_compare[0] as *const _ as u32);
channel0.set_task_endpoint(&p.RADIO.tasks_disable);
channel0.set_event_endpoint(&p.TIMER0.events_compare[0]);
channel0.enable();

let radio = p.RADIO;
Expand Down
1 change: 1 addition & 0 deletions nrf-hal-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ cortex-m = "0.6.2"
nb = "0.1.2"
fpa = "0.1.0"
rand_core = "0.5.1"
cfg-if = "0.1.10"

[dependencies.void]
default-features = false
Expand Down
65 changes: 65 additions & 0 deletions nrf-hal-common/src/ppi/event_nrf51.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
use crate::ppi::Event;

// Event impls
//
// To reproduce, in the pac crate, search
// `rg 'type EVENTS_.*crate::Reg' --type rust`
// Find (regex):
// `^src/(.*)\.rs:pub type (.*) = .*$`
// Replace (regex):
// `impl Event for crate::target::$1::$2 { }`
impl Event for crate::target::ecb::EVENTS_ENDECB {}
impl Event for crate::target::ecb::EVENTS_ERRORECB {}
impl Event for crate::target::rng::EVENTS_VALRDY {}
impl Event for crate::target::timer0::EVENTS_COMPARE {}
impl Event for crate::target::uart0::EVENTS_CTS {}
impl Event for crate::target::uart0::EVENTS_NCTS {}
impl Event for crate::target::uart0::EVENTS_RXDRDY {}
impl Event for crate::target::uart0::EVENTS_TXDRDY {}
impl Event for crate::target::uart0::EVENTS_ERROR {}
impl Event for crate::target::uart0::EVENTS_RXTO {}
impl Event for crate::target::gpiote::EVENTS_IN {}
impl Event for crate::target::gpiote::EVENTS_PORT {}
impl Event for crate::target::power::EVENTS_POFWARN {}
impl Event for crate::target::clock::EVENTS_HFCLKSTARTED {}
impl Event for crate::target::clock::EVENTS_LFCLKSTARTED {}
impl Event for crate::target::clock::EVENTS_DONE {}
impl Event for crate::target::clock::EVENTS_CTTO {}
impl Event for crate::target::spi0::EVENTS_READY {}
impl Event for crate::target::twi0::EVENTS_STOPPED {}
impl Event for crate::target::twi0::EVENTS_RXDREADY {}
impl Event for crate::target::twi0::EVENTS_TXDSENT {}
impl Event for crate::target::twi0::EVENTS_ERROR {}
impl Event for crate::target::twi0::EVENTS_BB {}
impl Event for crate::target::twi0::EVENTS_SUSPENDED {}
impl Event for crate::target::spis1::EVENTS_END {}
impl Event for crate::target::spis1::EVENTS_ENDRX {}
impl Event for crate::target::spis1::EVENTS_ACQUIRED {}
impl Event for crate::target::rtc0::EVENTS_TICK {}
impl Event for crate::target::rtc0::EVENTS_OVRFLW {}
impl Event for crate::target::rtc0::EVENTS_COMPARE {}
impl Event for crate::target::wdt::EVENTS_TIMEOUT {}
impl Event for crate::target::temp::EVENTS_DATARDY {}
impl Event for crate::target::radio::EVENTS_READY {}
impl Event for crate::target::radio::EVENTS_ADDRESS {}
impl Event for crate::target::radio::EVENTS_PAYLOAD {}
impl Event for crate::target::radio::EVENTS_END {}
impl Event for crate::target::radio::EVENTS_DISABLED {}
impl Event for crate::target::radio::EVENTS_DEVMATCH {}
impl Event for crate::target::radio::EVENTS_DEVMISS {}
impl Event for crate::target::radio::EVENTS_RSSIEND {}
impl Event for crate::target::radio::EVENTS_BCMATCH {}
impl Event for crate::target::lpcomp::EVENTS_READY {}
impl Event for crate::target::lpcomp::EVENTS_DOWN {}
impl Event for crate::target::lpcomp::EVENTS_UP {}
impl Event for crate::target::lpcomp::EVENTS_CROSS {}
impl Event for crate::target::ccm::EVENTS_ENDKSGEN {}
impl Event for crate::target::ccm::EVENTS_ENDCRYPT {}
impl Event for crate::target::ccm::EVENTS_ERROR {}
impl Event for crate::target::aar::EVENTS_END {}
impl Event for crate::target::aar::EVENTS_RESOLVED {}
impl Event for crate::target::aar::EVENTS_NOTRESOLVED {}
impl Event for crate::target::qdec::EVENTS_SAMPLERDY {}
impl Event for crate::target::qdec::EVENTS_REPORTRDY {}
impl Event for crate::target::qdec::EVENTS_ACCOF {}
impl Event for crate::target::adc::EVENTS_END {}
114 changes: 114 additions & 0 deletions nrf-hal-common/src/ppi/event_nrf52810.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
use crate::ppi::Event;

// Event impls
//
// To reproduce, in the pac crate, search
// `rg 'type EVENTS_.*crate::Reg' --type rust`
// Find (regex):
// `^src/(.*)\.rs:pub type (.*) = .*$`
// Replace (regex):
// `impl Event for crate::target::$1::$2 { }`
impl Event for crate::target::rng::EVENTS_VALRDY {}
impl Event for crate::target::timer0::EVENTS_COMPARE {}
impl Event for crate::target::spis0::EVENTS_END {}
impl Event for crate::target::spis0::EVENTS_ENDRX {}
impl Event for crate::target::spis0::EVENTS_ACQUIRED {}
impl Event for crate::target::gpiote::EVENTS_IN {}
impl Event for crate::target::gpiote::EVENTS_PORT {}
impl Event for crate::target::uart0::EVENTS_CTS {}
impl Event for crate::target::uart0::EVENTS_NCTS {}
impl Event for crate::target::uart0::EVENTS_RXDRDY {}
impl Event for crate::target::uart0::EVENTS_TXDRDY {}
impl Event for crate::target::uart0::EVENTS_ERROR {}
impl Event for crate::target::uart0::EVENTS_RXTO {}
impl Event for crate::target::clock::EVENTS_HFCLKSTARTED {}
impl Event for crate::target::clock::EVENTS_LFCLKSTARTED {}
impl Event for crate::target::clock::EVENTS_DONE {}
impl Event for crate::target::clock::EVENTS_CTTO {}
impl Event for crate::target::power::EVENTS_POFWARN {}
impl Event for crate::target::power::EVENTS_SLEEPENTER {}
impl Event for crate::target::power::EVENTS_SLEEPEXIT {}
impl Event for crate::target::spim0::EVENTS_STOPPED {}
impl Event for crate::target::spim0::EVENTS_ENDRX {}
impl Event for crate::target::spim0::EVENTS_END {}
impl Event for crate::target::spim0::EVENTS_ENDTX {}
impl Event for crate::target::spim0::EVENTS_STARTED {}
impl Event for crate::target::spi0::EVENTS_READY {}
impl Event for crate::target::twim0::EVENTS_STOPPED {}
impl Event for crate::target::twim0::EVENTS_ERROR {}
impl Event for crate::target::twim0::EVENTS_SUSPENDED {}
impl Event for crate::target::twim0::EVENTS_RXSTARTED {}
impl Event for crate::target::twim0::EVENTS_TXSTARTED {}
impl Event for crate::target::twim0::EVENTS_LASTRX {}
impl Event for crate::target::twim0::EVENTS_LASTTX {}
impl Event for crate::target::twi0::EVENTS_STOPPED {}
impl Event for crate::target::twi0::EVENTS_RXDREADY {}
impl Event for crate::target::twi0::EVENTS_TXDSENT {}
impl Event for crate::target::twi0::EVENTS_ERROR {}
impl Event for crate::target::twi0::EVENTS_BB {}
impl Event for crate::target::twi0::EVENTS_SUSPENDED {}
impl Event for crate::target::egu0::EVENTS_TRIGGERED {}
impl Event for crate::target::ecb::EVENTS_ENDECB {}
impl Event for crate::target::ecb::EVENTS_ERRORECB {}
impl Event for crate::target::rtc0::EVENTS_TICK {}
impl Event for crate::target::rtc0::EVENTS_OVRFLW {}
impl Event for crate::target::rtc0::EVENTS_COMPARE {}
impl Event for crate::target::pdm::EVENTS_STARTED {}
impl Event for crate::target::pdm::EVENTS_STOPPED {}
impl Event for crate::target::pdm::EVENTS_END {}
impl Event for crate::target::wdt::EVENTS_TIMEOUT {}
impl Event for crate::target::radio::EVENTS_READY {}
impl Event for crate::target::radio::EVENTS_ADDRESS {}
impl Event for crate::target::radio::EVENTS_PAYLOAD {}
impl Event for crate::target::radio::EVENTS_END {}
impl Event for crate::target::radio::EVENTS_DISABLED {}
impl Event for crate::target::radio::EVENTS_DEVMATCH {}
impl Event for crate::target::radio::EVENTS_DEVMISS {}
impl Event for crate::target::radio::EVENTS_RSSIEND {}
impl Event for crate::target::radio::EVENTS_BCMATCH {}
impl Event for crate::target::radio::EVENTS_CRCOK {}
impl Event for crate::target::radio::EVENTS_CRCERROR {}
impl Event for crate::target::temp::EVENTS_DATARDY {}
impl Event for crate::target::ccm::EVENTS_ENDKSGEN {}
impl Event for crate::target::ccm::EVENTS_ENDCRYPT {}
impl Event for crate::target::ccm::EVENTS_ERROR {}
impl Event for crate::target::twis0::EVENTS_STOPPED {}
impl Event for crate::target::twis0::EVENTS_ERROR {}
impl Event for crate::target::twis0::EVENTS_RXSTARTED {}
impl Event for crate::target::twis0::EVENTS_TXSTARTED {}
impl Event for crate::target::twis0::EVENTS_WRITE {}
impl Event for crate::target::twis0::EVENTS_READ {}
impl Event for crate::target::uarte0::EVENTS_CTS {}
impl Event for crate::target::uarte0::EVENTS_NCTS {}
impl Event for crate::target::uarte0::EVENTS_RXDRDY {}
impl Event for crate::target::uarte0::EVENTS_ENDRX {}
impl Event for crate::target::uarte0::EVENTS_TXDRDY {}
impl Event for crate::target::uarte0::EVENTS_ENDTX {}
impl Event for crate::target::uarte0::EVENTS_ERROR {}
impl Event for crate::target::uarte0::EVENTS_RXTO {}
impl Event for crate::target::uarte0::EVENTS_RXSTARTED {}
impl Event for crate::target::uarte0::EVENTS_TXSTARTED {}
impl Event for crate::target::uarte0::EVENTS_TXSTOPPED {}
impl Event for crate::target::qdec::EVENTS_SAMPLERDY {}
impl Event for crate::target::qdec::EVENTS_REPORTRDY {}
impl Event for crate::target::qdec::EVENTS_ACCOF {}
impl Event for crate::target::qdec::EVENTS_DBLRDY {}
impl Event for crate::target::qdec::EVENTS_STOPPED {}
impl Event for crate::target::aar::EVENTS_END {}
impl Event for crate::target::aar::EVENTS_RESOLVED {}
impl Event for crate::target::aar::EVENTS_NOTRESOLVED {}
impl Event for crate::target::saadc::EVENTS_STARTED {}
impl Event for crate::target::saadc::EVENTS_END {}
impl Event for crate::target::saadc::EVENTS_DONE {}
impl Event for crate::target::saadc::EVENTS_RESULTDONE {}
impl Event for crate::target::saadc::EVENTS_CALIBRATEDONE {}
impl Event for crate::target::saadc::EVENTS_STOPPED {}
impl Event for crate::target::comp::EVENTS_READY {}
impl Event for crate::target::comp::EVENTS_DOWN {}
impl Event for crate::target::comp::EVENTS_UP {}
impl Event for crate::target::comp::EVENTS_CROSS {}
impl Event for crate::target::pwm0::EVENTS_STOPPED {}
impl Event for crate::target::pwm0::EVENTS_SEQSTARTED {}
impl Event for crate::target::pwm0::EVENTS_SEQEND {}
impl Event for crate::target::pwm0::EVENTS_PWMPERIODEND {}
impl Event for crate::target::pwm0::EVENTS_LOOPSDONE {}
137 changes: 137 additions & 0 deletions nrf-hal-common/src/ppi/event_nrf52832.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
use crate::ppi::Event;

// Event impls
//
// To reproduce, in the pac crate, search
// `rg 'type EVENTS_.*crate::Reg' --type rust`
// Find (regex):
// `^src/(.*)\.rs:pub type (.*) = .*$`
// Replace (regex):
// `impl Event for crate::target::$1::$2 { }`
impl Event for crate::target::radio::EVENTS_READY {}
impl Event for crate::target::radio::EVENTS_ADDRESS {}
impl Event for crate::target::radio::EVENTS_PAYLOAD {}
impl Event for crate::target::radio::EVENTS_END {}
impl Event for crate::target::radio::EVENTS_DISABLED {}
impl Event for crate::target::radio::EVENTS_DEVMATCH {}
impl Event for crate::target::radio::EVENTS_DEVMISS {}
impl Event for crate::target::radio::EVENTS_RSSIEND {}
impl Event for crate::target::radio::EVENTS_BCMATCH {}
impl Event for crate::target::radio::EVENTS_CRCOK {}
impl Event for crate::target::radio::EVENTS_CRCERROR {}
impl Event for crate::target::power::EVENTS_POFWARN {}
impl Event for crate::target::power::EVENTS_SLEEPENTER {}
impl Event for crate::target::power::EVENTS_SLEEPEXIT {}
impl Event for crate::target::timer0::EVENTS_COMPARE {}
impl Event for crate::target::rng::EVENTS_VALRDY {}
impl Event for crate::target::uart0::EVENTS_CTS {}
impl Event for crate::target::uart0::EVENTS_NCTS {}
impl Event for crate::target::uart0::EVENTS_RXDRDY {}
impl Event for crate::target::uart0::EVENTS_TXDRDY {}
impl Event for crate::target::uart0::EVENTS_ERROR {}
impl Event for crate::target::uart0::EVENTS_RXTO {}
impl Event for crate::target::spis0::EVENTS_END {}
impl Event for crate::target::spis0::EVENTS_ENDRX {}
impl Event for crate::target::spis0::EVENTS_ACQUIRED {}
impl Event for crate::target::gpiote::EVENTS_IN {}
impl Event for crate::target::gpiote::EVENTS_PORT {}
impl Event for crate::target::clock::EVENTS_HFCLKSTARTED {}
impl Event for crate::target::clock::EVENTS_LFCLKSTARTED {}
impl Event for crate::target::clock::EVENTS_DONE {}
impl Event for crate::target::clock::EVENTS_CTTO {}
impl Event for crate::target::spim0::EVENTS_STOPPED {}
impl Event for crate::target::spim0::EVENTS_ENDRX {}
impl Event for crate::target::spim0::EVENTS_END {}
impl Event for crate::target::spim0::EVENTS_ENDTX {}
impl Event for crate::target::spim0::EVENTS_STARTED {}
impl Event for crate::target::spi0::EVENTS_READY {}
impl Event for crate::target::wdt::EVENTS_TIMEOUT {}
impl Event for crate::target::twim0::EVENTS_STOPPED {}
impl Event for crate::target::twim0::EVENTS_ERROR {}
impl Event for crate::target::twim0::EVENTS_SUSPENDED {}
impl Event for crate::target::twim0::EVENTS_RXSTARTED {}
impl Event for crate::target::twim0::EVENTS_TXSTARTED {}
impl Event for crate::target::twim0::EVENTS_LASTRX {}
impl Event for crate::target::twim0::EVENTS_LASTTX {}
impl Event for crate::target::rtc0::EVENTS_TICK {}
impl Event for crate::target::rtc0::EVENTS_OVRFLW {}
impl Event for crate::target::rtc0::EVENTS_COMPARE {}
impl Event for crate::target::twi0::EVENTS_STOPPED {}
impl Event for crate::target::twi0::EVENTS_RXDREADY {}
impl Event for crate::target::twi0::EVENTS_TXDSENT {}
impl Event for crate::target::twi0::EVENTS_ERROR {}
impl Event for crate::target::twi0::EVENTS_BB {}
impl Event for crate::target::twi0::EVENTS_SUSPENDED {}
impl Event for crate::target::egu0::EVENTS_TRIGGERED {}
impl Event for crate::target::pdm::EVENTS_STARTED {}
impl Event for crate::target::pdm::EVENTS_STOPPED {}
impl Event for crate::target::pdm::EVENTS_END {}
impl Event for crate::target::ecb::EVENTS_ENDECB {}
impl Event for crate::target::ecb::EVENTS_ERRORECB {}
impl Event for crate::target::lpcomp::EVENTS_READY {}
impl Event for crate::target::lpcomp::EVENTS_DOWN {}
impl Event for crate::target::lpcomp::EVENTS_UP {}
impl Event for crate::target::lpcomp::EVENTS_CROSS {}
impl Event for crate::target::temp::EVENTS_DATARDY {}
impl Event for crate::target::ccm::EVENTS_ENDKSGEN {}
impl Event for crate::target::ccm::EVENTS_ENDCRYPT {}
impl Event for crate::target::ccm::EVENTS_ERROR {}
impl Event for crate::target::i2s::EVENTS_RXPTRUPD {}
impl Event for crate::target::i2s::EVENTS_STOPPED {}
impl Event for crate::target::i2s::EVENTS_TXPTRUPD {}
impl Event for crate::target::uarte0::EVENTS_CTS {}
impl Event for crate::target::uarte0::EVENTS_NCTS {}
impl Event for crate::target::uarte0::EVENTS_RXDRDY {}
impl Event for crate::target::uarte0::EVENTS_ENDRX {}
impl Event for crate::target::uarte0::EVENTS_TXDRDY {}
impl Event for crate::target::uarte0::EVENTS_ENDTX {}
impl Event for crate::target::uarte0::EVENTS_ERROR {}
impl Event for crate::target::uarte0::EVENTS_RXTO {}
impl Event for crate::target::uarte0::EVENTS_RXSTARTED {}
impl Event for crate::target::uarte0::EVENTS_TXSTARTED {}
impl Event for crate::target::uarte0::EVENTS_TXSTOPPED {}
impl Event for crate::target::timer3::EVENTS_COMPARE {}
impl Event for crate::target::comp::EVENTS_READY {}
impl Event for crate::target::comp::EVENTS_DOWN {}
impl Event for crate::target::comp::EVENTS_UP {}
impl Event for crate::target::comp::EVENTS_CROSS {}
impl Event for crate::target::twis0::EVENTS_STOPPED {}
impl Event for crate::target::twis0::EVENTS_ERROR {}
impl Event for crate::target::twis0::EVENTS_RXSTARTED {}
impl Event for crate::target::twis0::EVENTS_TXSTARTED {}
impl Event for crate::target::twis0::EVENTS_WRITE {}
impl Event for crate::target::twis0::EVENTS_READ {}
impl Event for crate::target::aar::EVENTS_END {}
impl Event for crate::target::aar::EVENTS_RESOLVED {}
impl Event for crate::target::aar::EVENTS_NOTRESOLVED {}
impl Event for crate::target::qdec::EVENTS_SAMPLERDY {}
impl Event for crate::target::qdec::EVENTS_REPORTRDY {}
impl Event for crate::target::qdec::EVENTS_ACCOF {}
impl Event for crate::target::qdec::EVENTS_DBLRDY {}
impl Event for crate::target::qdec::EVENTS_STOPPED {}
impl Event for crate::target::saadc::EVENTS_STARTED {}
impl Event for crate::target::saadc::EVENTS_END {}
impl Event for crate::target::saadc::EVENTS_DONE {}
impl Event for crate::target::saadc::EVENTS_RESULTDONE {}
impl Event for crate::target::saadc::EVENTS_CALIBRATEDONE {}
impl Event for crate::target::saadc::EVENTS_STOPPED {}
impl Event for crate::target::nfct::EVENTS_READY {}
impl Event for crate::target::nfct::EVENTS_FIELDDETECTED {}
impl Event for crate::target::nfct::EVENTS_FIELDLOST {}
impl Event for crate::target::nfct::EVENTS_TXFRAMESTART {}
impl Event for crate::target::nfct::EVENTS_TXFRAMEEND {}
impl Event for crate::target::nfct::EVENTS_RXFRAMESTART {}
impl Event for crate::target::nfct::EVENTS_RXFRAMEEND {}
impl Event for crate::target::nfct::EVENTS_ERROR {}
impl Event for crate::target::nfct::EVENTS_RXERROR {}
impl Event for crate::target::nfct::EVENTS_ENDRX {}
impl Event for crate::target::nfct::EVENTS_ENDTX {}
impl Event for crate::target::nfct::EVENTS_AUTOCOLRESSTARTED {}
impl Event for crate::target::nfct::EVENTS_COLLISION {}
impl Event for crate::target::nfct::EVENTS_SELECTED {}
impl Event for crate::target::nfct::EVENTS_STARTED {}
impl Event for crate::target::pwm0::EVENTS_STOPPED {}
impl Event for crate::target::pwm0::EVENTS_SEQSTARTED {}
impl Event for crate::target::pwm0::EVENTS_SEQEND {}
impl Event for crate::target::pwm0::EVENTS_PWMPERIODEND {}
impl Event for crate::target::pwm0::EVENTS_LOOPSDONE {}
Loading
⚡