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

gpiote: better naming

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2020-11-08 17:38:45 +01:00
parent b40e09d502
commit def225b982
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
embassy-nrf/src/gpiote.rs
View File

@@ -20,7 +20,7 @@ pub struct Gpiote {
static mut INSTANCE: *const Gpiote = ptr::null_mut();
pub enum EventPolarity {
pub enum InputChannelPolarity {
None,
HiToLo,
LoToHi,
@@ -28,7 +28,7 @@ pub enum EventPolarity {
}
/// Polarity of the `task out` operation.
pub enum TaskOutPolarity {
pub enum OutputChannelPolarity {
Set,
Clear,
Toggle,
@@ -87,7 +87,7 @@ impl Gpiote {
pub fn new_input_channel<'a, T>(
&'a self,
pin: Pin<Input<T>>,
trigger_mode: EventPolarity,
polarity: InputChannelPolarity,
) -> Result<InputChannel<'a, T>, NewChannelError> {
interrupt::free(|_| {
unsafe { INSTANCE = self };
@@ -95,11 +95,11 @@ impl Gpiote {
trace!("allocated in ch {:u8}", index as u8);
self.inner.config[index as usize].write(|w| {
match trigger_mode {
EventPolarity::HiToLo => w.mode().event().polarity().hi_to_lo(),
EventPolarity::LoToHi => w.mode().event().polarity().lo_to_hi(),
EventPolarity::None => w.mode().event().polarity().none(),
EventPolarity::Toggle => w.mode().event().polarity().toggle(),
match polarity {
InputChannelPolarity::HiToLo => w.mode().event().polarity().hi_to_lo(),
InputChannelPolarity::LoToHi => w.mode().event().polarity().lo_to_hi(),
InputChannelPolarity::None => w.mode().event().polarity().none(),
InputChannelPolarity::Toggle => w.mode().event().polarity().toggle(),
};
#[cfg(any(feature = "52833", feature = "52840"))]
w.port().bit(match pin.port() {
@@ -124,7 +124,7 @@ impl Gpiote {
&'a self,
pin: Pin<Output<T>>,
level: Level,
task_out_polarity: TaskOutPolarity,
polarity: OutputChannelPolarity,
) -> Result<OutputChannel<'a>, NewChannelError> {
interrupt::free(|_| {
unsafe { INSTANCE = self };
@@ -137,10 +137,10 @@ impl Gpiote {
Level::High => w.outinit().high(),
Level::Low => w.outinit().low(),
};
match task_out_polarity {
TaskOutPolarity::Set => w.polarity().lo_to_hi(),
TaskOutPolarity::Clear => w.polarity().hi_to_lo(),
TaskOutPolarity::Toggle => w.polarity().toggle(),
match polarity {
OutputChannelPolarity::Set => w.polarity().lo_to_hi(),
OutputChannelPolarity::Clear => w.polarity().hi_to_lo(),
OutputChannelPolarity::Toggle => w.polarity().toggle(),
};
#[cfg(any(feature = "52833", feature = "52840"))]
w.port().bit(match pin.port() {

8
examples/src/bin/gpiote.rs
View File

@@ -24,7 +24,7 @@ async fn run() {
let pin1 = port0.p0_11.into_pullup_input().degrade();
let button1 = async {
let ch = unwrap!(g.new_input_channel(pin1, gpiote::EventPolarity::HiToLo));
let ch = unwrap!(g.new_input_channel(pin1, gpiote::InputChannelPolarity::HiToLo));
loop {
ch.wait().await;
@@ -34,7 +34,7 @@ async fn run() {
let pin2 = port0.p0_12.into_pullup_input().degrade();
let button2 = async {
let ch = unwrap!(g.new_input_channel(pin2, gpiote::EventPolarity::LoToHi));
let ch = unwrap!(g.new_input_channel(pin2, gpiote::InputChannelPolarity::LoToHi));
loop {
ch.wait().await;
@@ -44,7 +44,7 @@ async fn run() {
let pin3 = port0.p0_24.into_pullup_input().degrade();
let button3 = async {
let ch = unwrap!(g.new_input_channel(pin3, gpiote::EventPolarity::Toggle));
let ch = unwrap!(g.new_input_channel(pin3, gpiote::InputChannelPolarity::Toggle));
loop {
ch.wait().await;
@@ -54,7 +54,7 @@ async fn run() {
let pin4 = port0.p0_25.into_pullup_input().degrade();
let button4 = async {
let ch = unwrap!(g.new_input_channel(pin4, gpiote::EventPolarity::Toggle));
let ch = unwrap!(g.new_input_channel(pin4, gpiote::InputChannelPolarity::Toggle));
loop {
ch.wait().await;