Skip to content

Commit 9876a2b

Browse files
author
Jonas Schievink
committed
Change all psel tests to use is_connected
1 parent 18bd8a3 commit 9876a2b

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

nrf-hal-common/src/i2s.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,39 +474,39 @@ impl I2S {
474474
self.i2s,
475475
if slave {
476476
Pins::Peripheral {
477-
mck: if mck_pin.connect().bit_is_set() {
477+
mck: if mck_pin.connect().is_connected() {
478478
Some(unsafe { Pin::from_psel_bits(mck_pin.bits()) })
479479
} else {
480480
None
481481
},
482482
sck: unsafe { Pin::from_psel_bits(sck_pin.bits()) },
483483
lrck: unsafe { Pin::from_psel_bits(lrck_pin.bits()) },
484-
sdin: if sdin_pin.connect().bit_is_set() {
484+
sdin: if sdin_pin.connect().is_connected() {
485485
Some(unsafe { Pin::from_psel_bits(sdin_pin.bits()) })
486486
} else {
487487
None
488488
},
489-
sdout: if sdout_pin.connect().bit_is_set() {
489+
sdout: if sdout_pin.connect().is_connected() {
490490
Some(unsafe { Pin::from_psel_bits(sdout_pin.bits()) })
491491
} else {
492492
None
493493
},
494494
}
495495
} else {
496496
Pins::Controller {
497-
mck: if mck_pin.connect().bit_is_set() {
497+
mck: if mck_pin.connect().is_connected() {
498498
Some(unsafe { Pin::from_psel_bits(mck_pin.bits()) })
499499
} else {
500500
None
501501
},
502502
sck: unsafe { Pin::from_psel_bits(sck_pin.bits()) },
503503
lrck: unsafe { Pin::from_psel_bits(lrck_pin.bits()) },
504-
sdin: if sdin_pin.connect().bit_is_set() {
504+
sdin: if sdin_pin.connect().is_connected() {
505505
Some(unsafe { Pin::from_psel_bits(sdin_pin.bits()) })
506506
} else {
507507
None
508508
},
509-
sdout: if sdout_pin.connect().bit_is_set() {
509+
sdout: if sdout_pin.connect().is_connected() {
510510
Some(unsafe { Pin::from_psel_bits(sdout_pin.bits()) })
511511
} else {
512512
None

nrf-hal-common/src/pwm.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -760,22 +760,22 @@ where
760760
(
761761
self.pwm,
762762
Pins {
763-
ch0: if ch0.connect().bit_is_set() {
763+
ch0: if ch0.connect().is_connected() {
764764
Some(unsafe { Pin::from_psel_bits(ch0.bits()) })
765765
} else {
766766
None
767767
},
768-
ch1: if ch1.connect().bit_is_set() {
768+
ch1: if ch1.connect().is_connected() {
769769
Some(unsafe { Pin::from_psel_bits(ch1.bits()) })
770770
} else {
771771
None
772772
},
773-
ch2: if ch2.connect().bit_is_set() {
773+
ch2: if ch2.connect().is_connected() {
774774
Some(unsafe { Pin::from_psel_bits(ch2.bits()) })
775775
} else {
776776
None
777777
},
778-
ch3: if ch3.connect().bit_is_set() {
778+
ch3: if ch3.connect().is_connected() {
779779
Some(unsafe { Pin::from_psel_bits(ch3.bits()) })
780780
} else {
781781
None

nrf-hal-common/src/qdec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl Qdec {
138138
let b = unsafe { Pin::from_psel_bits(self.qdec.psel.b.read().bits()) };
139139
let led = {
140140
let led = self.qdec.psel.led.read();
141-
if led.connect().bit_is_set() {
141+
if led.connect().is_connected() {
142142
Some(unsafe { Pin::from_psel_bits(led.bits()) })
143143
} else {
144144
None

nrf-hal-common/src/spim.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,17 +373,17 @@ where
373373
(
374374
self.0,
375375
Pins {
376-
sck: if sck.connect().bit_is_set() {
376+
sck: if sck.connect().is_connected() {
377377
Some(unsafe { Pin::from_psel_bits(sck.bits()) })
378378
} else {
379379
None
380380
},
381-
mosi: if mosi.connect().bit_is_set() {
381+
mosi: if mosi.connect().is_connected() {
382382
Some(unsafe { Pin::from_psel_bits(mosi.bits()) })
383383
} else {
384384
None
385385
},
386-
miso: if miso.connect().bit_is_set() {
386+
miso: if miso.connect().is_connected() {
387387
Some(unsafe { Pin::from_psel_bits(miso.bits()) })
388388
} else {
389389
None

nrf-hal-common/src/spis.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,12 +418,12 @@ where
418418
Pins {
419419
sck: unsafe { Pin::from_psel_bits(sck.bits()) },
420420
cs: unsafe { Pin::from_psel_bits(cs.bits()) },
421-
copi: if copi.connect().bit_is_set() {
421+
copi: if copi.connect().is_connected() {
422422
Some(unsafe { Pin::from_psel_bits(copi.bits()) })
423423
} else {
424424
None
425425
},
426-
cipo: if cipo.connect().bit_is_set() {
426+
cipo: if cipo.connect().is_connected() {
427427
Some(unsafe { Pin::from_psel_bits(cipo.bits()) })
428428
} else {
429429
None

0 commit comments

Comments
 (0)