Update to embedded-hal 1.0.0

Cargo.toml

@@ -15,10 +15,10 @@ exclude = [
 ]
 
 [dependencies]
-embedded-hal = "0.2.7"
+embedded-hal = "1.0.0"
 bit_reverse = { version = "0.1.7", default-features = false }
 bitflags = "1.0"
 byteorder = { version = "1.2", default-features = false }
 
 [dev-dependencies]
-linux-embedded-hal = "0.2.2"
+linux-embedded-hal = "0.4.0"

examples/baton.rs

@@ -2,10 +2,8 @@ extern crate bit_reverse;
 extern crate linux_embedded_hal as linux_hal;
 extern crate pscontroller_rs;
 
-use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
-use linux_hal::Pin;
-use linux_hal::Spidev;
-use std::io;
+use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
+use linux_hal::{CdevPin, SpidevBus};
 
 use pscontroller_rs::PlayStationPort;
 
@@ -15,12 +13,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
 const SPI_SPEED: u32 = 10_000;
 
 // This will build the SPI device communication for us
-fn build_spi() -> io::Result<Spidev> {
-    let mut spi = Spidev::open(SPI_DEVICE)?;
+fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
+    let mut spi = SpidevBus::open(SPI_DEVICE)?;
     let opts = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(SPI_SPEED)
-        .mode(SPI_MODE_3)
+        .mode(SpiModeFlags::SPI_MODE_3)
         .build();
     spi.configure(&opts)?;
 
@@ -29,7 +27,7 @@ fn build_spi() -> io::Result<Spidev> {
 
 fn main() {
     let spi = build_spi().unwrap();
-    let mut psp = PlayStationPort::new(spi, None::<Pin>);
+    let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
 
     let mut controller;
 

examples/console.rs

@@ -2,10 +2,8 @@ extern crate embedded_hal;
 extern crate linux_embedded_hal as linux_hal;
 extern crate pscontroller_rs;
 
-use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
-use linux_hal::Pin;
-use linux_hal::Spidev;
-use std::io;
+use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
+use linux_hal::{CdevPin, SpidevBus};
 use std::{thread, time};
 
 use pscontroller_rs::PlayStationPort;
@@ -16,14 +14,14 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
 const SPI_SPEED: u32 = 100_000;
 // If you need to use an alternate pin for cable select, uncomment the relevant bits
 // and pass the pin into psp's new() function.
-//const SPI_ENABLE_PIN: u64 = 4;
+//const SPI_ENABLE_PIN: u32 = 4;
 
-fn build_spi() -> io::Result<Spidev> {
-    let mut spi = Spidev::open(SPI_DEVICE)?;
+fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
+    let mut spi = SpidevBus::open(SPI_DEVICE)?;
     let opts = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(SPI_SPEED)
-        .mode(SPI_MODE_3)
+        .mode(SpiModeFlags::SPI_MODE_3)
         .build();
     spi.configure(&opts)?;
 
@@ -32,9 +30,7 @@ fn build_spi() -> io::Result<Spidev> {
 
 fn main() {
     let spi = build_spi().unwrap();
-    //let enable_pin = Pin::new(SPI_ENABLE_PIN);
-    //let mut psp = PlayStationPort::new(spi, Some(enable_pin));
-    let mut psp = PlayStationPort::new(spi, None::<Pin>);
+    let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
     let mut command = [0u8; 32];
     let mut buffer = [0u8; 32];
 

examples/dualshock.rs

@@ -2,10 +2,8 @@ extern crate bit_reverse;
 extern crate linux_embedded_hal as linux_hal;
 extern crate pscontroller_rs;
 
-use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
-use linux_hal::Pin;
-use linux_hal::Spidev;
-use std::io;
+use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
+use linux_hal::{CdevPin, SpidevBus};
 
 use pscontroller_rs::{classic::GamepadButtons, dualshock::ControlDS, Device, PlayStationPort};
 
@@ -15,12 +13,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
 const SPI_SPEED: u32 = 10_000;
 
 // This will build the
-fn build_spi() -> io::Result<Spidev> {
-    let mut spi = Spidev::open(SPI_DEVICE)?;
+fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
+    let mut spi = SpidevBus::open(SPI_DEVICE)?;
     let opts = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(SPI_SPEED)
-        .mode(SPI_MODE_3)
+        .mode(SpiModeFlags::SPI_MODE_3)
         .build();
     spi.configure(&opts)?;
 
@@ -47,7 +45,7 @@ fn set_motors(buttons: &GamepadButtons, small: &mut bool, big: &mut u8) {
 
 fn main() {
     let spi = build_spi().unwrap();
-    let mut psp = PlayStationPort::new(spi, None::<Pin>);
+    let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
     let mut control_ds = ControlDS::new(false, 0);
 
     let mut big: u8 = 0;

examples/guitarhero.rs

@@ -2,10 +2,8 @@ extern crate bit_reverse;
 extern crate linux_embedded_hal as linux_hal;
 extern crate pscontroller_rs;
 
-use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
-use linux_hal::Pin;
-use linux_hal::Spidev;
-use std::io;
+use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
+use linux_hal::{CdevPin, SpidevBus};
 
 use pscontroller_rs::PlayStationPort;
 
@@ -15,12 +13,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
 const SPI_SPEED: u32 = 10_000;
 
 // This will build the
-fn build_spi() -> io::Result<Spidev> {
-    let mut spi = Spidev::open(SPI_DEVICE)?;
+fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
+    let mut spi = SpidevBus::open(SPI_DEVICE)?;
     let opts = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(SPI_SPEED)
-        .mode(SPI_MODE_3)
+        .mode(SpiModeFlags::SPI_MODE_3)
         .build();
     spi.configure(&opts)?;
 
@@ -29,7 +27,7 @@ fn build_spi() -> io::Result<Spidev> {
 
 fn main() {
     let spi = build_spi().unwrap();
-    let mut psp = PlayStationPort::new(spi, None::<Pin>);
+    let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
 
     let mut controller;
 

examples/jogcon.rs

@@ -9,10 +9,8 @@ extern crate embedded_hal;
 extern crate linux_embedded_hal as linux_hal;
 extern crate pscontroller_rs;
 
-use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
-use linux_hal::Pin;
-use linux_hal::Spidev;
-use std::io;
+use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
+use linux_hal::{CdevPin, SpidevBus};
 
 use pscontroller_rs::{
     jogcon::{ControlJC, JogControl},
@@ -24,12 +22,12 @@ use pscontroller_rs::{
 const SPI_DEVICE: &str = "/dev/spidev0.0";
 const SPI_SPEED: u32 = 10_000;
 
-fn build_spi() -> io::Result<Spidev> {
-    let mut spi = Spidev::open(SPI_DEVICE)?;
+fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
+    let mut spi = SpidevBus::open(SPI_DEVICE)?;
     let opts = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(SPI_SPEED)
-        .mode(SPI_MODE_3)
+        .mode(SpiModeFlags::SPI_MODE_3)
         .build();
     spi.configure(&opts)?;
 
@@ -38,7 +36,7 @@ fn build_spi() -> io::Result<Spidev> {
 
 fn main() {
     let spi = build_spi().unwrap();
-    let mut psp = PlayStationPort::new(spi, None::<Pin>);
+    let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
     let mut control_jc = ControlJC::new(JogControl::Stop, 15);
 
     psp.enable_jogcon()

examples/mouse.rs

@@ -1,11 +1,10 @@
 extern crate linux_embedded_hal as linux_hal;
 extern crate pscontroller_rs;
 
-use std::{io, thread, time};
+use std::{thread, time};
 
-use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
-use linux_hal::Pin;
-use linux_hal::Spidev;
+use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
+use linux_hal::{CdevPin, SpidevBus};
 
 use pscontroller_rs::{Device, PlayStationPort};
 
@@ -15,12 +14,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
 const SPI_SPEED: u32 = 100_000;
 
 // This will build the
-fn build_spi() -> io::Result<Spidev> {
-    let mut spi = Spidev::open(SPI_DEVICE)?;
+fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
+    let mut spi = SpidevBus::open(SPI_DEVICE)?;
     let opts = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(SPI_SPEED)
-        .mode(SPI_MODE_3)
+        .mode(SpiModeFlags::SPI_MODE_3)
         .build();
     spi.configure(&opts)?;
 
@@ -29,7 +28,7 @@ fn build_spi() -> io::Result<Spidev> {
 
 fn main() {
     let spi = build_spi().unwrap();
-    let mut psp = PlayStationPort::new(spi, None::<Pin>);
+    let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
     let sleep_duration = time::Duration::from_millis(10);
 
     let mut x: i32 = 0;

examples/playstation.rs

@@ -2,10 +2,8 @@ extern crate bit_reverse;
 extern crate linux_embedded_hal as linux_hal;
 extern crate pscontroller_rs;
 
-use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
-use linux_hal::Pin;
-use linux_hal::Spidev;
-use std::io;
+use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
+use linux_hal::{CdevPin, SpidevBus};
 
 use pscontroller_rs::{Device, PlayStationPort};
 
@@ -15,12 +13,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
 const SPI_SPEED: u32 = 100_000;
 
 // This will build the
-fn build_spi() -> io::Result<Spidev> {
-    let mut spi = Spidev::open(SPI_DEVICE)?;
+fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
+    let mut spi = SpidevBus::open(SPI_DEVICE)?;
     let opts = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(SPI_SPEED)
-        .mode(SPI_MODE_3)
+        .mode(SpiModeFlags::SPI_MODE_3)
         .build();
     spi.configure(&opts)?;
 
@@ -36,7 +34,7 @@ fn dump_hex(buffer: &[u8]) {
 
 fn main() {
     let spi = build_spi().unwrap();
-    let mut psp = PlayStationPort::new(spi, None::<Pin>);
+    let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
 
     psp.enable_pressure().unwrap();
 

examples/scanner.rs

@@ -2,10 +2,8 @@ extern crate embedded_hal;
 extern crate linux_embedded_hal as linux_hal;
 extern crate pscontroller_rs;
 
-use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
-use linux_hal::Pin;
-use linux_hal::Spidev;
-use std::io;
+use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
+use linux_hal::{CdevPin, SpidevBus};
 use std::{thread, time};
 
 use pscontroller_rs::{MultitapPort, PlayStationPort};
@@ -26,12 +24,12 @@ const SCAN_RESPONSE_WIDTH: u8 = 10;
 const SAMPLE_PAUSE: u64 = 0_000;
 const USE_MULTITAP: bool = false;
 
-fn build_spi() -> io::Result<Spidev> {
-    let mut spi = Spidev::open(SPI_DEVICE)?;
+fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
+    let mut spi = SpidevBus::open(SPI_DEVICE)?;
     let opts = SpidevOptions::new()
         .bits_per_word(8)
         .max_speed_hz(SPI_SPEED)
-        .mode(SPI_MODE_3)
+        .mode(SpiModeFlags::SPI_MODE_3)
         .build();
     spi.configure(&opts)?;
 
@@ -40,7 +38,7 @@ fn build_spi() -> io::Result<Spidev> {
 
 fn main() {
     let spi = build_spi().unwrap();
-    let mut psp = PlayStationPort::new(spi, None::<Pin>);
+    let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
     let mut command = [0u8; SCAN_RESPONSE_WIDTH as usize];
     let mut buffer = [0u8; SCAN_RESPONSE_WIDTH as usize];
     let mut _dummy = [0u8; SCAN_RESPONSE_WIDTH as usize];