Update to embedded-hal 1.0.

Cargo.toml

@@ -12,9 +12,10 @@ description = "A generic rust driver to support RFM69 family wireless chips"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-embedded-hal = "0.2"
+embedded-hal = "1.0.0"
 
 [dev-dependencies]
 anyhow = "1.0"
-linux-embedded-hal = "^0.3.2"
+embedded-hal-bus = { version = "0.1.0", features = ["std"] }
+linux-embedded-hal = "0.4.0"
 utilities = { path = "utilities" }

examples/low_power_lab_receive.rs

@@ -1,8 +1,10 @@
 use anyhow::Result;
+use embedded_hal_bus::spi::MutexDevice;
 use linux_embedded_hal::spidev::{SpiModeFlags, SpidevOptions};
 use linux_embedded_hal::sysfs_gpio::Direction;
-use linux_embedded_hal::{Spidev, SysfsPin};
+use linux_embedded_hal::{Delay, SpidevBus, SysfsPin};
 use rfm69::{low_power_lab_defaults, Rfm69};
+use std::sync::Mutex;
 use utilities::{rfm_error, Packet};
 
 fn main() -> Result<()> {
@@ -12,20 +14,19 @@ fn main() -> Result<()> {
     cs.set_direction(Direction::High)?;
 
     // Configure SPI 8 bits, Mode 0
-    let mut spi = Spidev::open("/dev/spidev0.0")?;
+    let mut spi_bus = SpidevBus::open("/dev/spidev0.0")?;
     let options = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(1_000_000)
         .mode(SpiModeFlags::SPI_MODE_0)
         .build();
-    spi.configure(&options)?;
+    spi_bus.configure(&options)?;
+    let spi_bus = Mutex::new(spi_bus);
+
+    let spi = MutexDevice::new(&spi_bus, cs, Delay);
 
     // Create rfm struct with default compatible with LowPowerLabs
-    let mut rfm = rfm_error!(low_power_lab_defaults(
-        Rfm69::new(spi, cs),
-        100,
-        433_000_000
-    ))?;
+    let mut rfm = rfm_error!(low_power_lab_defaults(Rfm69::new(spi), 100, 433_000_000))?;
 
     // Print content of all RFM registers
     for (index, val) in rfm_error!(rfm.read_all_regs())?.iter().enumerate() {

examples/low_power_lab_send.rs

@@ -1,8 +1,10 @@
 use anyhow::Result;
+use embedded_hal_bus::spi::MutexDevice;
 use linux_embedded_hal::spidev::{SpiModeFlags, SpidevOptions};
 use linux_embedded_hal::sysfs_gpio::Direction;
-use linux_embedded_hal::{Spidev, SysfsPin};
+use linux_embedded_hal::{Delay, SpidevBus, SysfsPin};
 use rfm69::{low_power_lab_defaults, Rfm69};
+use std::sync::Mutex;
 use utilities::{rfm_error, Packet};
 
 fn main() -> Result<()> {
@@ -12,20 +14,19 @@ fn main() -> Result<()> {
     cs.set_direction(Direction::High)?;
 
     // Configure SPI 8 bits, Mode 0
-    let mut spi = Spidev::open("/dev/spidev0.0")?;
+    let mut spi_bus = SpidevBus::open("/dev/spidev0.0")?;
     let options = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(1_000_000)
         .mode(SpiModeFlags::SPI_MODE_0)
         .build();
-    spi.configure(&options)?;
+    spi_bus.configure(&options)?;
+    let spi_bus = Mutex::new(spi_bus);
+
+    let spi = MutexDevice::new(&spi_bus, cs, Delay);
 
     // Create rfm struct with default compatible with LowPowerLabs
-    let mut rfm = rfm_error!(low_power_lab_defaults(
-        Rfm69::new(spi, cs),
-        100,
-        433_000_000
-    ))?;
+    let mut rfm = rfm_error!(low_power_lab_defaults(Rfm69::new(spi,), 100, 433_000_000))?;
 
     // Print content of all RFM registers
     for (index, val) in rfm_error!(rfm.read_all_regs())?.iter().enumerate() {

examples/receive.rs

@@ -1,18 +1,12 @@
 use anyhow::Result;
 use linux_embedded_hal::spidev::{SpiModeFlags, SpidevOptions};
-use linux_embedded_hal::sysfs_gpio::Direction;
-use linux_embedded_hal::{Spidev, SysfsPin};
+use linux_embedded_hal::{SpidevDevice, SysfsPin};
 use rfm69::Rfm69;
 use utilities::rfm_error;
 
 fn main() -> Result<()> {
-    // Configure CS pin
-    let cs = SysfsPin::new(25);
-    cs.export()?;
-    cs.set_direction(Direction::High)?;
-
     // Configure SPI 8 bits, Mode 0
-    let mut spi = Spidev::open("/dev/spidev0.0")?;
+    let mut spi = SpidevDevice::open("/dev/spidev0.0")?;
     let options = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(1_000_000)
@@ -21,7 +15,7 @@ fn main() -> Result<()> {
     spi.configure(&options)?;
 
     // Create rfm struct with defaults that are set after reset
-    let mut rfm = Rfm69::new(spi, cs);
+    let mut rfm = Rfm69::new(spi);
 
     // Print content of all RFM registers
     for (index, val) in rfm_error!(rfm.read_all_regs())?.iter().enumerate() {

examples/send.rs

@@ -1,18 +1,12 @@
 use anyhow::Result;
 use linux_embedded_hal::spidev::{SpiModeFlags, SpidevOptions};
-use linux_embedded_hal::sysfs_gpio::Direction;
-use linux_embedded_hal::{Spidev, SysfsPin};
+use linux_embedded_hal::{SpidevDevice, SysfsPin};
 use rfm69::Rfm69;
 use utilities::rfm_error;
 
 fn main() -> Result<()> {
-    // Configure CS pin
-    let cs = SysfsPin::new(25);
-    cs.export()?;
-    cs.set_direction(Direction::High)?;
-
     // Configure SPI 8 bits, Mode 0
-    let mut spi = Spidev::open("/dev/spidev0.0")?;
+    let mut spi = SpidevDevice::open("/dev/spidev0.0")?;
     let options = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(1_000_000)
@@ -21,7 +15,7 @@ fn main() -> Result<()> {
     spi.configure(&options)?;
 
     // Create rfm struct with defaults that are set after reset
-    let mut rfm = Rfm69::new(spi, cs);
+    let mut rfm = Rfm69::new(spi);
 
     // Print content of all RFM registers
     for (index, val) in rfm_error!(rfm.read_all_regs())?.iter().enumerate() {

src/defaults.rs

@@ -1,5 +1,3 @@
-use embedded_hal::digital::v2::OutputPin;
-
 use crate::error::Result;
 use crate::registers::{
     ContinuousDagc, DataMode, DccCutoff, FifoMode, InterPacketRxDelay, LnaConfig, LnaGain,
@@ -11,13 +9,12 @@ use crate::Rfm69;
 
 /// Configures RFM69 according to [LowPowerLab](https://github.com/LowPowerLab/RFM69) Arduino
 /// library
-pub fn low_power_lab_defaults<T, S, Ecs, Espi>(
-    mut rfm: Rfm69<T, S>,
+pub fn low_power_lab_defaults<S, Espi>(
+    mut rfm: Rfm69<S>,
     network_id: u8,
     frequency: u32,
-) -> Result<Rfm69<T, S>, Ecs, Espi>
+) -> Result<Rfm69<S>, Espi>
 where
-    T: OutputPin<Error = Ecs>,
     S: ReadWrite<Error = Espi>,
 {
     rfm.mode(Mode::Standby)?;

src/error.rs

@@ -1,9 +1,7 @@
-pub(crate) type Result<T, Ecs, Espi> = core::result::Result<T, Error<Ecs, Espi>>;
+pub(crate) type Result<T, Espi> = core::result::Result<T, Error<Espi>>;
 
 #[derive(Debug)]
-pub enum Error<Ecs, Espi> {
-    /// Chip select pin error
-    Cs(Ecs),
+pub enum Error<Espi> {
     /// SPI bus error
     Spi(Espi),
     /// Timeout exceeded

src/lib.rs

@@ -27,13 +27,11 @@
 
 #![cfg_attr(not(test), no_std)]
 
-pub use crate::cs::NoCs;
 pub use crate::defaults::low_power_lab_defaults;
 pub use crate::error::Error;
 pub use crate::rfm::Rfm69;
-pub use crate::rw::{ReadWrite, SpiTransactional};
+pub use crate::rw::ReadWrite;
 
-mod cs;
 mod defaults;
 mod error;
 mod rfm;