aboutsummaryrefslogtreecommitdiff
path: root/embassy-rp
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-07-04 19:53:06 +0200
committerDario Nieuwenhuis <[email protected]>2023-07-04 19:59:36 +0200
commita101d9078deb3ad576a40b6d5f4d6e81dcfd528e (patch)
tree98deed296973aa29dc1701f69ecbe342d2a2c7c5 /embassy-rp
parentb2f843a4ce2dc9114a135f612e1a408a8fe02fab (diff)
update embedded-hal crates.
Diffstat (limited to 'embassy-rp')
-rw-r--r--embassy-rp/Cargo.toml6
-rw-r--r--embassy-rp/src/spi.rs20
2 files changed, 7 insertions, 19 deletions
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index 66823771a..a06831a9a 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -79,9 +79,9 @@ fixed = "1.23.1"
79rp-pac = { version = "6" } 79rp-pac = { version = "6" }
80 80
81embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } 81embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] }
82embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10", optional = true} 82embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.11", optional = true}
83embedded-hal-async = { version = "=0.2.0-alpha.1", optional = true} 83embedded-hal-async = { version = "=0.2.0-alpha.2", optional = true}
84embedded-hal-nb = { version = "=1.0.0-alpha.2", optional = true} 84embedded-hal-nb = { version = "=1.0.0-alpha.3", optional = true}
85 85
86paste = "1.0" 86paste = "1.0"
87pio-proc = {version= "0.2" } 87pio-proc = {version= "0.2" }
diff --git a/embassy-rp/src/spi.rs b/embassy-rp/src/spi.rs
index e817d074e..af101cf4a 100644
--- a/embassy-rp/src/spi.rs
+++ b/embassy-rp/src/spi.rs
@@ -545,25 +545,19 @@ mod eh1 {
545 type Error = Error; 545 type Error = Error;
546 } 546 }
547 547
548 impl<'d, T: Instance, M: Mode> embedded_hal_1::spi::SpiBusFlush for Spi<'d, T, M> { 548 impl<'d, T: Instance, M: Mode> embedded_hal_1::spi::SpiBus<u8> for Spi<'d, T, M> {
549 fn flush(&mut self) -> Result<(), Self::Error> { 549 fn flush(&mut self) -> Result<(), Self::Error> {
550 Ok(()) 550 Ok(())
551 } 551 }
552 }
553 552
554 impl<'d, T: Instance, M: Mode> embedded_hal_1::spi::SpiBusRead<u8> for Spi<'d, T, M> {
555 fn read(&mut self, words: &mut [u8]) -> Result<(), Self::Error> { 553 fn read(&mut self, words: &mut [u8]) -> Result<(), Self::Error> {
556 self.blocking_transfer(words, &[]) 554 self.blocking_transfer(words, &[])
557 } 555 }
558 }
559 556
560 impl<'d, T: Instance, M: Mode> embedded_hal_1::spi::SpiBusWrite<u8> for Spi<'d, T, M> {
561 fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> { 557 fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> {
562 self.blocking_write(words) 558 self.blocking_write(words)
563 } 559 }
564 }
565 560
566 impl<'d, T: Instance, M: Mode> embedded_hal_1::spi::SpiBus<u8> for Spi<'d, T, M> {
567 fn transfer(&mut self, read: &mut [u8], write: &[u8]) -> Result<(), Self::Error> { 561 fn transfer(&mut self, read: &mut [u8], write: &[u8]) -> Result<(), Self::Error> {
568 self.blocking_transfer(read, write) 562 self.blocking_transfer(read, write)
569 } 563 }
@@ -578,30 +572,24 @@ mod eh1 {
578mod eha { 572mod eha {
579 use super::*; 573 use super::*;
580 574
581 impl<'d, T: Instance> embedded_hal_async::spi::SpiBusFlush for Spi<'d, T, Async> { 575 impl<'d, T: Instance> embedded_hal_async::spi::SpiBus<u8> for Spi<'d, T, Async> {
582 async fn flush(&mut self) -> Result<(), Self::Error> { 576 async fn flush(&mut self) -> Result<(), Self::Error> {
583 Ok(()) 577 Ok(())
584 } 578 }
585 }
586 579
587 impl<'d, T: Instance> embedded_hal_async::spi::SpiBusWrite<u8> for Spi<'d, T, Async> {
588 async fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> { 580 async fn write(&mut self, words: &[u8]) -> Result<(), Self::Error> {
589 self.write(words).await 581 self.write(words).await
590 } 582 }
591 }
592 583
593 impl<'d, T: Instance> embedded_hal_async::spi::SpiBusRead<u8> for Spi<'d, T, Async> {
594 async fn read(&mut self, words: &mut [u8]) -> Result<(), Self::Error> { 584 async fn read(&mut self, words: &mut [u8]) -> Result<(), Self::Error> {
595 self.read(words).await 585 self.read(words).await
596 } 586 }
597 }
598 587
599 impl<'d, T: Instance> embedded_hal_async::spi::SpiBus<u8> for Spi<'d, T, Async> { 588 async fn transfer(&mut self, read: &mut [u8], write: &[u8]) -> Result<(), Self::Error> {
600 async fn transfer<'a>(&'a mut self, read: &'a mut [u8], write: &'a [u8]) -> Result<(), Self::Error> {
601 self.transfer(read, write).await 589 self.transfer(read, write).await
602 } 590 }
603 591
604 async fn transfer_in_place<'a>(&'a mut self, words: &'a mut [u8]) -> Result<(), Self::Error> { 592 async fn transfer_in_place(&mut self, words: &mut [u8]) -> Result<(), Self::Error> {
605 self.transfer_in_place(words).await 593 self.transfer_in_place(words).await
606 } 594 }
607 } 595 }