Skip to content
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

Change all psel tests to use is_connected #407

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Change all psel tests to use is_connected #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions nrf-hal-common/src/i2s.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,39 +474,39 @@ impl I2S {
self.i2s,
if slave {
Pins::Peripheral {
mck: if mck_pin.connect().bit_is_set() {
mck: if mck_pin.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(mck_pin.bits()) })
} else {
None
},
sck: unsafe { Pin::from_psel_bits(sck_pin.bits()) },
lrck: unsafe { Pin::from_psel_bits(lrck_pin.bits()) },
sdin: if sdin_pin.connect().bit_is_set() {
sdin: if sdin_pin.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(sdin_pin.bits()) })
} else {
None
},
sdout: if sdout_pin.connect().bit_is_set() {
sdout: if sdout_pin.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(sdout_pin.bits()) })
} else {
None
},
}
} else {
Pins::Controller {
mck: if mck_pin.connect().bit_is_set() {
mck: if mck_pin.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(mck_pin.bits()) })
} else {
None
},
sck: unsafe { Pin::from_psel_bits(sck_pin.bits()) },
lrck: unsafe { Pin::from_psel_bits(lrck_pin.bits()) },
sdin: if sdin_pin.connect().bit_is_set() {
sdin: if sdin_pin.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(sdin_pin.bits()) })
} else {
None
},
sdout: if sdout_pin.connect().bit_is_set() {
sdout: if sdout_pin.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(sdout_pin.bits()) })
} else {
None
Expand Down
8 changes: 4 additions & 4 deletions nrf-hal-common/src/pwm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,22 +760,22 @@ where
(
self.pwm,
Pins {
ch0: if ch0.connect().bit_is_set() {
ch0: if ch0.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(ch0.bits()) })
} else {
None
},
ch1: if ch1.connect().bit_is_set() {
ch1: if ch1.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(ch1.bits()) })
} else {
None
},
ch2: if ch2.connect().bit_is_set() {
ch2: if ch2.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(ch2.bits()) })
} else {
None
},
ch3: if ch3.connect().bit_is_set() {
ch3: if ch3.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(ch3.bits()) })
} else {
None
Expand Down
2 changes: 1 addition & 1 deletion nrf-hal-common/src/qdec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ impl Qdec {
let b = unsafe { Pin::from_psel_bits(self.qdec.psel.b.read().bits()) };
let led = {
let led = self.qdec.psel.led.read();
if led.connect().bit_is_set() {
if led.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(led.bits()) })
} else {
None
Expand Down
6 changes: 3 additions & 3 deletions nrf-hal-common/src/spim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,17 +373,17 @@ where
(
self.0,
Pins {
sck: if sck.connect().bit_is_set() {
sck: if sck.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(sck.bits()) })
} else {
None
},
mosi: if mosi.connect().bit_is_set() {
mosi: if mosi.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(mosi.bits()) })
} else {
None
},
miso: if miso.connect().bit_is_set() {
miso: if miso.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(miso.bits()) })
} else {
None
Expand Down
4 changes: 2 additions & 2 deletions nrf-hal-common/src/spis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,12 +418,12 @@ where
Pins {
sck: unsafe { Pin::from_psel_bits(sck.bits()) },
cs: unsafe { Pin::from_psel_bits(cs.bits()) },
copi: if copi.connect().bit_is_set() {
copi: if copi.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(copi.bits()) })
} else {
None
},
cipo: if cipo.connect().bit_is_set() {
cipo: if cipo.connect().is_connected() {
Some(unsafe { Pin::from_psel_bits(cipo.bits()) })
} else {
None
Expand Down